svn commit: r317496 - in head/security: gnutls-devel pam_krb5-rh pidgin-encryption
Baptiste Daroussin
bapt at FreeBSD.org
Mon May 6 09:39:26 UTC 2013
Author: bapt
Date: Mon May 6 09:39:25 2013
New Revision: 317496
URL: http://svnweb.freebsd.org/changeset/ports/317496
Log:
Finish converting security from WITHOUT_NLS to PORT_OPTIONS:MNLS
Modified:
head/security/gnutls-devel/Makefile
head/security/pam_krb5-rh/Makefile
head/security/pidgin-encryption/Makefile
Modified: head/security/gnutls-devel/Makefile
==============================================================================
--- head/security/gnutls-devel/Makefile Mon May 6 09:33:14 2013 (r317495)
+++ head/security/gnutls-devel/Makefile Mon May 6 09:39:25 2013 (r317496)
@@ -50,15 +50,15 @@ PLIST_SUB+= CXX="@comment "
PLIST_SUB+= CXX=""
.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= AUTHORS NEWS README THANKS
.endif
EXAMPLES= doc/examples/*.c
@@ -72,7 +72,7 @@ pre-configure:
post-install:
@${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
Modified: head/security/pam_krb5-rh/Makefile
==============================================================================
--- head/security/pam_krb5-rh/Makefile Mon May 6 09:33:14 2013 (r317495)
+++ head/security/pam_krb5-rh/Makefile Mon May 6 09:39:25 2013 (r317496)
@@ -26,19 +26,15 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN5= pam_krb5.5
MAN8= pam_krb5.8 pam_krb5_cchelper.8
-.if defined(WITHOUT_NLS)
-PLIST_SUB+= NLS="@comment "
-CONFIGURE_ARGS+=--disable-nls
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
LDFLAGS+= -lintl
USES+= gettext
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800000
-BROKEN= does not build on FreeBSD 7.x
+.else
+PLIST_SUB+= NLS="@comment "
+CONFIGURE_ARGS+=--disable-nls
.endif
post-patch:
@@ -50,4 +46,4 @@ post-patch:
@${REINPLACE_CMD} -e 's|PAM_AUTHTOK_RECOVER_ERR|PAM_AUTHTOK_RECOVERY_ERR|g' \
${WRKSRC}/src/password.c
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/security/pidgin-encryption/Makefile
==============================================================================
--- head/security/pidgin-encryption/Makefile Mon May 6 09:33:14 2013 (r317495)
+++ head/security/pidgin-encryption/Makefile Mon May 6 09:39:25 2013 (r317496)
@@ -1,9 +1,5 @@
-# New ports collection Makefile for: pidgin-encryption
-# Date created: 2004-05-01
-# Whom: ports at c0decafe.net
-#
+# Created by: ports at c0decafe.net
# $FreeBSD$
-#
PORTNAME= pidgin
PORTVERSION= 3.1
@@ -32,7 +28,9 @@ CONFIGURE_ARGS= --with-nspr-includes=${L
--with-nss-includes=${LOCALBASE}/include/nss/nss \
--with-nss-libs=${LOCALBASE}/lib/nss
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE}
PLIST_SUB+= NLS=""
More information about the svn-ports-head
mailing list