pkg/43845: [PATCH] security/gnupg2 and security/dirmngr should not include pth/buildlink3.mk

[rumcic%gmail.com@localhost]

>Number:         43845
>Category:       pkg
>Synopsis:       [PATCH] security/gnupg2 and security/dirmngr should not 
>include pth/buildlink3.mk
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 06 22:45:00 +0000 2010
>Originator:     Rumko
>Release:        /
>Organization:
>Environment:
DragonFly rumko.rumko.net 2.7-DEVELOPMENT DragonFly 
v2.7.3.81.ga3fa5-DEVELOPMENT #122: Wed Jun  2 09:23:28 CEST 2010     
root%rumko.rumko.net@localhost:/usr/obj/usr/src/sys/MYPRECIOUS  i386
>Description:
Both packages include devel/pth/buildlink3.mk directly instead of including 
mk/pthread.buildlink3.mk and letting it detect the native pthread 
implementation. Due to that, platforms with native pthread implementation end 
up with devel/pth installed unnecessarily.
>How-To-Repeat:

>Fix:
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index dfd1a76..b2559b5 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -57,6 +57,12 @@ OWN_DIRS_PERMS+=     ${PREFIX}/libdata/dirmngr/extra-certs 
${DIRMNGR_PERMS}
 INSTALLATION_DIRS=     sbin
 PKG_DESTDIR_SUPPORT=   user-destdir

+.include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
+# previous pth versions have a bug which breaks CRL fetch on NetBSD
+BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.7nb1
+.endif
+
 pre-build:
        ${CP} ${FILESDIR}/runDirmngr.c ${WRKDIR}/runDirmngr.c

@@ -74,8 +80,5 @@ post-install:
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
-# previous pth versions have a bug which breaks CRL fetch on NetBSD
-BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.7nb1
-.include "../../devel/pth/buildlink3.mk"
 .include "../../security/libassuan2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 079f895..8712d6e 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -36,7 +36,7 @@ TEST_TARGET=          check
 BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.4
 BUILDLINK_API_DEPENDS.libksba+=                libksba>=1.0.2

-.include "../../devel/pth/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"