Date: 3 Aug 2006 09:42:57 -0300 From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kuriyama@FreeBSD.org Subject: ports/101318: [PATCH] security/gnupg: Change OPTIONS, fix WITH_LDAP build, use PORTDOCS Message-ID: <20060803124257.9033.qmail@srv1.galle.com.br> Resent-Message-ID: <200608031250.k73CoHFq081141@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101318
>Category: ports
>Synopsis: [PATCH] security/gnupg: Change OPTIONS, fix WITH_LDAP build, use PORTDOCS
>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: Thu Aug 03 12:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD srv1.galle.com.br 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue May 23 18:08:29 BRST 2006
>Description:
- Remove NOPORTDOCS from OPTIONS since the correct is check NOPORTDOCS and
not WITH(OUT)_NOPORTDOCS
- Use PORTDOCS and clean pkg-plist
- Add NLS to OPTIONS as on by default and move the check after
bsd.port.pre.mk
- Add --with-ldap=${LOCALBASE} because it was not finding ldap libs without
this
Port maintainer (kuriyama@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- gnupg-1.4.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/gnupg/Makefile,v
retrieving revision 1.86
diff -u -u -r1.86 Makefile
--- Makefile 2 Aug 2006 01:34:30 -0000 1.86
+++ Makefile 3 Aug 2006 12:38:51 -0000
@@ -24,41 +24,47 @@
MACHINE_ARCH= i586
.endif
CFLAGS:= ${CFLAGS:S/-pipe//g}
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= YES
-PLIST_SUB= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB= NLS="@comment "
-.endif
MAN1= gpg.1 gpgv.1 gpg.ru.1
MAN7= gnupg.7
INFO= gpg gpgv
+PORTDOCS= *
+
OPTIONS= LDAP "LDAP keyserver interface" off \
LIBICONV "use libiconv" off \
SUID_GPG "install GPG with suid" off \
- NOPORTDOCS "without port docs" off
+ NLS "Native Language Support" on
.include <bsd.port.pre.mk>
.if defined(WITH_LIBICONV) || exists(${PREFIX}/lib/libiconv.so)
USE_ICONV= yes
.endif
+
.if defined(WITH_LIBUSB)
CONFIGURE_ARGS+= --with-libusb=${LOCALBASE}
LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb
.else
CONFIGURE_ARGS+= --without-libusb
.endif
+
.if defined(WITH_LDAP)
USE_OPENLDAP= yes
PLIST_SUB+= WITH_LDAP=""
+CONFIGURE_ARGS+= --with-ldap=${LOCALBASE}
.else
PLIST_SUB+= WITH_LDAP="@comment "
CONFIGURE_ARGS+= --disable-ldap
.endif
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= YES
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/security/gnupg/pkg-plist,v
retrieving revision 1.36
diff -u -u -r1.36 pkg-plist
--- pkg-plist 2 Aug 2006 01:34:30 -0000 1.36
+++ pkg-plist 3 Aug 2006 12:38:51 -0000
@@ -10,21 +10,6 @@
%%DATADIR%%/FAQ
%%DATADIR%%/faq.html
%%DATADIR%%/options.skel
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/DETAILS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
-%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/PROJECTS
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/VERSION
%%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
%%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
%%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
@@ -77,4 +62,3 @@
@dirrmtry share/locale/sk
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
-@dirrm %%DOCSDIR%%
--- gnupg-1.4.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060803124257.9033.qmail>