ports/170390: [PATCH] security/gnutls: Prevent from linking to -lpthread directly

[Jason E. Hale]

>Number:         170390
>Category:       ports
>Synopsis:       [PATCH] security/gnutls: Prevent from linking to -lpthread directly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 05 13:00:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason E. Hale
>Release:        FreeBSD 9.0-RELEASE i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason at mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386


	
>Description:
- Prevent security/gnutls from linking to -lpthread directly
- Bump port revision since linking will change
- While here:
  - Use the USE_PKGCONFIG macro to remove pkgconf runtime dependency
  - Pet portlint by removing ABI number references
  - Remove --with-lzo=no, if anything it should be --without-lzo,
    but LZO support is disabled by default whether liblzo2 is installed or not

	
>How-To-Repeat:
- Use attached diff
	
>Fix:

	



--- 2012-08-05-gnutls.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 302105)
+++ Makefile	(working copy)
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	2.12.18
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_GNUPG}
@@ -15,15 +16,16 @@
 MAINTAINER=	novel at FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
-LIB_DEPENDS=	nettle.4:${PORTSDIR}/security/nettle \
-		gpg-error.0:${PORTSDIR}/security/libgpg-error \
-		p11-kit.0:${PORTSDIR}/security/p11-kit
+LIB_DEPENDS=	nettle:${PORTSDIR}/security/nettle \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		p11-kit:${PORTSDIR}/security/p11-kit
 
 CONFLICTS=	gnutls-devel-[0-9]*
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_GNOME=	pkgconfig ltverhack gnomehack
+USE_PKGCONFIG=	build
+USE_GNOME=	ltverhack gnomehack
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
@@ -36,8 +38,8 @@
 
 .include <bsd.port.pre.mk>
 
-.if (defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.4)) && !defined(WITHOUT_LIBTASN1)
-LIB_DEPENDS+=	tasn1.4:${PORTSDIR}/security/libtasn1
+.if (defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so)) && !defined(WITHOUT_LIBTASN1)
+LIB_DEPENDS+=		tasn1:${PORTSDIR}/security/libtasn1
 .else
 CONFIGURE_ARGS+=	--with-included-libtasn1
 .endif
@@ -45,8 +47,6 @@
 .if (defined(WITH_LZO) || exists(${LOCALBASE}/lib/liblzo2.so)) && !defined(WITHOUT_LZO)
 LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
 CONFIGURE_ARGS+=	--with-lzo
-.else
-CONFIGURE_ARGS+=	--with-lzo=no
 .endif
 
 .if defined(WITHOUT_CXX)
@@ -67,6 +67,9 @@
 PORTDOCS=		AUTHORS NEWS README THANKS
 PORTEXAMPLES=		*.c
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e 's|[$$][(]LTLIBPTHREAD[)]||g'
+
 post-install:
 .if !defined (NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
--- 2012-08-05-gnutls.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: