svn commit: r316883 - in head/security: gnupg1 gnutls-devel gpa yapet
Jason Helfman
jgh at FreeBSD.org
Tue Apr 30 06:28:28 UTC 2013
Author: jgh
Date: Tue Apr 30 06:28:27 2013
New Revision: 316883
URL: http://svnweb.freebsd.org/changeset/ports/316883
Log:
- convert ports to USES= gettext
Approved by: portmgr (bapt@)
Modified:
head/security/gnupg1/Makefile
head/security/gnutls-devel/Makefile
head/security/gpa/Makefile
head/security/yapet/Makefile
Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile Tue Apr 30 06:26:37 2013 (r316882)
+++ head/security/gnupg1/Makefile Tue Apr 30 06:28:27 2013 (r316883)
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --disable-ldap
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= YES
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
Modified: head/security/gnutls-devel/Makefile
==============================================================================
--- head/security/gnutls-devel/Makefile Tue Apr 30 06:26:37 2013 (r316882)
+++ head/security/gnutls-devel/Makefile Tue Apr 30 06:28:27 2013 (r316883)
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --disable-guile --disab
--disable-hardware-acceleration
MANCOMPRESSED= no
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if (defined(WITH_LIBTASN1) || exists(${LOCALBASE}/lib/libtasn1.so.5)) && !defined(WITHOUT_LIBTASN1)
LIB_DEPENDS+= tasn1.5:${PORTSDIR}/security/libtasn1
@@ -54,7 +54,7 @@ PLIST_SUB+= CXX=""
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.endif
@@ -80,4 +80,4 @@ post-install:
.endif
.include "Makefile.man"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/security/gpa/Makefile
==============================================================================
--- head/security/gpa/Makefile Tue Apr 30 06:26:37 2013 (r316882)
+++ head/security/gpa/Makefile Tue Apr 30 06:28:27 2013 (r316883)
@@ -32,18 +32,18 @@ MAN1= gpa.1
OPTIONS_DEFINE= NLS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if !exists(${LOCALBASE}/bin/gpgsm)
IGNORE= requires gpgsm. (Re)Install security/gnupg with the GPGSM option ON, then rebuild security/gpgme if installed
.endif
-.if empty(PORT_OPTIONS:MNLS)
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
+PLIST_SUB+= NLS=""
+.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/security/yapet/Makefile
==============================================================================
--- head/security/yapet/Makefile Tue Apr 30 06:26:37 2013 (r316882)
+++ head/security/yapet/Makefile Tue Apr 30 06:28:27 2013 (r316883)
@@ -7,7 +7,7 @@ CATEGORIES= security
MASTER_SITES= http://www.guengel.ch/myapps/yapet/downloads/ http://homepage.hispeed.ch/rostertag/yapet/
MAINTAINER= rafi at guengel.ch
-COMMENT= A curses based password manager
+COMMENT= Curses based password manager
MAN1= yapet.1
MANCOMPRESSED= no
@@ -21,7 +21,7 @@ TTITLE_DESC= Enable Terminal Title
PWGEN_DESC= Enable Password Generator
CSV2YAPET_DESC= Build csv2yapet
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
# --enable-silent-rules: will make the build quiet
# --disable-install-doc: I take care of installing docs
@@ -49,7 +49,7 @@ PLIST_SUB+= CSV2YAPET="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
@@ -77,4 +77,4 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/THANKS ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-all
mailing list