compat32_libgpg-error: Rename libgpg-error-32 to compat32_libgpg-error

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Tue Jul 23 17:47:28 2019 +0200
Changeset:	f10853d15cdf066d45f0bb36dd85bf6fe93ec3f8

Added Files:
	compat32_libgpg-error/DESCR
	compat32_libgpg-error/Makefile
	compat32_libgpg-error/PLIST
	compat32_libgpg-error/buildlink3.mk
	compat32_libgpg-error/distinfo
	compat32_libgpg-error/patches/patch-src_estream.c
Removed Files:
	libgpg-error-32/DESCR
	libgpg-error-32/Makefile
	libgpg-error-32/PLIST
	libgpg-error-32/buildlink3.mk
	libgpg-error-32/distinfo
	libgpg-error-32/patches/patch-src_estream.c

Log Message:
compat32_libgpg-error: Rename libgpg-error-32 to compat32_libgpg-error

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f10853d15cdf066d45f0bb36dd85bf6fe93ec3f8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compat32_libgpg-error/DESCR                       |  3 ++
 compat32_libgpg-error/Makefile                    | 46 +++++++++++++++++++++++
 compat32_libgpg-error/PLIST                       | 38 +++++++++++++++++++
 compat32_libgpg-error/buildlink3.mk               | 17 +++++++++
 compat32_libgpg-error/distinfo                    |  7 ++++
 compat32_libgpg-error/patches/patch-src_estream.c | 36 ++++++++++++++++++
 libgpg-error-32/DESCR                             |  3 --
 libgpg-error-32/Makefile                          | 46 -----------------------
 libgpg-error-32/PLIST                             | 38 -------------------
 libgpg-error-32/buildlink3.mk                     | 17 ---------
 libgpg-error-32/distinfo                          |  7 ----
 libgpg-error-32/patches/patch-src_estream.c       | 36 ------------------
 12 files changed, 147 insertions(+), 147 deletions(-)

diffs:
diff --git a/compat32_libgpg-error/DESCR b/compat32_libgpg-error/DESCR
new file mode 100644
index 0000000000..218150bb5f
--- /dev/null
+++ b/compat32_libgpg-error/DESCR
@@ -0,0 +1,3 @@
+libgpg-error is a library that defines common error values for all
+GnuPG components.  Among these are GPG, GPGSM, GPGME, GPG-Agent,
+libgcrypt, pinentry, SmartCard Daemon and possibly more in the future.
diff --git a/compat32_libgpg-error/Makefile b/compat32_libgpg-error/Makefile
new file mode 100644
index 0000000000..3052791219
--- /dev/null
+++ b/compat32_libgpg-error/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.71 2019/03/20 05:43:20 adam Exp $
+
+DISTNAME=	libgpg-error-1.36
+CATEGORIES=	security
+ABI=		32
+MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgpg-error/
+MASTER_SITES+=	ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
+EXTRACT_SUFX=	.tar.bz2
+
+PKGNAME=	compat${ABI}_${DISTNAME}
+MAINTAINER=	minskim%NetBSD.org@localhost
+HOMEPAGE=	http://www.gnupg.org/
+COMMENT=	Definitions of common error values for all GnuPG components
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
+
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+CFLAGS+=                -m32
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
+CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/emul/netbsd32/share/
+INFO_FILES=		yes
+TEST_TARGET=		check
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
+.else
+CONFIGURE_ENV+=		CC_FOR_BUILD=${CC:Q}\ ${CFLAGS:M*:Q}
+.endif
+
+.if !empty(MACHINE_PLATFORM:MSunOS-5.10-*)
+LIBS+=	-lrt
+.endif
+
+remove non-libs-headers:
+	echo "Removing non-compat lib package content"
+	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/emul -prune -or -type f -exec ${RM} {} +
+
+post-install: remove non-libs-headers
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/compat32_libgpg-error/PLIST b/compat32_libgpg-error/PLIST
new file mode 100644
index 0000000000..0ee9fb196b
--- /dev/null
+++ b/compat32_libgpg-error/PLIST
@@ -0,0 +1,38 @@
+@comment $NetBSD$
+emul/netbsd32/bin/gpg-error
+emul/netbsd32/bin/gpg-error-config
+emul/netbsd32/bin/gpgrt-config
+emul/netbsd32/bin/yat2m
+emul/netbsd32/include/gpg-error.h
+emul/netbsd32/include/gpgrt.h
+emul/netbsd32/info/gpgrt.info
+emul/netbsd32/lib/libgpg-error.la
+emul/netbsd32/lib/pkgconfig/gpg-error.pc
+emul/netbsd32/man/man1/gpgrt-config.1
+emul/netbsd32/share/aclocal/gpg-error.m4
+emul/netbsd32/share/aclocal/gpgrt.m4
+emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
+emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error-package.lisp
+emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error.asd
+emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error.lisp
+emul/netbsd32/share/libgpg-error/errorref.txt
+@pkgdir share/locale/zh_TW/LC_MESSAGES
+@pkgdir share/locale/zh_CN/LC_MESSAGES
+@pkgdir share/locale/vi/LC_MESSAGES
+@pkgdir share/locale/uk/LC_MESSAGES
+@pkgdir share/locale/sv/LC_MESSAGES
+@pkgdir share/locale/sr/LC_MESSAGES
+@pkgdir share/locale/ru/LC_MESSAGES
+@pkgdir share/locale/ro/LC_MESSAGES
+@pkgdir share/locale/pt/LC_MESSAGES
+@pkgdir share/locale/pl/LC_MESSAGES
+@pkgdir share/locale/nl/LC_MESSAGES
+@pkgdir share/locale/ja/LC_MESSAGES
+@pkgdir share/locale/it/LC_MESSAGES
+@pkgdir share/locale/hu/LC_MESSAGES
+@pkgdir share/locale/fr/LC_MESSAGES
+@pkgdir share/locale/es/LC_MESSAGES
+@pkgdir share/locale/eo/LC_MESSAGES
+@pkgdir share/locale/de/LC_MESSAGES
+@pkgdir share/locale/da/LC_MESSAGES
+@pkgdir share/locale/cs/LC_MESSAGES
diff --git a/compat32_libgpg-error/buildlink3.mk b/compat32_libgpg-error/buildlink3.mk
new file mode 100644
index 0000000000..81fc66649a
--- /dev/null
+++ b/compat32_libgpg-error/buildlink3.mk
@@ -0,0 +1,17 @@
+# $NetBSD: buildlink3.mk,v 1.14 2011/04/22 13:41:54 obache Exp $
+
+BUILDLINK_TREE+=	compat32_libgpg-error
+
+.if !defined(compat32_LIBGPG_ERROR_BUILDLINK3_MK)
+compat32_LIBGPG_ERROR_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.compat32_libgpg-error+=	compat32_libgpg-error>=0.6
+BUILDLINK_ABI_DEPENDS.compat32_libgpg-error+=	compat32_libgpg-error>=1.10nb1
+BUILDLINK_PKGSRCDIR.compat32_libgpg-error?=	../../wip/libgpg-error-32
+BUILDLINK_LIBDIRS.compat32_libgpg-error?=	emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_libgpg-error?=	emul/netbsd32/include
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.endif # COMPAT32_LIBGPG_ERROR_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-compat32_libgpg-error
diff --git a/compat32_libgpg-error/distinfo b/compat32_libgpg-error/distinfo
new file mode 100644
index 0000000000..f8614b01b3
--- /dev/null
+++ b/compat32_libgpg-error/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.45 2019/03/20 05:43:20 adam Exp $
+
+SHA1 (libgpg-error-1.36.tar.bz2) = 5245ce38b198cecd57775fb3c7b7328ec1a2a615
+RMD160 (libgpg-error-1.36.tar.bz2) = 13a9405bcb8ef179fff58e72f47a54889ddd287f
+SHA512 (libgpg-error-1.36.tar.bz2) = 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
+Size (libgpg-error-1.36.tar.bz2) = 920542 bytes
+SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82
diff --git a/compat32_libgpg-error/patches/patch-src_estream.c b/compat32_libgpg-error/patches/patch-src_estream.c
new file mode 100644
index 0000000000..fb1bddb327
--- /dev/null
+++ b/compat32_libgpg-error/patches/patch-src_estream.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_estream.c,v 1.4 2018/03/16 09:48:00 adam Exp $
+
+Don't use atexit(), since this library mey be dlopen()ed
+and dlclose()d before exit() is called.
+
+Instead mark the do_deinit() function as a destructor.
+
+https://bugs.g10code.com/gnupg/issue1749
+
+--- src/estream.c.orig	2018-02-21 19:50:18.000000000 +0000
++++ src/estream.c
+@@ -485,6 +485,7 @@ do_list_remove (estream_t stream, int wi
+ /*
+  * The atexit handler for the entire gpgrt.
+  */
++__attribute__((destructor,used))
+ static void
+ do_deinit (void)
+ {
+@@ -515,7 +516,16 @@ _gpgrt_estream_init (void)
+   if (!initialized)
+     {
+       initialized = 1;
++#if 0
++      /* This library may be unloaded via dlclose() before
++       * exit() is called, causing the atexit handler to try
++       * to jump into unmapped address space, causing a segfault.
++       * This has been observed with apache and php.  Instead, use
++       * the destructor attribute, since that will cause it
++       * to be called on dlclose() as well.
++       */
+       atexit (do_deinit);
++#endif
+     }
+   return 0;
+ }
diff --git a/libgpg-error-32/DESCR b/libgpg-error-32/DESCR
deleted file mode 100644
index 218150bb5f..0000000000
--- a/libgpg-error-32/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-libgpg-error is a library that defines common error values for all
-GnuPG components.  Among these are GPG, GPGSM, GPGME, GPG-Agent,
-libgcrypt, pinentry, SmartCard Daemon and possibly more in the future.
diff --git a/libgpg-error-32/Makefile b/libgpg-error-32/Makefile
deleted file mode 100644
index 3052791219..0000000000
--- a/libgpg-error-32/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile,v 1.71 2019/03/20 05:43:20 adam Exp $
-
-DISTNAME=	libgpg-error-1.36
-CATEGORIES=	security
-ABI=		32
-MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgpg-error/
-MASTER_SITES+=	ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
-EXTRACT_SUFX=	.tar.bz2
-
-PKGNAME=	compat${ABI}_${DISTNAME}
-MAINTAINER=	minskim%NetBSD.org@localhost
-HOMEPAGE=	http://www.gnupg.org/
-COMMENT=	Definitions of common error values for all GnuPG components
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
-
-USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		yes
-CFLAGS+=                -m32
-GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
-CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/emul/netbsd32/share/
-INFO_FILES=		yes
-TEST_TARGET=		check
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
-.else
-CONFIGURE_ENV+=		CC_FOR_BUILD=${CC:Q}\ ${CFLAGS:M*:Q}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MSunOS-5.10-*)
-LIBS+=	-lrt
-.endif
-
-remove non-libs-headers:
-	echo "Removing non-compat lib package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/emul -prune -or -type f -exec ${RM} {} +
-
-post-install: remove non-libs-headers
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libgpg-error-32/PLIST b/libgpg-error-32/PLIST
deleted file mode 100644
index 0ee9fb196b..0000000000
--- a/libgpg-error-32/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD$
-emul/netbsd32/bin/gpg-error
-emul/netbsd32/bin/gpg-error-config
-emul/netbsd32/bin/gpgrt-config
-emul/netbsd32/bin/yat2m
-emul/netbsd32/include/gpg-error.h
-emul/netbsd32/include/gpgrt.h
-emul/netbsd32/info/gpgrt.info
-emul/netbsd32/lib/libgpg-error.la
-emul/netbsd32/lib/pkgconfig/gpg-error.pc
-emul/netbsd32/man/man1/gpgrt-config.1
-emul/netbsd32/share/aclocal/gpg-error.m4
-emul/netbsd32/share/aclocal/gpgrt.m4
-emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
-emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error-package.lisp
-emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error.asd
-emul/netbsd32/share/common-lisp/source/gpg-error/gpg-error.lisp
-emul/netbsd32/share/libgpg-error/errorref.txt
-@pkgdir share/locale/zh_TW/LC_MESSAGES
-@pkgdir share/locale/zh_CN/LC_MESSAGES
-@pkgdir share/locale/vi/LC_MESSAGES
-@pkgdir share/locale/uk/LC_MESSAGES
-@pkgdir share/locale/sv/LC_MESSAGES
-@pkgdir share/locale/sr/LC_MESSAGES
-@pkgdir share/locale/ru/LC_MESSAGES
-@pkgdir share/locale/ro/LC_MESSAGES
-@pkgdir share/locale/pt/LC_MESSAGES
-@pkgdir share/locale/pl/LC_MESSAGES
-@pkgdir share/locale/nl/LC_MESSAGES
-@pkgdir share/locale/ja/LC_MESSAGES
-@pkgdir share/locale/it/LC_MESSAGES
-@pkgdir share/locale/hu/LC_MESSAGES
-@pkgdir share/locale/fr/LC_MESSAGES
-@pkgdir share/locale/es/LC_MESSAGES
-@pkgdir share/locale/eo/LC_MESSAGES
-@pkgdir share/locale/de/LC_MESSAGES
-@pkgdir share/locale/da/LC_MESSAGES
-@pkgdir share/locale/cs/LC_MESSAGES
diff --git a/libgpg-error-32/buildlink3.mk b/libgpg-error-32/buildlink3.mk
deleted file mode 100644
index 81fc66649a..0000000000
--- a/libgpg-error-32/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2011/04/22 13:41:54 obache Exp $
-
-BUILDLINK_TREE+=	compat32_libgpg-error
-
-.if !defined(compat32_LIBGPG_ERROR_BUILDLINK3_MK)
-compat32_LIBGPG_ERROR_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.compat32_libgpg-error+=	compat32_libgpg-error>=0.6
-BUILDLINK_ABI_DEPENDS.compat32_libgpg-error+=	compat32_libgpg-error>=1.10nb1
-BUILDLINK_PKGSRCDIR.compat32_libgpg-error?=	../../wip/libgpg-error-32
-BUILDLINK_LIBDIRS.compat32_libgpg-error?=	emul/netbsd32/lib
-BUILDLINK_INCDIRS.compat32_libgpg-error?=	emul/netbsd32/include
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.endif # COMPAT32_LIBGPG_ERROR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-compat32_libgpg-error
diff --git a/libgpg-error-32/distinfo b/libgpg-error-32/distinfo
deleted file mode 100644
index f8614b01b3..0000000000
--- a/libgpg-error-32/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.45 2019/03/20 05:43:20 adam Exp $
-
-SHA1 (libgpg-error-1.36.tar.bz2) = 5245ce38b198cecd57775fb3c7b7328ec1a2a615
-RMD160 (libgpg-error-1.36.tar.bz2) = 13a9405bcb8ef179fff58e72f47a54889ddd287f
-SHA512 (libgpg-error-1.36.tar.bz2) = 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
-Size (libgpg-error-1.36.tar.bz2) = 920542 bytes
-SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82
diff --git a/libgpg-error-32/patches/patch-src_estream.c b/libgpg-error-32/patches/patch-src_estream.c
deleted file mode 100644
index fb1bddb327..0000000000
--- a/libgpg-error-32/patches/patch-src_estream.c
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-src_estream.c,v 1.4 2018/03/16 09:48:00 adam Exp $
-
-Don't use atexit(), since this library mey be dlopen()ed
-and dlclose()d before exit() is called.
-
-Instead mark the do_deinit() function as a destructor.
-
-https://bugs.g10code.com/gnupg/issue1749
-
---- src/estream.c.orig	2018-02-21 19:50:18.000000000 +0000
-+++ src/estream.c
-@@ -485,6 +485,7 @@ do_list_remove (estream_t stream, int wi
- /*
-  * The atexit handler for the entire gpgrt.
-  */
-+__attribute__((destructor,used))
- static void
- do_deinit (void)
- {
-@@ -515,7 +516,16 @@ _gpgrt_estream_init (void)
-   if (!initialized)
-     {
-       initialized = 1;
-+#if 0
-+      /* This library may be unloaded via dlclose() before
-+       * exit() is called, causing the atexit handler to try
-+       * to jump into unmapped address space, causing a segfault.
-+       * This has been observed with apache and php.  Instead, use
-+       * the destructor attribute, since that will cause it
-+       * to be called on dlclose() as well.
-+       */
-       atexit (do_deinit);
-+#endif
-     }
-   return 0;
- }