svn commit: r316620 - in head: audio/soundtracker comms/fldigi comms/hylafax databases/postgresql84-server databases/postgresql91-server databases/postgresql92-server deskutils/xneur devel/geany-pl...
Baptiste Daroussin
bapt at FreeBSD.org
Fri Apr 26 15:11:02 UTC 2013
Author: bapt
Date: Fri Apr 26 15:10:57 2013
New Revision: 316620
URL: http://svnweb.freebsd.org/changeset/ports/316620
Log:
Convert USE_GETTEXT -> USES=gettext
While here:
- Trim headers
- Remove some useless pre.mk/post.mk
- Convert to optionsng
Modified:
head/audio/soundtracker/Makefile
head/comms/fldigi/Makefile
head/comms/hylafax/Makefile
head/databases/postgresql84-server/Makefile
head/databases/postgresql91-server/Makefile
head/databases/postgresql92-server/Makefile
head/deskutils/xneur/Makefile
head/devel/geany-plugins/files/Makefile.common
head/devel/gvfs/Makefile
head/devel/kdesvn-kde4/Makefile
head/devel/monotone/Makefile
head/devel/pikdev/Makefile
head/devel/rhtvision/Makefile
head/devel/ruby-gettext/Makefile
head/devel/subversion/Makefile.common
head/devel/subversion16/Makefile
head/devel/subversion16/Makefile.common
head/devel/urjtag/Makefile
head/devel/yasm/Makefile
head/dns/dnsmasq/Makefile
Modified: head/audio/soundtracker/Makefile
==============================================================================
--- head/audio/soundtracker/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/audio/soundtracker/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -31,7 +31,7 @@ DESKTOP_ENTRIES="SoundTracker" "Pattern-
"${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \
"soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MASM}
CONFIGURE_ARGS+= --enable-asm
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+= --disable-sdl
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
@@ -83,4 +83,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/sharp.xpm \
${PREFIX}/share/pixmaps/soundtracker.xpm
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/comms/fldigi/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -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/h
.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
Modified: head/comms/hylafax/Makefile
==============================================================================
--- head/comms/hylafax/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/comms/hylafax/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -53,12 +53,12 @@ MAN8= choptest.8c cqtest.8c dialtest.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>
Modified: head/databases/postgresql84-server/Makefile
==============================================================================
--- head/databases/postgresql84-server/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/databases/postgresql84-server/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -133,8 +133,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-
. endif
.endif # !SLAVE_ONLY
-.include <bsd.port.pre.mk>
-
.if !defined(SLAVE_ONLY)
PATCH_DIST_STRIP=-p1
@@ -173,10 +171,10 @@ CONFIGURE_ARGS+=--enable-integer-datetim
CONFIGURE_ARGS+=--disable-integer-datetimes
. endif
-. if ( defined(WITH_GETTEXT) || ${PORT_OPTIONS:MNLS} )
+. if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= GETTEXT=""
-USE_GETTEXT= yes
+USES+= gettext
. else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= GETTEXT="@comment "
@@ -371,4 +369,4 @@ check:
fi
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/databases/postgresql91-server/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -140,8 +140,6 @@ PLIST_SUB+= OSSP=""
PLIST_SUB+= OSSP="@comment "
.endif
-.include <bsd.port.pre.mk>
-
.if !defined(SLAVE_ONLY)
PATCH_DIST_STRIP=-p1
@@ -181,10 +179,10 @@ PLIST_SUB+= TZDATA="@comment "
CONFIGURE_ARGS+=--disable-integer-datetimes
. endif
-. if ( defined(WITH_GETTEXT) || ${PORT_OPTIONS:MNLS} )
+. if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= GETTEXT=""
-USE_GETTEXT= yes
+USES+= gettext
. else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= GETTEXT="@comment "
@@ -390,4 +388,4 @@ check:
fi
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/databases/postgresql92-server/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -139,8 +139,6 @@ PLIST_SUB+= OSSP=""
PLIST_SUB+= OSSP="@comment "
.endif
-.include <bsd.port.pre.mk>
-
.if !defined(SLAVE_ONLY)
PATCH_DIST_STRIP=-p1
@@ -180,10 +178,10 @@ PLIST_SUB+= TZDATA="@comment "
CONFIGURE_ARGS+=--disable-integer-datetimes
. endif
-. if ( defined(WITH_GETTEXT) || ${PORT_OPTIONS:MNLS} )
+. if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= GETTEXT=""
-USE_GETTEXT= yes
+USES= gettext
. else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= GETTEXT="@comment "
@@ -392,4 +390,4 @@ check:
fi
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/deskutils/xneur/Makefile
==============================================================================
--- head/deskutils/xneur/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/deskutils/xneur/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xneur
-# Date created: 19 January 2007
-# Whom: Alex "lissyara" Keda <admin at lissyara.su>
-#
+# Created by: Alex "lissyara" Keda <admin at lissyara.su>
# $FreeBSD$
-#
PORTNAME= xneur
PORTVERSION= 0.15.0
@@ -19,8 +15,8 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/
pcre.3:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
+USES= pkgconfig pathfix
GNU_CONFIGURE= yes
-USE_GNOME= pkgconfig gnomehack
USE_ICONV= yes
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
@@ -32,15 +28,16 @@ INSTALLS_ICONS= yes
MAN1= xneur.1
MAN5= xneurrc.5
-OPTIONS= GSTREAMER "Build with GStreamer sound support" on \
- OPENAL "Build with OpenAL sound support" off \
- ASPELL "Build with aspell support" on \
- XOSD "Build with xosd support" off
+OPTIONS_DEFINE= ASPELL XOSD NLS X11
+OPTIONS_DEFAULT= GSTREAMER ASPELL
+OPTIONS_RADIO= SOUND
+OPTIONS_RADIO_SOUND= GSTREAMER OPENAL
+XOSD_DESC= Xosd support
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
@@ -48,41 +45,35 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+= --without-x
-.else
+.if ${PORT_OPTIONS:MX11}
USE_XORG+= x11
CONFIGURE_ARGS+= --with-x
+.else
+CONFIGURE_ARGS+= --without-x
.endif
-.if !defined(WITHOUT_GSTREAMER) && defined(WITH_OPENAL)
-IGNORE= please select only one sound library
-.else
-.if !defined(WITHOUT_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
USE_GSTREAMER= yes
CONFIGURE_ARGS+= --with-sound=gstreamer
-.endif
-.if defined(WITH_OPENAL)
+.elif ${PORT_OPTIONS:MOPENAL}
USE_OPENAL= al alut
CONFIGURE_ARGS+= --with-sound=openal
-.endif
-.if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL)
+.else
CONFIGURE_ARGS+= --with-sound=no
.endif
-.endif
-.if defined(WITHOUT_ASPELL)
-CONFIGURE_ARGS+= --with-spell=no --without-aspell
-.else
+.if ${PORT_OPTIONS:MASPELL}
LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+= --with-spell=aspell
+.else
+CONFIGURE_ARGS+= --with-spell=no --without-aspell
.endif
-.if !defined(WITH_XOSD)
-CONFIGURE_ARGS+= --without-xosd
-.else
+.if ${PORT_OPTIONS:MXOSD}
LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd
CONFIGURE_ARGS+= --with-xosd
+.else
+CONFIGURE_ARGS+= --without-xosd
.endif
post-patch:
@@ -93,4 +84,4 @@ post-install:
${CP} -p ${PREFIX}/etc/xneur/xneurrc.sample ${PREFIX}/etc/xneur/xneurrc
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/geany-plugins/files/Makefile.common
==============================================================================
--- head/devel/geany-plugins/files/Makefile.common Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/geany-plugins/files/Makefile.common Fri Apr 26 15:10:57 2013 (r316620)
@@ -43,7 +43,7 @@ DOCSDIR= share/doc/geany-plugins
.if ${PORTNAME} != "geany-plugins-l10n"
. if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
. else
CONFIGURE_ARGS+= --disable-nls
. endif
Modified: head/devel/gvfs/Makefile
==============================================================================
--- head/devel/gvfs/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/gvfs/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -16,10 +16,10 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/db
gcrypt:${PORTSDIR}/security/libgcrypt \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+USES= gettext
USE_XZ= yes
USE_GNOME= glib20 gnomehack gnomeprefix intlhack intltool
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
Modified: head/devel/kdesvn-kde4/Makefile
==============================================================================
--- head/devel/kdesvn-kde4/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/kdesvn-kde4/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -26,10 +26,10 @@ MAKE_JOBS_SAFE= yes
MAN1= kdesvn.1 kdesvnaskpass.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
@@ -48,4 +48,4 @@ post-patch:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/monotone/Makefile
==============================================================================
--- head/devel/monotone/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/monotone/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: monotone
-# Date created: 05 Feb 2004
-# Whom: Mark A. Wicks <mwicks at kettering.edu>
-#
+# Created by: Mark A. Wicks <mwicks at kettering.edu>
# $FreeBSD$
-#
PORTNAME= monotone
PORTVERSION= 1.0
@@ -61,28 +57,28 @@ MAN1= mtn.1 \
.endif
PORTDOCS= *
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == amd64
USE_GCC= 4.2+
.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-.else
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES= gettext
PLIST_FILES+= share/locale/de/LC_MESSAGES/monotone.mo \
share/locale/fr/LC_MESSAGES/monotone.mo \
share/locale/it/LC_MESSAGES/monotone.mo \
share/locale/pt/LC_MESSAGES/monotone.mo \
share/locale/sv/LC_MESSAGES/monotone.mo
+.else
+CONFIGURE_ARGS+= --disable-nls
.endif
post-extract:
@${RM} -f ${WRKSRC}/monotone.info*
post-patch:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} -Ee '/^install-(contrib|examples)-data:/{' -e 'n' -e 'd' -e '}' ${WRKSRC}/Makefile.in
.endif
.if defined(NO_INSTALL_MANPAGES)
@@ -99,10 +95,10 @@ post-patch:
post-install:
${MKDIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/pikdev/Makefile
==============================================================================
--- head/devel/pikdev/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/pikdev/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pikdev
-# Date created: 2006-03-14
-# Whom: Jose Alonso Cardenas Marquez <acardenas at bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas at bsd.org.pe>
# $FreeBSD$
-#
PORTNAME= pikdev
PORTVERSION= 0.9.2
@@ -29,25 +25,23 @@ CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+= --with-pic=yes
SUB_FILES= pkg-message
-OPTIONS= DEBUG "Enable debug information" off \
- NLS "Native Language Support" on
+OPTIONS_DEFINE= DEBUG NLS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "sparc64"
BROKEN= Does not compile on sparc64
.endif
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-debug=full
.endif
-.if defined(WITHOUT_NLS)
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
-FLAG_NLS= true
+.else
+PLIST_SUB+= NLS="@comment "
.endif
post-patch:
@@ -57,11 +51,11 @@ post-patch:
post-configure:
${REINPLACE_CMD} -e 's|^install-data-am: install-docs install-nls|install-data-am:|g' \
${WRKSRC}/doc/en/${MAKEFILE}
-.if !defined(FLAG_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
${REINPLACE_CMD} -e 's|^install-data-am: install-nls|install-data-am:|g' ${WRKSRC}/po/Makefile
.endif
post-install:
${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/rhtvision/Makefile
==============================================================================
--- head/devel/rhtvision/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/rhtvision/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rhtvision
-# Date created: 18 June 2002
-# Whom: Hye-Shik Chang
-#
+# Created by: Hye-Shik Chang
# $FreeBSD$
-#
PORTNAME= rhtvision
PORTVERSION= 2.1.0
@@ -22,13 +18,13 @@ USE_LDCONFIG= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
.endif
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
USE_XORG= x11 xrender xmu sm xt ice
PLIST_SUB+= X11_ONLY=""
CFLAGS+= -I${LOCALBASE}/include
@@ -50,4 +46,4 @@ post-patch:
${WRKSRC}/${f}
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/ruby-gettext/Makefile
==============================================================================
--- head/devel/ruby-gettext/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/ruby-gettext/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -16,7 +16,6 @@ COMMENT= A Ruby implementation of the ge
DEPRECATED= Does not work with Ruby 1.9
EXPIRATION_DATE= 2013-05-02
-#USE_GETTEXT= yes # not actually depends on it
USE_RUBY= yes
USE_RUBY_FEATURES= racc-runtime iconv
USE_RUBY_SETUP= yes
Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/subversion/Makefile.common Fri Apr 26 15:10:57 2013 (r316620)
@@ -130,7 +130,7 @@ LIB_DEPENDS+= svn_client-1:${PORTSDIR}/d
# KWallet requires NLS to be enabled.
.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MKDE_KWALLET}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= WITHOUT_GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
Modified: head/devel/subversion16/Makefile
==============================================================================
--- head/devel/subversion16/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/subversion16/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: subversion
-# Date created: 10 September 2001
-# Whom: rooneg at electricjellyfish.net
-#
+# Created by: rooneg at electricjellyfish.net
# $FreeBSD$
MAINTAINER= lev at FreeBSD.org
@@ -18,23 +15,27 @@ MAN8= svnserve.8
TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
-OPTIONS= P4_STYLE_MARKERS "Perforce-style conflict markers" on \
- ENHANCED_KEYWORD "Enhanced svn:keyword support" on \
- FREEBSD_TEMPLATE "FreeBSD Project log template" on \
- MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
- MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \
- NEON "WebDAV/Delta-V repo access module (neon)" on \
- SERF "WebDAV/Delta-V repo access module (serf)" off \
- SASL "SASL2 authorization support" off \
- BDB "Berkeley DB (4 or 5) repository backend" on \
- ASVN "Build and install Archive SVN (asvn)" off \
- MAINTAINER_DEBUG "Build debug version" off \
- SVNSERVE_WRAPPER "Enable svnserve wrapper" off \
- SVNAUTHZ_VALIDATE "install svnauthz-validate" off \
- STATIC "Build static version (no shared libs)" off \
- GNOME_KEYRING "Build with GNOME Keyring auth support" off \
- KDE_KWALLET "Build with KDE KWallet auth support" off \
- BOOK "Install the Subversion Book" off
+OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE MOD_DAV_SVN MOD_DONTDOTHAT \
+ NEON SERF SASL BDB ASVN MAINTAINER_DEBUG SVNSERVE_WRAPPER SVNAUTHZ_VALIDATE \
+ STATIC GNOME_KEYRING KDE_KWALLET BOOK DOCS
+OPTIONS_DEFAULT= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON BDB
+P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
+ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support
+FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
+MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X
+MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X
+NEON_DESC= WebDAV/Delta-V repo access module (neon)
+SERF_DESC= WebDAV/Delta-V repo access module (serf)
+SASL_DESC= SASL2 authorization support
+BDB_DESC= Berkeley DB (4 or 5) repository backend
+ASVN_DESC= Build and install Archive SVN (asvn)
+MAINTAINER_DEBUG_DESC= Build debug version
+SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper
+SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate
+STATIC_DESC= Build static version (no shared libs)
+GNOME_KEYRING_DESC= Build with GNOME Keyring auth support
+KDE_KWALLET_DESC= Build with KDE KWallet auth support
+BOOK_DESC= Install the Subversion Book
.include "Makefile.common"
@@ -48,22 +49,22 @@ SUB_FILES= pkg-install \
WITH_REPOSITORY_CREATION= yes
.endif
-.if defined(WITH_REPOSITORY_CREATION)
+.if ${PORT_OPTIONS:MREPOSITORY_CREATION}
MKREPOS_TARGET= _mkrepos
.endif
# Patches required for use with the FreeBSD Project repository only
-.if !defined(WITHOUT_P4_STYLE_MARKERS)
+.if ${PORT_OPTIONS:MP4_STYLE_MARKERS}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.endif
-.if !defined(WITHOUT_ENHANCED_KEYWORD)
+.if ${PORT_OPTIONS:MENHANCED_KEYWORD}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword
.endif
-.if !defined(WITHOUT_FREEBSD_TEMPLATE)
+.if ${PORT_OPTIONS:MFREEBSD_TEMPLATe}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
.endif
-.if defined(WITH_SVNSERVE_WRAPPER)
+.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
PLIST_SUB+= SVNSERVE_WRAPPER=""
SUB_LIST+= SVNSERVE_BIN_EXT=".bin"
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper
@@ -72,7 +73,7 @@ PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
SUB_LIST+= SVNSERVE_BIN_EXT=""
.endif
-.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK}
BOOK_HTML= svn-book-html.tar.bz2
BOOK_PDF= svn-book.pdf
DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book
@@ -81,7 +82,7 @@ PLIST_SUB+= BOOK=""
PLIST_SUB+= BOOK="@comment "
.endif
-.if defined(WITH_ASVN)
+.if ${PORT_OPTIONS:MASVN}
RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
PLIST_SUB+= ASVN=""
.else
@@ -94,43 +95,43 @@ SCRIPTS_DATA=
pre-everything::
@${ECHO_MSG} ""
-.if defined(WITH_NEON)
+.if ${PORT_OPTIONS:MNEON}
@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
.else
@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
.endif
@${ECHO_MSG} ""
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
.else
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled."
.endif
@${ECHO_MSG} ""
-.if defined(WITH_MAINTAINER_DEBUG)
+.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
@${ECHO_MSG} "Build debug version."
@${ECHO_MSG} ""
.endif
-.if defined(WITH_MOD_DAV_SVN)
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
.else
@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
.endif
@${ECHO_MSG} ""
-.if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN)
+.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled."
.else
@${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X"
.endif
@${ECHO_MSG} ""
-.if defined(WITH_SVNSERVE_WRAPPER)
+.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${ECHO_MSG} "svnserve wrapper enabled."
@${ECHO_MSG} ""
.endif
-.if defined(WITH_SVNAUTHZ_VALIDATE)
+.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
@${ECHO_MSG} "svnauthz-validate enabled."
@${ECHO_MSG} ""
.endif
-.if defined(WITH_REPOSITORY_CREATION)
+.if ${PORT_OPTIONS:MREPOSITORY_CREATION}
@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
@${ECHO_MSG} "Make sure that all committers are its members."
@${ECHO_MSG} ""
@@ -148,34 +149,34 @@ pre-everything::
@${ECHO_MSG} "* the above subdirectories are writable by this group"
.endif
@${ECHO_MSG} ""
-.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK}
@${ECHO_MSG} "Subversion Book will be installed."
@${ECHO_MSG} ""
.endif
-.if defined(WITH_ASVN)
+.if ${PORT_OPTIONS:MASVN}
@${ECHO_MSG} "asvn will be installed"
@${ECHO_MSG} ""
.endif
-.if defined(WITH_STATIC)
-.if defined(WITH_MOD_DAV_SVN)
+.if ${PORT_OPTIONS:MSTATIC}
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!"
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${FALSE}
.endif
-.if defined(WITH_SVNAUTHZ_VALIDATE)
+.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${ECHO_MSG} "!!! svnauthz_validate and static build are not compatible !!!"
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${FALSE}
.endif
-.if defined(WITH_GNOME_KEYRING)
+.if ${PORT_OPTIONS:MGNOME_KEYRING}
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!"
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${FALSE}
.endif
-.if defined(WITH_KDE_WALLET)
+.if ${PORT_OPTIONS:MKDE_WALLET}
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!"
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@@ -186,7 +187,7 @@ pre-everything::
@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
pre-configure:
-.if !defined(WITHOUT_BDB)
+.if ${PORT_OPTIONS:MBDB}
@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \
${ECHO_MSG} "" ; \
@@ -201,11 +202,11 @@ pre-configure:
.endif
post-build:
-.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
+.if ${PORT_OPTIONS:MMOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT}
cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c
.endif
-.if defined(WITH_SVNAUTHZ_VALIDATE)
+.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
# place binary in ${WRKDIR}, else we install it twice
cd ${WRKSRC}/tools/server-side && \
${CC} svnauthz-validate.c -o ../../svnauthz-validate -I${WRKSRC}/subversion/include -I${APR_INCLUDE_DIR} \
@@ -213,22 +214,22 @@ post-build:
.endif
pre-install:
-.if defined(WITH_MOD_DAV_SVN)
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
# activate dav_module now in pkg-install to prevent double activation.
# workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.endif
post-install: ${MKREPOS_TARGET}
-.if defined(WITH_MOD_DAV_SVN)
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
-.if defined(WITH_MOD_DONTDOTHAT)
+.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
.endif
-.if defined(WITH_SVNAUTHZ_VALIDATE)
+.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
${INSTALL_PROGRAM} ${WRKSRC}/svnauthz-validate ${PREFIX}/bin
.endif
@${MKDIR} ${DATADIR}
@@ -240,15 +241,15 @@ post-install: ${MKREPOS_TARGET}
for f in ${TXT_DOCS}; do \
${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
done
-.if defined(WITH_BOOK)
+.if ${PORT_OPTIONS:MBOOK}
${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR}
${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}
.endif
.endif
-.if defined(WITH_ASVN)
+.if ${PORT_OPTIONS:MASVN}
${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
.endif
-.if defined(WITH_SVNSERVE_WRAPPER)
+.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
@@ -260,7 +261,7 @@ SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREP
_mkrepos: .USE
.if !exists(${SVNREPOS})
-.if defined(WITH_SVNSERVE_WRAPPER)
+.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \
${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \
else \
@@ -288,7 +289,7 @@ _mkrepos: .USE
.endif
@${MKDIR} ${SVNREPOS}
@${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS}
-.if defined(WITH_SVNSERVE_WRAPPER)
+.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES}
@${CHMOD} g+w ${SVNGRPFILES}
@for i in ${SVNREPOS}/db/* ; do \
Modified: head/devel/subversion16/Makefile.common
==============================================================================
--- head/devel/subversion16/Makefile.common Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/subversion16/Makefile.common Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,7 +1,4 @@
-# New ports collection makefile for: subversion
-# Date created: 10 September 2001
-# Whom: rooneg at electricjellyfish.net
-#
+# Created by: rooneg at electricjellyfish.net
# $FreeBSD$
PORTNAME= subversion
@@ -43,7 +40,7 @@ OPTIONS= # Dirty hack: if OPTIONS is no
.include "Makefile.inc"
# Default is "on"
-.if !defined(WITHOUT_NEON)
+.if ${PORT_OPTIONS:MNEON}
LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
PLIST_SUB+= NEON=""
.else
@@ -51,7 +48,7 @@ CONFIGURE_ARGS+=--without-neon
PLIST_SUB+= NEON="@comment "
.endif
-.if defined(WITH_SASL)
+.if ${PORT_OPTIONS:MSASL}
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
PLIST_SUB+= SASL=""
@@ -61,7 +58,7 @@ PLIST_SUB+= SASL="@comment "
.endif
# Default is "on"
-.if !defined(WITHOUT_BDB)
+.if ${PORT_OPTIONS:MBDB}
USE_BDB= 42+
PLIST_SUB+= BDB=""
.else
@@ -69,14 +66,14 @@ CONFIGURE_ARGS+=--without-berkeley-db
PLIST_SUB+= BDB="@comment "
.endif
-.if defined(WITH_MOD_DAV_SVN)
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
WITH_APACHE= yes
CONFIGURE_ARGS+=--with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
SVNUSER?= www
-.if defined(WITH_MOD_DONTDOTHAT)
+.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
PLIST_SUB+= MOD_DONTDOTHAT=""
.else
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
@@ -108,14 +105,14 @@ APU_CONFIG= ${LOCALBASE}/bin/apu-1-con
CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
-.if defined(WITH_SVNAUTHZ_VALIDATE)
+.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
APR_INCLUDE_DIR!= ${APR_CONFIG} --includedir
PLIST_SUB+= SVNAUTHZ_VALIDATE=""
.else
PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
.endif
-.if defined(WITH_SERF)
+.if ${PORT_OPTIONS:MSERF}
LIB_DEPENDS+= serf-1:${PORTSDIR}/www/serf
CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
PLIST_SUB+= SERF=""
@@ -124,8 +121,8 @@ CONFIGURE_ARGS+=--without-serf
PLIST_SUB+= SERF="@comment "
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= WITHOUT_GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
@@ -136,19 +133,19 @@ PLIST_SUB+= WITHOUT_GETTEXT="@comment "
CFLAGS+= -fpic -DPIC
.endif
-.if defined(WITH_MAINTAINER_DEBUG)
+.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug
CFLAGS+= -g
.endif
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
CONFIGURE_ARGS+=--enable-all-static
PLIST_SUB+= DYNAMIC_ENABLED="@comment "
.else
PLIST_SUB+= DYNAMIC_ENABLED=""
.endif
-.if defined(WITH_GNOME_KEYRING)
+.if ${PORT_OPTIONS:MGNOME_KEYRING}
LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
CONFIGURE_ARGS+=--with-gnome-keyring
PLIST_SUB+= GNOME_KEYRING=""
@@ -157,7 +154,7 @@ CONFIGURE_ARGS+=--without-gnome-keyring
PLIST_SUB+= GNOME_KEYRING="@comment "
.endif
-.if defined(WITH_KDE_KWALLET)
+.if ${PORT_OPTIONS:MKDE_KWALLET}
USE_KDE4= kdelibs runtime
CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
PLIST_SUB+= KDE_KWALLET=""
Modified: head/devel/urjtag/Makefile
==============================================================================
--- head/devel/urjtag/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/urjtag/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -31,7 +31,7 @@ USB_DESC= Build support for USB JTAG ada
FTDI_DESC= Build support for FTDI-based USB JTAG adapters
JEDEC_DESC= Enable experimental JEDEC flash detection
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MJEDEC}
CONFIGURE_ARGS+= --enable-jedec
@@ -52,7 +52,7 @@ LIB_DEPENDS+= readline.6:${PORTSDIR}/dev
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
@@ -63,4 +63,4 @@ post-patch:
# Suppress svn(1) binary detection
@${REINPLACE_CMD} -e 's|^SVN=.*|SVN=''|' ${WRKSRC}/configure
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/yasm/Makefile
==============================================================================
--- head/devel/yasm/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/devel/yasm/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -1,7 +1,4 @@
-# ex:ts=8
-# Ports collection makefile for: yasm
-# Date created: Apr 7, 2003
-# Whom: ijliao
+# Created by: ijliao
#
# $FreeBSD$
#
@@ -23,21 +20,21 @@ CONFIGURE_ARGS+=--disable-python --disab
CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "ia64"
CFLAGS:= ${CFLAGS:C/-O[0-9]//g}
.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls --without-libiconv-prefix --without-libintl-prefix
-.else
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
USE_ICONV= yes
+.else
+CONFIGURE_ARGS+=--disable-nls --without-libiconv-prefix --without-libintl-prefix
.endif
INSTALL_TARGET= install install-man
MAN1= yasm.1
MAN7= yasm_arch.7 yasm_dbgfmts.7 yasm_objfmts.7 yasm_parsers.7
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/dns/dnsmasq/Makefile
==============================================================================
--- head/dns/dnsmasq/Makefile Fri Apr 26 15:10:03 2013 (r316619)
+++ head/dns/dnsmasq/Makefile Fri Apr 26 15:10:57 2013 (r316620)
@@ -40,11 +40,10 @@ CFLAGS+= -DNO_IPV6
.endif
.if ${PORT_OPTIONS:MNLS}
-USES+= pkgconfig
+USES+= pkgconfig gettext
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list