aboutsummaryrefslogtreecommitdiffstats
path: root/comms
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2013-04-26 23:10:57 +0800
committerbapt <bapt@FreeBSD.org>2013-04-26 23:10:57 +0800
commitcc4b94048a126ec78a099b5d48c981211ebb05b4 (patch)
treea82894e443e00d2d1e62c361da23f99b943f1351 /comms
parent1e52c8a94d29dd477a2bee1a90337267ab29c66b (diff)
downloadfreebsd-ports-gnome-cc4b94048a126ec78a099b5d48c981211ebb05b4.tar.gz
freebsd-ports-gnome-cc4b94048a126ec78a099b5d48c981211ebb05b4.tar.zst
freebsd-ports-gnome-cc4b94048a126ec78a099b5d48c981211ebb05b4.zip
Convert USE_GETTEXT -> USES=gettext
While here: - Trim headers - Remove some useless pre.mk/post.mk - Convert to optionsng
Diffstat (limited to 'comms')
-rw-r--r--comms/fldigi/Makefile12
-rw-r--r--comms/hylafax/Makefile12
2 files changed, 12 insertions, 12 deletions
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index c7ed7a0dda92..5b57f024247c 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config"
MAN1= fldigi.1
-OPTIONS_DEFINE= NATIVE_OPT FLARQ XMLRPC OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB
+OPTIONS_DEFINE= NATIVE_OPT FLARQ XMLRPC OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS
NATIVE_OPT_DESC= Enable Native Optimizations
FLARQ_DESC= Compile flarq
@@ -94,13 +94,13 @@ LIB_DEPENDS+= hamlib:${PORTSDIR}/comms/hamlib
.else
CONFIGURE_ARGS+=--without-hamlib
.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
-USE_GETTEXT= yes
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
# Always need asciidoc for man pages
CONFIGURE_ARGS+=--with-asciidoc
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 7cfd3d7507e8..3f4d8e8a1787 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -53,12 +53,12 @@ MAN8= choptest.8c cqtest.8c dialtest.8c faxabort.8c faxaddmodem.8c \
SUID_EXES= ${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
-OPTIONS_DEFINE= PAM NLS GAWK
+OPTIONS_DEFINE= PAM NLS GAWK DOCS
OPTIONS_DEFAULT=PAM NLS
NO_OPTIONS_SORT=yes
GAWK_DESC= Use gawk for scripts
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
# Defaults to "North American Letter". Use "ISO A4" for A4.
.if defined(PAGESIZE)
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--disable-pam
.endif
# Want HTML documentation?
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
CONFIGURE_ARGS+=--with-HTML=yes
PLIST_SUB+= PORTDOCS=""
.else
@@ -95,7 +95,7 @@ RUN_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
CONFIGURE_ARGS+=--with-AWK="${LOCALBASE}/bin/gawk"
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= WITH_NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
@@ -128,7 +128,7 @@ post-install:
.for f in hfaxd.conf pagesizes typerules
if [ ! -f ${PREFIX}/lib/fax/${f} ]; then ${CP} -p ${PREFIX}/lib/fax/${f}-dist ${PREFIX}/lib/fax/${f}; fi
.endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
.endif
@@ -138,4 +138,4 @@ post-install:
CONFIGURE_ARGS+= --with-GETTY=SysV
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>