- 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

PR:		ports/101318
Submitted by:	garga
Approved by:	maintainer timeout (14 days)

4 files changed, 28 insertions, 48 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 8b61ef9ec34b..aced06b313a3 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -24,41 +24,47 @@ CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 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}
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index d5dc0ea68b08..5c2eb14f590a 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -10,21 +10,6 @@ libexec/gnupg/gpgkeys_hkp
 %%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 @@ libexec/gnupg/gpgkeys_hkp
 @dirrmtry share/locale/sk
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
-@dirrm %%DOCSDIR%%
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 8b61ef9ec34b..aced06b313a3 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -24,41 +24,47 @@ CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 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}
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index d5dc0ea68b08..5c2eb14f590a 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -10,21 +10,6 @@ libexec/gnupg/gpgkeys_hkp
 %%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 @@ libexec/gnupg/gpgkeys_hkp
 @dirrmtry share/locale/sk
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
-@dirrm %%DOCSDIR%%