Attachment 126640 Details for Bug 170390 – 2012-08-05-gnutls.diff

[patch] 2012-08-05-gnutls.diff

2012-08-05-gnutls.diff (text/plain), 1.82 KB, created by Jason E. Hale on 2012-08-05 14:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2012-08-05 14:00:01 UTC

Size: 1.82 KB

patch

obsolete

>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@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}

Actions: View | Diff

Attachments on bug 170390: 126640