Attachment 74038 Details for Bug 107185 – file.diff

[patch] file.diff

file.diff (text/plain), 1.96 KB, created by Doug Barton on 2006-12-25 09:10:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Barton

Created: 2006-12-25 09:10:19 UTC

Size: 1.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/local/ncvs/ports/security/gnupg/Makefile,v
>retrieving revision 1.96
>diff -u -r1.96 Makefile
>--- Makefile	25 Dec 2006 02:59:59 -0000	1.96
>+++ Makefile	25 Dec 2006 08:18:18 -0000
>@@ -32,8 +32,7 @@
> USE_LDCONFIG=	YES
> USE_GETTEXT=	YES
> CONFIGURE_TARGET=# empty
>-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man \
>-	--enable-nls --with-libpth-prefix=${LOCALBASE}/lib/pth
>+CONFIGURE_ARGS+=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
> MAN1=		gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \
> 		gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \
> 		gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1
>@@ -41,9 +40,9 @@
> INFO=		gnupg
> 
> OPTIONS=	LDAP "LDAP keyserver interface" off \
>+		NLS "National Language Support" off \
> 		SCDAEMON "Enable Smartcard daemon (with libusb)" off \
> 		CURL "Use the real curl library (worked around if no)" on
>-PLIST_SUB=	NLS=""
> 
> .include <bsd.port.pre.mk>
> 
>@@ -51,21 +50,23 @@
> USE_OPENLDAP=	YES
> CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
> PLIST_SUB+=	LDAP=""
>-.if defined(WITHOUT_LDAP)
>-BROKEN=		Conflict options: WITHOUT_LDAP/WITH_LDAP
>-.endif
> .else
> CONFIGURE_ARGS+=--disable-ldap
> PLIST_SUB+=	LDAP="@comment "
> .endif
> 
>+.if defined(WITH_NLS)
>+CONFIGURE_ARGS+=--enable-nls
>+PLIST_SUB+=	NLS=""
>+.else
>+CONFIGURE_ARGS+=--disable-nls
>+PLIST_SUB+=	NLS="@comment "
>+.endif
>+
> .if defined(WITH_SCDAEMON)
> CONFIGURE_ARGS+=--enable-scdaemon
> LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
> PLIST_SUB+=	SCDAEMON=""
>-.if defined(WITHOUT_SCDAEMON)
>-BROKEN=		Conflict options: WITHOUT_SCDAEMON/WITH_SCDAEMON
>-.endif
> .else
> CONFIGURE_ARGS+=--disable-scdaemon
> PLIST_SUB+=	SCDAEMON="@comment "
>@@ -73,9 +74,6 @@
> 
> .if defined(WITHOUT_CURL)
> CONFIGURE_ARGS+=--without-libcurl
>-.if defined(WITH_CURL)
>-BROKEN=		Conflict options: WITHOUT_CURL/WITH_CURL
>-.endif
> .else
> LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
> CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}

Actions: View | Diff

Attachments on bug 107185: 74038