aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--editors/calligra-l10n/files/bsd.l10n.mk3
-rw-r--r--editors/lazarus/Makefile6
-rw-r--r--editors/winefish/Makefile33
-rw-r--r--emulators/mednafen/Makefile23
-rw-r--r--emulators/pcsxr/Makefile6
-rw-r--r--emulators/vice/Makefile24
-rw-r--r--emulators/visualboyadvance-m/Makefile24
-rw-r--r--ftp/pavuk/Makefile20
-rw-r--r--ftp/proftpd/Makefile12
-rw-r--r--games/ceferino/Makefile24
-rw-r--r--games/ltris/Makefile12
-rw-r--r--games/ninix-aya/Makefile20
-rw-r--r--games/vdrift/Makefile15
-rw-r--r--games/xmoto/Makefile10
-rw-r--r--graphics/darktable/Makefile6
-rw-r--r--graphics/epdfview/Makefile19
-rw-r--r--graphics/gimageview/Makefile8
-rw-r--r--graphics/graphviz/Makefile6
-rw-r--r--graphics/sane-backends/Makefile8
-rw-r--r--graphics/xfig/Makefile33
-rw-r--r--graphics/xmorph/Makefile26
-rw-r--r--japanese/mutt-devel/Makefile50
22 files changed, 168 insertions, 220 deletions
diff --git a/editors/calligra-l10n/files/bsd.l10n.mk b/editors/calligra-l10n/files/bsd.l10n.mk
index ff603c2fa42e..866ef43a92b9 100644
--- a/editors/calligra-l10n/files/bsd.l10n.mk
+++ b/editors/calligra-l10n/files/bsd.l10n.mk
@@ -7,9 +7,8 @@ DIST_SUBDIR= KDE/calligra-l10n
CONFLICTS= ${PKGNAMEPREFIX}koffice-l10n-2.*
-USE_GETTEXT= yes
USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_BZIP2= yes
-USES= cmake
+USES= cmake gettext
.endif
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index da6b8bb2322d..daa71f6dac4a 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -44,7 +44,7 @@ QT4_DESC= Use qt4 interface
OPTIONS_DEFAULT= GTK2
.endif
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
LAZARUS_ARCH= i386
@@ -64,7 +64,7 @@ RUN_DEPENDS+= fpcres:${PORTSDIR}/lang/fpc-utils \
${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui
USE_ICONV= yes
-USE_GETTEXT= yes
+USES+= gettext
MAN1= lazarus-ide.1 lazbuild.1 startlazarus.1
SUB_FILES= pkg-message
@@ -196,4 +196,4 @@ post-install:
.include "${MASTERDIR}/Makefile.common"
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
index 5ea45dc39851..10c4d362d725 100644
--- a/editors/winefish/Makefile
+++ b/editors/winefish/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: winefish
-# Date created: 2005-09-09
-# Whom: Nicola Vitale <nivit@email.it>
-#
+# Created by: Nicola Vitale <nivit@email.it>
# $FreeBSD$
-#
PORTNAME= winefish
DISTVERSION= 1.3.3
@@ -32,27 +28,28 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui desktopfileutils gnomehier
-OPTIONS= CONTEXT "Enable ConTexT support (Experimental)" off \
- VNTEX "Vietnamese TeX user" off \
- UNIKEY_GTK "Vietname Tex user with UnikeyGTK input method" off
+OPTIONS_DEFINE= CONTEXT VNTEX UNIKEY_GTK NLS DOCS
+CONTEXT_DESC= ConTexT support (Experimental)
+VNTEX_DESC= Vietnamese TeX user
+UNIKEY_GTK_DESC= Vietname Tex user with UnikeyGTK input method
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined (WITH_CONTEXT)
+.if ${PORT_OPTIONS:MCONTEXT}
CONFIGURE_ARGS+= --with-context
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB= IFNLS=
# vietnamese support
-.if defined (WITH_UNIKEY_GTK) && !defined (WITH_VNTEX)
-WITH_VNTEX=true
+.if ${PORT_OPTIONS:MUNIKEY_GTK} && !${PORT_OPTIONS:MVNTEX}
+PORT_OPTIONS+= VNTEX
.endif
-.if defined (WITH_VNTEX)
+.if ${PORT_OPTIONS:MVNTEX}
CONFIGURE_ARGS+= --with-vntex
-.if defined (WITH_UNIKEY_GTK)
+.if ${PORT_OPTIONS:MUNIKEY_GTK}
CONFIGURE_ARGS+= --with-unikey-gtk
.endif
.endif
@@ -63,9 +60,9 @@ PLIST_SUB= IFNLS="@comment "
post-install:
-@update-desktop-database
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
${RM} ${DOCSDIR}/${PORTNAME}.html
${RMDIR} ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 0465d827216f..e09c8bdf8f36 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for: mednafen
-# Date created: 2006-02-28
-# Whom: Charlie & <root@bsd.org.pe>
-#
# $FreeBSD$
-#
PORTNAME= mednafen
PORTVERSION= 0.8.B
@@ -30,17 +25,17 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
WRKSRC= ${WRKDIR}/${PORTNAME}
SUB_FILES= pkg-message
-OPTIONS= NLS "Native Language Support" on
+OPTIONS_DEFINE= NLS DOCS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
FLAG_NLS= true
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
.if ${ARCH}==sparc64
@@ -53,10 +48,10 @@ pre-configure:
${WRKSRC}/configure
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/Documentation/mednafen.html ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index e09802e7960b..4d38943049e9 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -44,14 +44,14 @@ PORTDOCS= ChangeLog README
# accessed through libcdio (using cam(4) and pass(4))
DEFAULT_DVD_DEVICE?= /dev/cd0
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "amd64"
CONFIGURE_ARGS+= --enable-dynarec=x86_64
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB+= NLS=""
.else
@@ -78,4 +78,4 @@ post-install:
.endif
@-update-desktop-database
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 7166666892db..3c90ef7433fe 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -85,14 +85,10 @@ FIX_XAW= src/arch/unix/x11/xaw/about.c \
src/arch/unix/x11/xaw/widgets/MultiListP.h \
src/arch/unix/x11/xaw/widgets/ScrList.c \
-.if !defined(NOPORTDOCS)
-INFO= vice
-.endif
+.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION}<800063
-LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
+.if ${PORT_OPTIONS:MDOCS}
+INFO= vice
.endif
.if exists(${LOCALBASE}/bin/fc-cache)
@@ -108,9 +104,9 @@ PLIST_SUB+= NOFCCACHE=""
LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PATCH_DEPENDS+= ${LOCALBASE}/bin/iconv:${PORTSDIR}/converters/libiconv
-USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-nls --localedir=${LOCALBASE}/share/locale
# causes vice to crash:
#LDFLAGS+= -lgettextlib
@@ -145,10 +141,10 @@ post-patch:
${MV} "${WRKSRC}/po/${i}" "${WRKSRC}/po/${i}.latin"
${LOCALBASE}/bin/iconv -f latin1 -t utf-8 < "${WRKSRC}/po/${i}.latin" > "${WRKSRC}/po/${i}"
.endfor
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
.endif
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
.if defined(VICE_WITH_XAW3D)
.for i in ${FIX_XAW}
${REINPLACE_CMD} -e 's|X11/Xaw/|X11/Xaw3d/|' ${WRKSRC}/${i}
@@ -157,7 +153,7 @@ post-patch:
.endif
pre-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.endif
${MKDIR} ${PREFIX}/lib/vice/fonts
@@ -165,8 +161,8 @@ pre-install:
${PREFIX}/lib/vice/fonts/
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 051b43c1f09c..829b3c152b50 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: visualboyadvance-m
-# Date created: 2010-01-02
-# Whom: Nicole Reid <root@cooltrainer.org>
-#
+# Created by: Nicole Reid <root@cooltrainer.org>
# $FreeBSD$
-#
PORTNAME= visualboyadvance-m
PORTVERSION= 1.8.0r${SVN_REV}
@@ -18,8 +14,10 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
sfml-system.1:${PORTSDIR}/devel/sfml
-OPTIONS= GVBAM "Build gvbam (GTK2 frontend)" on \
- ASM "Enable ASM core and filters (i386 only)" off
+OPTIONS_DEFINE= GVBAM NLS
+OPTIONS_DEFAULT= GVBAM
+OPTIONS_DEFINE_i386= ASM
+GVBAM_DESC= Build gvbam (GTK2 frontend)
USE_BZIP2= yes
WANT_GNOME= yes
@@ -32,14 +30,14 @@ USES= cmake
CMAKE_ARGS+= -DVERSION:STRING="${PORTVERSION}" -DSYSCONFDIR:STRING="${PREFIX}/etc"
SVN_REV= 1001
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_ASM) && ${ARCH} == "i386"
+.if ${PORT_OPTIONS:MASM}
BUILD_DEPENDS+= as:${PORTSDIR}/devel/binutils
CMAKE_ARGS+= -DENABLE_ASM_CORE:BOOL=yes -DENABLE_ASM_SCALERS:BOOL=yes
.endif
-.if defined(WITH_GVBAM)
+.if ${PORT_OPTIONS:MGVBAM}
PLIST_SUB+= GVBAM=""
USE_GNOME= gtk20
LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
@@ -52,8 +50,8 @@ PLIST_SUB+= GVBAM="@comment "
CMAKE_ARGS+= -DENABLE_GTK:BOOL=no
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
CMAKE_ARGS+= -DENABLE_NLS:BOOL=yes
PLIST_SUB+= NLS=""
.else
@@ -80,4 +78,4 @@ maint-gen-distfile:
${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
${RM} -rf ${DISTNAME}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 078ed69660bc..3cdcc8a10de6 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: pavuk
-# Date created: 19 March 1998
-# Whom: Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
# $FreeBSD$
-#
PORTNAME= pavuk
PORTVERSION= 0.9.35
@@ -27,16 +23,18 @@ MAN1= pavuk.1
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_NLS)
+.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.pre.mk>
+
.if ${HAVE_GNOME:Mgtk20}!=""
PKGNAMESUFFIX= -gtk
USE_GNOME+= gtk20
@@ -63,7 +61,7 @@ pre-patch:
post-install:
${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${PREFIX}/etc
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for f in AUTHORS BUGS CREDITS ChangeLog COPYING MAILINGLIST NEWS \
README TODO wget-pavuk.HOWTO
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 112073ec50fc..97e76d2d1cb7 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: proftpd
-# Date created: 26 January 1998
-# Whom: Stephane Legrand
-#
+# Created by: Stephane Legrand
# $FreeBSD$
-#
PORTNAME?= proftpd
PORTVERSION?= 1.3.4c
@@ -100,7 +96,7 @@ PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}"
.endif #!defined(_BUILDING_PROFTPD_MODULE)
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if defined(USE_OPENSSL)
CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC}
@@ -163,7 +159,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --enable-nls
-USE_GETTEXT=yes
+USES+= gettext
PROFTPD_LIBS+= -lintl -L${LOCALBASE}/lib
PLIST_SUB+= NLS=""
.else
@@ -270,4 +266,4 @@ post-install:
@${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${MAN8PREFIX}/man/man8/
.endif #!defined(_BUILDING_PROFTPD_MODULE)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile
index 64d100cdd3e2..e4489604792c 100644
--- a/games/ceferino/Makefile
+++ b/games/ceferino/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ceferino
-# Date created: 2006-01-11
-# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
# $FreeBSD$
-#
PORTNAME= ceferino
PORTVERSION= 0.97.8
@@ -22,17 +18,17 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
CEFEDIRS= ima music levels sounds
-OPTIONS= NLS "Native Language Support" on
+OPTIONS_DEFINE= NLS DOCS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
FLAG_NLS= true
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
post-extract:
@@ -55,10 +51,10 @@ do-install:
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@cd ${WRKSRC} && \
${INSTALL_DATA} AUTHORS ChangeLog README ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 9765bf3634c4..f0a591d35ba1 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -17,14 +17,14 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --localstatedir=${DATADIR}
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITHOUT_NLS)
+.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
post-patch:
@@ -38,4 +38,4 @@ post-install:
@${CHMOD} 0664 ${DATADIR}/${PORTNAME}.hscr
@${CHOWN} root:games ${DATADIR}/${PORTNAME}.hscr
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index e250a97a7944..24154b400cd7 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: ninix-aya
-# Date created: 6 Dec 2003
-# Whom: UMENO Takashi
-#
+# Created by: UMENO Takashi
# $FreeBSD$
-#
PORTNAME= ninix-aya
PORTVERSION= 4.3.9
@@ -29,14 +25,14 @@ USE_PYTHON= yes
USE_GNOME= pygtk2
USE_GMAKE= yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
DOCSDIR= ${PREFIX}/share/doc/ninix
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
.else
PLIST_SUB+= NLS="@comment "
@@ -48,13 +44,13 @@ post-patch:
-e 's,lib/ninix,libexec/ninix,' \
-e 's,/doc,/share/doc/ninix,' \
${WRKSRC}/Makefile
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${REINPLACE_CMD} -e '/docdir)$$/d' \
${WRKSRC}/Makefile
.endif
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
@${REINPLACE_CMD} -e '/localedir/d' \
${WRKSRC}/Makefile
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile
index 40f9a00ebdb9..5e3a36bc9cf7 100644
--- a/games/vdrift/Makefile
+++ b/games/vdrift/Makefile
@@ -33,19 +33,18 @@ DATE_VERSION= 2010-06-30
SUB_FILES= pkg-message
-OPTIONS= DEBUG "Additional debug information" off \
- NLS "Internationalization support " on
+OPTIONS_DEFINE= DEBUG NLS DOCS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
SCONS_ARGS+= release=0
.else
SCONS_ARGS+= release=1
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
FLAG_NLS= true
.else
@@ -74,7 +73,7 @@ do-install:
${FIND} * -type f -name "*.po" -exec ${INSTALL_DATA} "{}" "${DATADIR}/po/{}" \;
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
.for FILE in docs/AUTHORS docs/README
${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
@@ -84,4 +83,4 @@ do-install:
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 047830bbe580..22cecf766b83 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -47,11 +47,7 @@ DESKTOP_ENTRIES="XMoto" \
"Game;SportsGame;ArcadeGame;" \
false
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800067
-BROKEN= does not compile due to missing getline()
-.endif
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MASIAN_TTF}
RUN_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
@@ -61,7 +57,7 @@ CONFIGURE_ARGS+=--without-asian-ttf-file
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
CONFIGURE_ENV+= LIBS="-lintl"
.else
@@ -77,4 +73,4 @@ post-install:
.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index 43ba1d36790c..c6fd1cc96c3c 100644
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@@ -42,7 +42,7 @@ GCC46_DESC= Build with GCC 4.6+ (better OpenMP support)
OPTIONS_DEFAULT= GPHOTO RAWSPEED GCC46
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MGPHOTO}
LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2
@@ -102,7 +102,7 @@ CMAKE_ARGS+= -DBUILD_SLIDESHOW:BOOL=OFF
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.else
CMAKE_ARGS+= -DUSE_NLS:BOOL=OFF
.endif
@@ -138,4 +138,4 @@ post-install:
@${REINPLACE_CMD} -e '/LC_MESSAGES/d' ${TMPPLIST}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 4efbce1e1ab5..d99eceff02b0 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: epdfview
-# Date created: 2006/06/01
-# Whom: chinsan <chinsan.tw@gmail.com>
-#
+# Created by: chinsan <chinsan.tw@gmail.com>
# $FreeBSD$
-#
PORTNAME= epdfview
PORTVERSION= 0.1.8
@@ -29,22 +25,21 @@ USE_GNOME= gtk20 intlhack
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= CUPS "Use cups printing system" off \
- NLS "Native language support" on
+OPTIONS_DEFINE= CUPS NLS
MAN1= epdfview.1
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
CONFIGURE_ARGS+=--with-cups
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
.else
CONFIGURE_ARGS+=--without-cups
.endif
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
PLIST_SUB+= NLS=""
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -63,4 +58,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/data/${PORTNAME}.desktop ${PREFIX}/share/applications/
@-update-desktop-database
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 0d9c3057a87e..cb36c42d2002 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -31,14 +31,14 @@ USE_XORG= xinerama ice
CONFIGURE_ARGS= --with-gtk2
CFLAGS+= -DUSE_GTK2
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if empty(PORT_OPTIONS:MSPLASH)
+.if ! ${PORT_OPTIONS:MSPLASH}
CONFIGURE_ARGS+= --disable-splash
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
@@ -113,4 +113,4 @@ post-configure:
's/^(GDK_IMLIB_(CFLAGS|LIBS) =).*$$/$${1}/'
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 88f4264913cd..4b1e68f495f6 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -94,8 +94,6 @@ NVTHREADS_DESC= Link with threads (needed for nvidia)
USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build corelib gui
.endif
-.include <bsd.port.pre.mk>
-
# allow the use localized gd ports in Makefile.local or slave ports.
GD_PORT?= graphics/gd
@@ -152,7 +150,7 @@ PLIST_SUB+= WITH_XPM="@comment "
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
.else
CONFIGURE_ARGS+= --disable-nls
.endif
@@ -481,4 +479,4 @@ post-install: install-ldconfig-file
${EXAMPLESDIR}/pathplan_data/
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index c912fc3789ec..45e65ba464c7 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -50,14 +50,14 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.include "Makefile.man"
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if empty(PORT_OPTIONS:MUSB)
+.if ! ${PORT_OPTIONS:MUSB}
CONFIGURE_ARGS+= --disable-libusb
.endif
.if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT= yes
+USES+= gettext
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-translations
@@ -125,4 +125,4 @@ post-install:
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 2ea50a8166b6..c06dcea4859d 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xfig
-# Date created: 4 January 1995
-# Whom: roberto
-#
+# Created by: roberto
# $FreeBSD$
-#
PORTNAME= xfig
PORTVERSION= 3.2.5b
@@ -36,23 +32,24 @@ MAKE_ARGS+= INSTALLFLAGS="${COPY}" \
INSTDATFLAGS="${_SHROWNGRP} -m ${SHAREMODE}" \
INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}"
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET= install install.libs install.html
-.endif
+OPTIONS_DEFINE= GHOSTSCRIPT I18N DOCS
+OPTIONS_DEFAULT= GHOSTSCRIPT I18N
+I18N_DESC= I18N support and Japanese docs
-OPTIONS= GHOSTSCRIPT "Ghostscript support" on \
- I18N "I18N support and Japanese docs" on
+.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
+.if ${PORT_OPTIONS:MDOCS}
+INSTALL_TARGET= install install.libs install.html
+.endif
-.if defined(WITHOUT_I18N) || defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MI18N} || ! ${PORT_OPTIONS:MDOCS}
PLIST_SUB+= JPORTDOCS="@comment "
.else
PLIST_SUB= JPORTDOCS=""
.endif
-.if !defined(WITHOUT_I18N)
-USE_GETTEXT= yes
+.if ${PORT_OPTIONS:MI18N}
+USES+= gettext
.endif
post-extract:
@@ -64,15 +61,15 @@ post-extract:
@${CP} ${WRKSRC}/Doc/xfig.man ${WRKSRC}
post-patch:
-.if defined(WITHOUT_GHOSTSCRIPT)
-.if defined(WITHOUT_I18N)
+.if ! ${PORT_OPTIONS:MGHOSTSCRIPT}
+.if ! ${PORT_OPTIONS:MI18N}
@${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
.else
@${REINPLACE_CMD} -e '/^XCOMM #define I18N/s|XCOMM ||' \
-e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
.endif
-.elif !defined(WITHOUT_I18N)
+.elif ${PORT_OPTIONS:MI18N}
@${REINPLACE_CMD} -e '/^XCOMM #define I18N/s|XCOMM ||' ${WRKSRC}/Imakefile
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 4f7583d5d698..a57bd6f6eef0 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: xmorph
-# Date created: Thu Aug 1 09:10:22 CDT 1996
-# Whom: erich@FreeBSD.org
-#
+# Created by: erich@FreeBSD.org
# $FreeBSD$
-#
PORTNAME= xmorph
PORTVERSION= 2006.08.17
@@ -32,6 +28,16 @@ USE_LDCONFIG= yes
MAN1= gtkmorph.1 xmorph.1
INFO= xmorph
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mgtk20}!=""
@@ -41,14 +47,6 @@ CONFIGURE_ARGS+= --with-gtk=2
CONFIGURE_ARGS+= --without-gtkmorph
.endif
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
-.else
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.endif
-
post-extract:
@${RM} -f ${WRKSRC}/doc/*.info*
@@ -56,7 +54,7 @@ post-patch:
@${REINPLACE_CMD} -e 's|^LDFLAGS=|#LDFLAGS=|g' ${WRKSRC}/configure
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC}/example && ${FIND} . | \
${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 36d03ca566b2..98e69cfb89a4 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for: ja-mutt
-# Date created: 4 Sep 2000
-# Whom: IWASHITA Yoji <shuna@pop16.odn.ne.jp>
-#
+# Created by: IWASHITA Yoji <shuna@pop16.odn.ne.jp>
# $FreeBSD$
-#
+
# WITH_MUTT_CYRUS_SASL2: if defined, 'Cyrus sasl' support.
#
@@ -79,52 +76,49 @@ CONFIGURE_ARGS= --with-slang --enable-locales-fix \
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
-OPTIONS= MUTT_CYRUS_SASL2 "Enable SASL2 authentication" off \
- MUTT_IMAP_HEADER_CACHE "Enable imap header cache" off \
- MUTT_IDN "Enable idn support" off \
- MUTT_MAILDIR_HEADER_CACHE "Enable maildir header cache" off
+OPTIONS_DEFINE= CYRUS_SASL2 IMAP_HEADER_CACHE IDN MAILDIR_HEADER_CACHE NLS
+CYRUS_SASL2_DESC= SASL2 authentication
+IMAP_HEADER_CACHE_DESC= imap header cache
+MAILDIR_HEADER_CACHE_DESC= maildir header cache
-.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(WITH_MUTT_CYRUS_SASL2)
+.if ${PORT_OPTIONS:MCYRUS_SASL2}
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
.endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
-WITH_MUTT_IMAP_HEADER_CACHE= yes
+.if ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
+PORT_OPTIONS+= MAILDIR_HEADER_CACHE
.endif
-.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
+.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE}
USE_BDB= 42+
.endif
-.if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_MUTT_IDN)
-WITH_MUTT_IDN= yes
-.endif
-.if defined(WITH_MUTT_IDN)
+.if ${PORT_OPTIONS:MIDN}
LIB_DEPENDS+= idn:${PORTSDIR}/dns/libidn
.endif
-.if defined(WITH_MUTT_CYRUS_SASL2)
+.if ${PORT_OPTIONS:MCYRUS_SASL2}
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
.endif
-.if defined(WITHOUT_NLS)
+.if ! ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
PLIST_SUB+= NLS=""
.endif
-.if defined(WITH_MUTT_IDN)
+.if ${PORT_OPTIONS:MIDN}
CONFIGURE_ARGS+= --with-idn
.else
CONFIGURE_ARGS+= --without-idn
.endif
-.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
+.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE}
CONFIGURE_ARGS+= --enable-hcache --without-gdbm --with-bdb
.else
CONFIGURE_ARGS+= --disable-hcache
.endif
-.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
+.if ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
CONFIGURE_ARGS+= --without-qdbm
.endif
@@ -133,7 +127,7 @@ MAN1= flea.1 mutt.1 muttbug.1 mutt_dotlock.1 smime_keys.1
MAN5= muttrc.5 mbox.5 mmdf.5
pre-configure:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
.endif
(cd ${WRKSRC}; ${ACLOCAL} -I m4; ${AUTOHEADER})
@@ -146,7 +140,7 @@ post-configure:
s|^(s%\@AUTOHEADER\@%).+(%g)|\1${AUTOHEADER}\2|" \
${BUILD_WRKSRC}/config.status
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
post-install:
${INSTALL_DATA} ${_DISTDIR}/INSTALL.JA-PATCH.ja ${DOCSDIR}
${INSTALL_DATA} ${_DISTDIR}/README.JA-PATCH.ja ${DOCSDIR}
@@ -165,4 +159,4 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/manual.ja.sgml ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>