svn commit: r394778 - in head: archivers/file-roller archivers/php5-snappy archivers/xarchiver astro/boinc-astropulse astro/boinc-setiathome-v7 astro/google-earth astro/gpsd astro/gpsdrive astro/gp...

Mathieu Arnold mat at FreeBSD.org
Wed Aug 19 13:30:08 UTC 2015


Author: mat
Date: Wed Aug 19 13:29:59 2015
New Revision: 394778
URL: https://svnweb.freebsd.org/changeset/ports/394778

Log:
  Convert ports to use the options helpers in categories [abc]*, and minor fixes.
  
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D3412?

Modified:
  head/archivers/file-roller/Makefile
  head/archivers/php5-snappy/Makefile
  head/archivers/xarchiver/Makefile
  head/astro/boinc-astropulse/Makefile
  head/astro/boinc-setiathome-v7/Makefile
  head/astro/google-earth/Makefile
  head/astro/gpsd/Makefile
  head/astro/gpsdrive/Makefile
  head/astro/gpsman/Makefile
  head/astro/merkaartor/Makefile
  head/astro/osmium/Makefile
  head/astro/viking/Makefile
  head/astro/xtide/Makefile
  head/audio/abraca/Makefile
  head/audio/alsa-plugins/Makefile
  head/audio/alure/Makefile
  head/audio/ario/Makefile
  head/audio/asunder/Makefile
  head/audio/baudline/Makefile
  head/audio/clementine-player/Makefile
  head/audio/csound/Makefile
  head/audio/csound6/Makefile
  head/audio/deadbeef/Makefile
  head/audio/dumb-allegro/Makefile
  head/audio/dumb/Makefile
  head/audio/dvda-author/Makefile
  head/audio/easytag/Makefile
  head/audio/espeak/Makefile
  head/audio/etktab/Makefile
  head/audio/festival/Makefile
  head/audio/firefly/Makefile
  head/audio/gbsplay/Makefile
  head/audio/gimmix/Makefile
  head/audio/gmpc/Makefile
  head/audio/gmusicbrowser/Makefile
  head/audio/gnome-media/Makefile
  head/audio/gnome-media/pkg-plist
  head/audio/goobox/Makefile
  head/audio/gspeakers/Makefile
  head/audio/jack/Makefile
  head/audio/jack_ghero/Makefile
  head/audio/jack_umidi/Makefile
  head/audio/juke/Makefile
  head/audio/kaudiocreator/Makefile
  head/audio/lash/Makefile
  head/audio/liba52/Makefile
  head/audio/libaacplus/Makefile
  head/audio/libamrnb/Makefile
  head/audio/libamrwb/Makefile
  head/audio/libfishsound/Makefile
  head/audio/liblo/Makefile
  head/audio/libmpdclient/Makefile
  head/audio/libnjb/Makefile
  head/audio/libsidplayfp/Makefile
  head/audio/mctoolame-decoder/Makefile
  head/audio/mctoolame-encoder/Makefile
  head/audio/mma/Makefile
  head/audio/mp3asm/Makefile
  head/audio/mp3blaster/Makefile
  head/audio/mp3stat/Makefile
  head/audio/mpdscribble/Makefile
  head/audio/mps/Makefile
  head/audio/muse/Makefile
  head/audio/musicpc/Makefile
  head/audio/ncmpc/Makefile
  head/audio/ncmpcpp/Makefile
  head/audio/openal/Makefile
  head/audio/opusfile/Makefile
  head/audio/pacpl/Makefile
  head/audio/paprefs/Makefile
  head/audio/portaudio/Makefile
  head/audio/pulseaudio/Makefile
  head/audio/scrobbler/Makefile
  head/audio/shairport/Makefile
  head/audio/shoutcast/Makefile
  head/audio/soundtracker/Makefile
  head/audio/sox/Makefile
  head/audio/sphinxbase/Makefile
  head/audio/spiralsynth/Makefile
  head/audio/squeezeboxserver/Makefile
  head/audio/streamripper/Makefile
  head/audio/swhplugins/Makefile
  head/audio/taglib/Makefile
  head/audio/tempest_for_eliza/Makefile
  head/audio/timemachine/Makefile
  head/audio/uade/Makefile
  head/audio/vagalume/Makefile
  head/audio/voipong/Makefile
  head/audio/xmp/Makefile
  head/audio/yell/Makefile
  head/benchmarks/expedite/Makefile
  head/benchmarks/fio/Makefile
  head/benchmarks/gtkperf/Makefile
  head/benchmarks/imb/Makefile
  head/benchmarks/iozone/Makefile
  head/benchmarks/netio/Makefile
  head/benchmarks/netperf/Makefile
  head/benchmarks/nqueens/Makefile
  head/benchmarks/nuttcp/Makefile
  head/benchmarks/polygraph/Makefile
  head/biology/avida/Makefile
  head/biology/gff2ps/Makefile
  head/biology/ortep3/Makefile
  head/biology/platon/Makefile
  head/biology/protomol/Makefile
  head/biology/tinker/Makefile
  head/biology/xmolwt/Makefile
  head/cad/admesh/Makefile
  head/cad/brickutils/Makefile
  head/cad/cider/Makefile
  head/cad/dinotrace/Makefile
  head/cad/fidocadj/Makefile
  head/cad/geda-gattrib/Makefile
  head/cad/geda-gschem/Makefile
  head/cad/gnucap/Makefile
  head/cad/gtkwave/Makefile
  head/cad/jspice3/Makefile
  head/cad/kicad/Makefile
  head/cad/libgeda/Makefile
  head/cad/netgen/Makefile
  head/cad/opencascade/Makefile
  head/cad/pcb/Makefile
  head/cad/pdnmesh/Makefile
  head/cad/qfsm/Makefile
  head/cad/scotch/Makefile
  head/cad/spice/Makefile
  head/cad/tochnog/Makefile
  head/chinese/auto-cn-l10n/Makefile
  head/chinese/cnprint/Makefile
  head/chinese/fcitx-configtool/Makefile
  head/chinese/gcin/Makefile
  head/chinese/gcin/pkg-plist
  head/chinese/ibus-libpinyin/Makefile
  head/chinese/ibus-pinyin/Makefile
  head/chinese/libtabe/Makefile
  head/chinese/muni/Makefile
  head/chinese/oxim/Makefile
  head/chinese/pcmanx/Makefile
  head/chinese/pyzy/Makefile
  head/chinese/qterm/Makefile
  head/comms/anyremote/Makefile
  head/comms/conserver-com/Makefile
  head/comms/dabstick-radio/Makefile
  head/comms/esmska/Makefile
  head/comms/fl_moxgen/Makefile
  head/comms/fldigi/Makefile
  head/comms/gammu/Makefile
  head/comms/ge-x2212/Makefile
  head/comms/gmfsk/Makefile
  head/comms/gnuradio/Makefile
  head/comms/jerm/Makefile
  head/comms/jsdr/Makefile
  head/comms/lirc/Makefile
  head/comms/lrzsz/Makefile
  head/comms/mgetty+sendfax/Makefile
  head/comms/ncid/Makefile
  head/comms/owfs/Makefile
  head/comms/pr/Makefile
  head/comms/py-bulksms/Makefile
  head/comms/qpage/Makefile
  head/comms/rtl-sdr/Makefile
  head/comms/scmxx/Makefile
  head/comms/smstools3/Makefile
  head/comms/svxlink/Makefile
  head/comms/trustedqsl/Makefile
  head/comms/vrflash/Makefile
  head/comms/xastir/Makefile
  head/converters/iconv/Makefile
  head/converters/libiconv/Makefile
  head/converters/p5-LaTeXML/Makefile
  head/converters/py-zfec/Makefile
  head/converters/tnef/Makefile

Modified: head/archivers/file-roller/Makefile
==============================================================================
--- head/archivers/file-roller/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/archivers/file-roller/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -45,14 +45,10 @@ post-patch:
 		${WRKSRC}/src/fr-command-tar.c \
 		${WRKSRC}/src/fr-command-zip.c
 
-.include <bsd.port.options.mk>
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/archivers/php5-snappy/Makefile
==============================================================================
--- head/archivers/php5-snappy/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/archivers/php5-snappy/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -23,16 +23,10 @@ PHP_MODNAME=	snappy
 WRKSRC=		${WRKDIR}/${PROJECTHOST}
 OPTIONS_DEFINE=	TEST
 
-.include <bsd.port.options.mk>
-test: build
+post-build-TEST-on:
 	@(cd ${WRKSRC} && ${MAKE} ${MAKE_ENV} NO_INTERACTION=yes ${.TARGET})
 
-.if !empty(${PORT_OPTIONS:MTEST})
-post-stage: test
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
-.else
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/snappy.so
-.endif
 
 .include <bsd.port.mk>

Modified: head/archivers/xarchiver/Makefile
==============================================================================
--- head/archivers/xarchiver/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/archivers/xarchiver/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -27,14 +27,9 @@ NLS_USES=	gettext
 NLS_CPPFLAGS+=	-I${LOCALBASE}/include
 NLS_LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if empty(PORT_OPTIONS:MDOCS)
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
-.endif
-.if empty(PORT_OPTIONS:MNLS)
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's| po | |g' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>

Modified: head/astro/boinc-astropulse/Makefile
==============================================================================
--- head/astro/boinc-astropulse/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/boinc-astropulse/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -42,11 +42,7 @@ X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
-.endif
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
 
 SETI_WORK!=	cd ${.CURDIR}/../boinc-setiathome-v7 && ${MAKE} -V WRKSRC
 CONFIGURE_ENV+=	BOINCDIR="${NONEXISTENT}" \
@@ -76,9 +72,8 @@ do-install:
 	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
 	${INSTALL_PROGRAM} ${WRKSRC}/${AP_BINARY} \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.if ${PORT_OPTIONS:MX11}
+do-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/ap_graphics \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.endif
 
 .include <bsd.port.mk>

Modified: head/astro/boinc-setiathome-v7/Makefile
==============================================================================
--- head/astro/boinc-setiathome-v7/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/boinc-setiathome-v7/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -45,11 +45,7 @@ X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MX11}
-BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
-.endif
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 # comment out if world is built with clang and port with gcc
@@ -101,8 +97,8 @@ do-install:
 	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
 	${INSTALL_PROGRAM} ${WRKSRC}/client/${SETI_BINARY} \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.if ${PORT_OPTIONS:MX11}
+do-install-X11-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/client/seti_graphics \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
-.endif
+
 .include <bsd.port.mk>

Modified: head/astro/google-earth/Makefile
==============================================================================
--- head/astro/google-earth/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/google-earth/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -28,17 +28,11 @@ USES=		perl5 shared-mime-info desktop-fi
 USE_PERL5=	patch build
 
 #SUB_FILES=	bin/googleearth
-.include <bsd.port.pre.mk>
-.include <bsd.port.options.mk>
 
 UNMAKESELF=	${LOCALBASE}/bin/unmakeself
 
-.if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=	dri libpciaccess
-LIBGL_ALWAYS_SOFTWARE=LIBGL_ALWAYS_SOFTWARE=yes
-.endif
+NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_USE_OFF=	LINUX_APPS=dri,libpciaccess
 
 # Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
 #.if ${OSVERSION} >= 900000 && ${ARCH} == "amd64"
@@ -54,14 +48,17 @@ do-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e '/OS.*=/s|linux|FreeBSD|' ${WRKSRC}/drivers.ini
-	@${REINPLACE_CMD} -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|; \
-		s|%%LIBGL_ALWAYS_SOFTWARE%%|${LIBGL_ALWAYS_SOFTWARE}|' ${WRKSRC}/bin/googleearth
+	@${REINPLACE_CMD} -e 's|^# Set the home.*|GOOGLEEARTH_DATA_PATH=${DATADIR}|' ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e "s|^# Let's boogie.*|rm -f ${LINUXBASE}\$${HOME}/.googleearth/instance-running-lock|" ${WRKSRC}/bin/googleearth
 	@${REINPLACE_CMD} -i "" -e 's/^TMPPATH.*/exit 0/' ${WRKSRC}/postinstall.sh
 	@${REINPLACE_CMD} -i "" -e 's|\"\$$SETUP_INSTALLPATH/|\"${WRKSRC}/|' ${WRKSRC}/postinstall.sh
 	@${REINPLACE_CMD} -i "" -e 's|\$$SETUP_INSTALLPATH/googleearth |${PREFIX}/bin/googleearth |' ${WRKSRC}/postinstall.sh
 	${RM} ${WRKSRC}/libcurl.so.4
 	${PERL} -i -pe 's|/lib/ld-lsb.so.3\0\0\0|/lib/ld-linux.so.2\0|' ${WRKSRC}/googleearth-bin
+post-patch-NVIDIA-on:
+	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%||' ${WRKSRC}/bin/googleearth
+post-patch-NVIDIA-off:
+	@${REINPLACE_CMD} 's|%%LIBGL_ALWAYS_SOFTWARE%%|LIBGL_ALWAYS_SOFTWARE=yes|' ${WRKSRC}/bin/googleearth
 
 do-build:
 	@${SETENV} SETUP_INSTALLPATH=${DATADIR} ${WRKSRC}/postinstall.sh
@@ -83,4 +80,4 @@ do-install:
 	${LN} -sf ${DATADIR}/bin/googleearth \
 		${STAGEDIR}${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/astro/gpsd/Makefile
==============================================================================
--- head/astro/gpsd/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/gpsd/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -75,189 +75,68 @@ QTBIND_DESC=		build QT bindings
 UBLOX_DESC=		u-blox protocol support
 USB_DESC=		libusb support for USB devices
 
-.include <bsd.port.options.mk>
-
 # Options related to GPS protocols
-.if ! ${PORT_OPTIONS:MNMEA0183}
-MAKE_ARGS+=	nmea0183=no
-.endif
-
-.if ! ${PORT_OPTIONS:MASHTECH}
-MAKE_ARGS+=	ashtech=no
-.endif
-
-.if ! ${PORT_OPTIONS:MEARTHMATE}
-MAKE_ARGS+=	earthmate=no
-.endif
-
-.if ! ${PORT_OPTIONS:MEVERMORE}
-MAKE_ARGS+=	evermore=no
-.endif
-
-.if ! ${PORT_OPTIONS:MFURY}
-MAKE_ARGS+=	fury=no
-.endif
-
-.if ! ${PORT_OPTIONS:MFV18}
-MAKE_ARGS+=	fv18=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGARMIN}
-MAKE_ARGS+=	garmin=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGARMINTXT}
-MAKE_ARGS+=	garmintxt=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGEOSTAR}
-MAKE_ARGS+=	geostar=no
-.endif
-
-.if ! ${PORT_OPTIONS:MITRAX}
-MAKE_ARGS+=	itrax=no
-.endif
-
-.if ! ${PORT_OPTIONS:MMTK}
-MAKE_ARGS+=	mtk3301=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNAVCOM}
-MAKE_ARGS+=	navcom=no
-.endif
-
-.if ! ${PORT_OPTIONS:MONCORE}
-MAKE_ARGS+=	oncore=no
-.endif
-
-.if ! ${PORT_OPTIONS:MSIRF}
-MAKE_ARGS+=	sirf=no
-.endif
-
-.if ! ${PORT_OPTIONS:MSUPERSTARII}
-MAKE_ARGS+=	superstar2=no
-.endif
-
-.if ! ${PORT_OPTIONS:MTNT}
-MAKE_ARGS+=	tnt=no
-.endif
-
-.if ! ${PORT_OPTIONS:MTRIPMATE}
-MAKE_ARGS+=	tripmate=no
-.endif
-
-.if ! ${PORT_OPTIONS:MTSIP}
-MAKE_ARGS+=	tsip=no
-.endif
-
-.if ! ${PORT_OPTIONS:MUBLOX}
-MAKE_ARGS+=	ublox=no
-.endif
+NMEA0183_MAKE_ARGS_OFF=	nmea0183=no
+ASHTECH_MAKE_ARGS_OFF=	ashtech=no
+EARTHMATE_MAKE_ARGS_OFF=	earthmate=no
+EVERMORE_MAKE_ARGS_OFF=	evermore=no
+FURY_MAKE_ARGS_OFF=	fury=no
+FV18_MAKE_ARGS_OFF=	fv18=no
+GARMIN_MAKE_ARGS_OFF=	garmin=no
+GARMINTXT_MAKE_ARGS_OFF=	garmintxt=no
+GEOSTAR_MAKE_ARGS_OFF=	geostar=no
+ITRAX_MAKE_ARGS_OFF=	itrax=no
+MTK_MAKE_ARGS_OFF=	mtk3301=no
+NAVCOM_MAKE_ARGS_OFF=	navcom=no
+ONCORE_MAKE_ARGS_OFF=	oncore=no
+SIRF_MAKE_ARGS_OFF=	sirf=no
+SUPERSTARII_MAKE_ARGS_OFF=	superstar2=no
+TNT_MAKE_ARGS_OFF=	tnt=no
+TRIPMATE_MAKE_ARGS_OFF=	tripmate=no
+TSIP_MAKE_ARGS_OFF=	tsip=no
+UBLOX_MAKE_ARGS_OFF=	ublox=no
 
 # Options related to Non-GPS protocols
-.if ! ${PORT_OPTIONS:MAIVDM}
-MAKE_ARGS+=	aivdm=no
-.endif
-
-.if ! ${PORT_OPTIONS:MGPSCLOCK}
-MAKE_ARGS+=	gpsclock=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNTRIP}
-MAKE_ARGS+=	ntrip=no
-.endif
-
-.if ! ${PORT_OPTIONS:MOCEANSERVER}
-MAKE_ARGS+=	oceanserver=no
-.endif
-
-.if ! ${PORT_OPTIONS:MRTCM104V2}
-MAKE_ARGS+=	rtcm104v2=no
-.endif
-
-.if ! ${PORT_OPTIONS:MRTCM104V3}
-MAKE_ARGS+=	rtcm104v3=no
-.endif
+AIVDM_MAKE_ARGS_OFF=	aivdm=no
+GPSCLOCK_MAKE_ARGS_OFF=	gpsclock=no
+NTRIP_MAKE_ARGS_OFF=	ntrip=no
+OCEANSERVER_MAKE_ARGS_OFF=	oceanserver=no
+RTCM104V2_MAKE_ARGS_OFF=	rtcm104v2=no
+RTCM104V3_MAKE_ARGS_OFF=	rtcm104v3=no
 
 # Time service
-.if ! ${PORT_OPTIONS:MNTP}
-MAKE_ARGS+=	ntp=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNTPSHM}
-MAKE_ARGS+=	ntpshm=no
-.endif
-
-.if ! ${PORT_OPTIONS:MPPS}
-MAKE_ARGS+=	pps=no
-.else
-.	if ! ${PORT_OPTIONS:MNTPSHM}
-IGNORE=		PPS requires NTPSHM
-.	endif
-.endif
+NTP_MAKE_ARGS_OFF=	ntp=no
+NTPSHM_MAKE_ARGS_OFF=	ntpshm=no
+PPS_MAKE_ARGS_OFF=	pps=no
+PPS_IMPLIES=	NTPSHM
 
 # Export methods
-.if ! ${PORT_OPTIONS:MSOCKEXPORT}
-MAKE_ARGS+=	socket_export=no
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
-MAKE_ARGS+=	dbus_export=yes
-.endif
-
-.if ! ${PORT_OPTIONS:MSHMEXPORT}
-MAKE_ARGS+=	shm_export=no
-.endif
+SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
+DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_MAKE_ARGS=	dbus_export=yes
+SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
 
 # Communication
-.if ! ${PORT_OPTIONS:MUSB}
-MAKE_ARGS+=	usb=no
-.endif
-
-.if ! ${PORT_OPTIONS:MIPV6}
-MAKE_ARGS+=	ipv6=no
-.endif
-
-.if ! ${PORT_OPTIONS:MNETFEED}
-MAKE_ARGS+=	netfeed=no
-.endif
-
-.if ! ${PORT_OPTIONS:MPASSTHROUGH}
-MAKE_ARGS+=	passthrough=no
-.endif
+USB_MAKE_ARGS_OFF=	usb=no
+IPV6_MAKE_ARGS_OFF=	ipv6=no
+NETFEED_MAKE_ARGS_OFF=	netfeed=no
+PASSTHROUGH_MAKE_ARGS_OFF=	passthrough=no
 
 # Other daemon options
-.if ! ${PORT_OPTIONS:MTIMING}
-MAKE_ARGS+=	timing=no
-.endif
+TIMING_MAKE_ARGS_OFF=	timing=no
 
 # Client-side options
-.if ! ${PORT_OPTIONS:MNCURSES}
-MAKE_ARGS+=	ncurses=no
-.endif
-
-.if ${PORT_OPTIONS:MQTBIND}
-USE_QT4=	network
-MAKE_ARGS+=	qt=yes
-PLIST_SUB+=	QTBIND=""
-.else
-MAKE_ARGS+=	qt=no
-PLIST_SUB+=	QTBIND="@comment "
-.endif
-
-.if ! ${PORT_OPTIONS:MRECONFIGURE}
-MAKE_ARGS+=	reconfigure=no
-.endif
-
-.if ! ${PORT_OPTIONS:MCPPBIND}
-MAKE_ARGS+=	libgpsmm=no
-.endif
+NCURSES_MAKE_ARGS_OFF=	ncurses=no
+QTBIND_USE=	QT4=network
+QTBIND_MAKE_ARGS=	qt=yes
+QTBIND_MAKE_ARGS_OFF=	qt=no
+QTBIND_PLIST_SUB=	QTBIND=""
+QTBIND_PLIST_SUB_OFF=	QTBIND="@comment "
+RECONFIGURE_MAKE_ARGS_OFF=	reconfigure=no
+CPPBIND_MAKE_ARGS_OFF=	libgpsmm=no
 
 # Build control
-.if ${PORT_OPTIONS:MPROFILING}
-MAKE_ARGS+=	profiling=yes
-.endif
+PROFILING_MAKE_ARGS=	profiling=yes
 
 # generates .py[co] files for installed modules
 # if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted

Modified: head/astro/gpsdrive/Makefile
==============================================================================
--- head/astro/gpsdrive/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/gpsdrive/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -36,13 +36,10 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_USES_OFF=	gettext-tools
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} 's/test "$$CC" = "gcc"/false/' ${WRKSRC}/configure
-.if empty(PORT_OPTIONS:MNLS)
+post-patch-NLS-off:
 	@${REINPLACE_CMD} 's|SUBDIRS = src po man|SUBDIRS = src man|' \
 		${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>

Modified: head/astro/gpsman/Makefile
==============================================================================
--- head/astro/gpsman/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/gpsman/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -19,13 +19,9 @@ PLIST_SUB+=	GPSMANDIR=${GPSMANDIR:S/${PR
 NO_BUILD=	yes
 PORTDOCS=	*
 
-.include <bsd.port.options.mk>
-
 GPSMAN_DEFAULT_PORT?=	/dev/cuau0
 
-.if ${PORT_OPTIONS:MDOCS}
-SUB_FILES=	pkg-message
-.endif
+DOCS_SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" \
@@ -42,7 +38,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gmsrc/gmicons/* ${STAGEDIR}${GPSMANDIR}/gmsrc/gmicons
 	${INSTALL_DATA} ${WRKSRC}/util/*.sh ${STAGEDIR}${GPSMANDIR}/util
 	${INSTALL_DATA} ${WRKSRC}/util/*.tcl ${STAGEDIR}${GPSMANDIR}/util
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/info
 	${INSTALL_DATA} ${WRKSRC}/manual/*.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manual/html/*.html ${STAGEDIR}${DOCSDIR}/html
@@ -50,7 +46,5 @@ do-install:
 .for i in gif txt ps
 	${INSTALL_DATA} ${WRKSRC}/manual/html/info/*.${i} ${STAGEDIR}${DOCSDIR}/html/info
 .endfor
-	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.mk>

Modified: head/astro/merkaartor/Makefile
==============================================================================
--- head/astro/merkaartor/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/merkaartor/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -34,27 +34,20 @@ GEOIMAGE_LIB_DEPENDS=	libexiv2.so:${PORT
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
 ZBAR_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+ZBAR_BROKEN=	Does not build with option ZBAR selected
 
 DEBUG_QMAKE_OFF=	NODEBUG=1 RELEASE=1
 
-OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
+NLS_USE=	QT4=linguist_build
 
-.if ${PORT_OPTIONS:MZBAR}
-BROKEN=	Does not build with option ZBAR selected
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USE_QT4+=	linguist_build
+OPTIONS_SUB=	yes
 
-pre-build:
+pre-build-NLS-on:
 	@cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro
 
-post-install:
+post-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/translations
 	@(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \
 		${STAGEDIR}${DATADIR}/translations)
-.endif
 
 .include <bsd.port.mk>

Modified: head/astro/osmium/Makefile
==============================================================================
--- head/astro/osmium/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/osmium/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -29,6 +29,7 @@ CXXFLAGS+=	-I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
 
 NO_ARCH=	yes
+NO_BUILD=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	JAVASCRIPT DOXYGEN DOCS
@@ -38,19 +39,13 @@ JAVASCRIPT_DESC=Enable javascript suppor
 JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8 \
 			libshp.so:${PORTSDIR}/devel/shapelib \
 			libicuuc.so:${PORTSDIR}/devel/icu
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
+DOXYGEN_IMPLIES=	DOCS
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
-do-build:
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
+do-build-DOXYGEN-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKR_ARGS} doc
-.else
-	${TRUE}
-.endif
 
 regression-test:
 	cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${SH} run_tests.sh
@@ -59,10 +54,9 @@ do-install:
 	cd ${WRKSRC}/include && ${COPYTREE_SHARE} '${PORTNAME} ${PORTNAME}.hpp' \
 		${STAGEDIR}${PREFIX}/include/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MDOXYGEN}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
-.endif
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/THANKS \
 		${WRKSRC}/NOTES_FOR_DEVELOPERS ${STAGEDIR}${DOCSDIR}/
+do-install-DOXYGEN-on:
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/astro/viking/Makefile
==============================================================================
--- head/astro/viking/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/viking/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -53,6 +53,7 @@ MERKAATOR_DESC=	Edit OpenStreetMap via M
 OPTIONS_SUB=	yes
 
 GEOCACHES_CONFIGURE_ENABLE=	geocaches
+GEOCACHES_SUB_FILES=	pkg-message
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
@@ -66,12 +67,6 @@ GPSD_CONFIGURE_ENABLE=	realtime-gps-trac
 JOSM_RUN_DEPENDS=	josm:${PORTSDIR}/astro/josm
 MERKAATOR_RUN_DEPENDS=	merkaartor:${PORTSDIR}/astro/merkaartor
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGEOCACHES}
-SUB_FILES+=	pkg-message
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|Science;|Education;Science;|' \

Modified: head/astro/xtide/Makefile
==============================================================================
--- head/astro/xtide/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/astro/xtide/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -85,14 +85,12 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${HARM_WRKSRC} && ${INSTALL_DATA} harmonics.tcd \
 		${STAGEDIR}${DATADIR})
-.if ${PORT_OPTIONS:MWVS}
+post-install-WVS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/wvs
 	(cd ${WRKDIR} && ${INSTALL_DATA} wvs*.dat \
 		${STAGEDIR}${DATADIR}/wvs)
-.endif
-.if ${PORT_OPTIONS:MX11}
+post-install-X11-on:
 	(cd ${WRKSRC}/iconsrc && ${INSTALL_DATA} xtide.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps)
-.endif
 
 .include <bsd.port.mk>

Modified: head/audio/abraca/Makefile
==============================================================================
--- head/audio/abraca/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/abraca/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -28,13 +28,9 @@ OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 
-.include <bsd.port.options.mk>
-
-post-patch:
-.if ! ${PORT_OPTIONS:MNLS}
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e '/\.load(/s/ intltool//' \
 		-e '/recurse/s/ po//' ${WRKSRC}/wscript
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

Modified: head/audio/alsa-plugins/Makefile
==============================================================================
--- head/audio/alsa-plugins/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/alsa-plugins/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -40,6 +40,7 @@ VERBOSE_CFLAGS=	-DFREEBSD_OSS_DEBUG_VERB
 
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CONFIGURE_ENABLE=	jack
+JACK_IMPLIES=		SAMPLERATE
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=avcodec
@@ -55,12 +56,6 @@ SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDI
 SPEEX_CONFIGURE_ON=	--with-speex=lib
 SPEEX_CONFIGURE_OFF=	--without-speex
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJACK} && empty(PORT_OPTIONS:MSAMPLERATE)
-IGNORE=			JACK audio support requires SAMPLERATE
-.endif
-
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g' \
 		-e '/lt_cv_dlopen/s/-ldl//g' \

Modified: head/audio/alure/Makefile
==============================================================================
--- head/audio/alure/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/alure/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -49,21 +49,18 @@ SNDFILE_LIB_DEPENDS=	libsndfile.so:${POR
 SNDFILE_CMAKE_ON=	-DSNDFILE:BOOL=TRUE
 SNDFILE_CMAKE_OFF=	-DSNDFILE:BOOL=FALSE
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|' \
 		-e 's|LIBFLAC_LIBRARIES|FLAC_LIBRARIES|' \
 		${WRKSRC}/CMakeLists.txt
 
-.if ${PORT_OPTIONS:MDOCS}
+post-patch-DOCS-on:
 	@${REINPLACE_CMD} \
 		-e 's|INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/docs/html"|INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/docs/html" "$${ALURE_SOURCE_DIR}/docs/naturaldocs"|' \
 		${WRKSRC}/CMakeLists.txt
-.else
+post-patch-DOCS-off:
 	@${REINPLACE_CMD} -i '' '/FIND_PROGRAM(NATDOCS_BIN NaturalDocs)/,/ENDIF(NATDOCS_BIN)/s/^/#/' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -i '' -e '/INSTALL(DIRECTORY "$${ALURE_SOURCE_DIR}/,+2d' ${WRKSRC}/CMakeLists.txt
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Modified: head/audio/ario/Makefile
==============================================================================
--- head/audio/ario/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/ario/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -34,21 +34,11 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	AVAHI NLS
 AVAHI_DESC=	Zeroconf support (Avahi)
 
-.include <bsd.port.options.mk>
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi
 
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
-CONFIGURE_ARGS+=	--enable-avahi
-.else
-CONFIGURE_ARGS+=	--disable-avahi
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=	--enable-nls
-.else
-CONFIGURE_ARGS+=	--disable-nls
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/gslist.h|glib.h|g ; \

Modified: head/audio/asunder/Makefile
==============================================================================
--- head/audio/asunder/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/asunder/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -35,18 +35,13 @@ WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}
 APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
 NLS_CONFIGURE_ENABLE=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/^itlocaledir = .*/itlocaledir = @datarootdir@\/locale/' ${WRKSRC}/po/Makefile.in.in
-.if ${PORT_OPTIONS:MWINDOWS_CHARS}
+post-patch-WINDOWS_CHARS-on:
 	@${REINPLACE_CMD} -e 's^#define[[:blank:]]*BADCHARS.*^#define BADCHARS "/"^' ${WRKSRC}/src/util.h
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>

Modified: head/audio/baudline/Makefile
==============================================================================
--- head/audio/baudline/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/baudline/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -28,9 +28,6 @@ OPTIONS_DEFAULT=	MPG123
 
 MMPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
-.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE=		may not be automatically fetched due to licensing\
 		restrictions. You must manually fetch ${DISTFILES} from\
@@ -44,10 +41,8 @@ do-build:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/baudline ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
-	@[ -f /compat/linux/proc/stat ] || ${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/audio/clementine-player/Makefile
==============================================================================
--- head/audio/clementine-player/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/clementine-player/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -66,90 +66,49 @@ MOODBAR_DESC=		Moodbar Support
 OPTIONS_DEFAULT=	AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \
 			LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR
 
-.include <bsd.port.options.mk>
+DROPBOX_CMAKE_ON=	-DENABLE_DROPBOX=ON
+DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF
 
-.if ${PORT_OPTIONS:MDROPBOX}
-CMAKE_ARGS+=	-DENABLE_DROPBOX=ON
-.else
-CMAKE_ARGS+=	-DENABLE_DROPBOX=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMOODBAR}
-CMAKE_ARGS+=	-DENABLE_MOODBAR=ON
-.else
-CMAKE_ARGS+=	-DENABLE_MOODBAR=OFF
-.endif
-
-.if ${PORT_OPTIONS:MAUDIOCD}
-CMAKE_ARGS+=	-DENABLE_AUDIOCD=ON
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
-.else
-CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
-.endif
-
-.if ${PORT_OPTIONS:MBOX}
-CMAKE_ARGS+=	-DENABLE_BOX=ON
-.else
-CMAKE_ARGS+=	-DENABLE_BOX=OFF
-.endif
-
-.if ${PORT_OPTIONS:MBREAKPAD}
-CMAKE_ARGS+=	-DENABLE_BREAKPAD=ON
-.else
-CMAKE_ARGS+=	-DENABLE_BREAKPAD=OFF
-.endif
-
-.if ${PORT_OPTIONS:MDEVICEKIT}
-CMAKE_ARGS+=	-DENABLE_DEVICEKIT=ON
-.else
-CMAKE_ARGS+=	-DENABLE_DEVICEKIT=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGIO}
-CMAKE_ARGS+=	-DENABLE_GIO=ON
-USE_GNOME=	glib20
-.else
-CMAKE_ARGS+=	-DENABLE_GIO=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGOOGLE_DRIVE}
-CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=ON
-BUILD_DEPENDS+=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
-.else
-CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=OFF
-.endif
-
-.if ${PORT_OPTIONS:MGPOD}
-CMAKE_ARGS+=	-DENABLE_LIBGPOD=ON
-LIB_DEPENDS+=	libgpod.so:${PORTSDIR}/audio/libgpod
-.else
-CMAKE_ARGS+=	-DENABLE_LIBGPOD=OFF
-.endif
-
-.if ${PORT_OPTIONS:MLASTFM}
-CMAKE_ARGS+=	-DENABLE_LIBLASTFM=ON
-LIB_DEPENDS+=	liblastfm.so:${PORTSDIR}/audio/liblastfm
-.else
-CMAKE_ARGS+=	-DENABLE_LIBLASTFM=OFF
-.endif
-
-.if ${PORT_OPTIONS:MMTP}
-CMAKE_ARGS+=	-DENABLE_LIBMTP=ON
-LIB_DEPENDS+=	libmtp.so:${PORTSDIR}/multimedia/libmtp
-.else
-CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
-.endif
-
-.if ${PORT_OPTIONS:MVISUALISATION}
-CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=ON
-.else
-CMAKE_ARGS+=	-DENABLE_VISUALISATIONS=OFF
-.endif
-
-.if ${PORT_OPTIONS:MWIIMOTEDEV}
-CMAKE_ARGS+=	-DENABLE_WIIMOTEDEV=ON
-.else
-CMAKE_ARGS+=	-DENABLE_WIIMOTEDEV=OFF
-.endif
+MOODBAR_CMAKE_ON=	-DENABLE_MOODBAR=ON
+MOODBAR_CMAKE_OFF=	-DENABLE_MOODBAR=OFF
+
+AUDIOCD_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+AUDIOCD_CMAKE_ON=	-DENABLE_AUDIOCD=ON
+AUDIOCD_CMAKE_OFF=	-DENABLE_AUDIOCD=OFF
+
+BOX_CMAKE_ON=	-DENABLE_BOX=ON
+BOX_CMAKE_OFF=	-DENABLE_BOX=OFF
+
+BREAKPAD_CMAKE_ON=	-DENABLE_BREAKPAD=ON
+BREAKPAD_CMAKE_OFF=	-DENABLE_BREAKPAD=OFF
+
+DEVICEKIT_CMAKE_ON=	-DENABLE_DEVICEKIT=ON
+DEVICEKIT_CMAKE_OFF=	-DENABLE_DEVICEKIT=OFF
+
+GIO_USE=	GNOME=glib20
+GIO_CMAKE_ON=	-DENABLE_GIO=ON
+GIO_CMAKE_OFF=	-DENABLE_GIO=OFF
+
+GOOGLE_DRIVE_BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
+GOOGLE_DRIVE_CMAKE_ON=	-DENABLE_GOOGLE_DRIVE=ON
+GOOGLE_DRIVE_CMAKE_OFF=	-DENABLE_GOOGLE_DRIVE=OFF
+
+GPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+GPOD_CMAKE_ON=	-DENABLE_LIBGPOD=ON
+GPOD_CMAKE_OFF=	-DENABLE_LIBGPOD=OFF
+
+LASTFM_LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm
+LASTFM_CMAKE_ON=	-DENABLE_LIBLASTFM=ON
+LASTFM_CMAKE_OFF=	-DENABLE_LIBLASTFM=OFF
+
+MPT_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MTP_CMAKE_ON=	-DENABLE_LIBMTP=ON
+MTP_CMAKE_OFF=	-DENABLE_LIBMTP=OFF
+
+VISUALISATION_CMAKE_ON=	-DENABLE_VISUALISATIONS=ON
+VISUALISATION_CMAKE_OFF=	-DENABLE_VISUALISATIONS=OFF
+
+WIIMOTEDEV_CMAKE_ON=	-DENABLE_WIIMOTEDEV=ON
+WIIMOTEDEV_CMAKE_OFF=	-DENABLE_WIIMOTEDEV=OFF
 
 .include <bsd.port.mk>

Modified: head/audio/csound/Makefile
==============================================================================
--- head/audio/csound/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/csound/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -131,8 +131,6 @@ MAKE_ARGS+=	buildCsound5GUI=0 buildCSEdi
 CSOUND_DOCS=	Csound${PORTVERSION:R}_manual_html.zip
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == amd64 || ${ARCH} == sparc64 || ${ARCH} == ia64
 MAKE_ARGS+=	Word64=1
 .endif
@@ -148,8 +146,6 @@ CXXLIB=		c++
 CXXLIB=		# empty
 .endif
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|" \
@@ -190,4 +186,4 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so* \
 		${STAGEDIR}${PREFIX}/lib/csound/plugins64/*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/audio/csound6/Makefile
==============================================================================
--- head/audio/csound6/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/csound6/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -48,6 +48,7 @@ OPTIONS_SUB=		yes
 ALSA_DESC=		Build ALSA I/O module
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_CMAKE_OFF=		-DUSE_ALSA:BOOL=OFF
+ALSA_PREVENTS=		DSSI
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 CURL_CMAKE_OFF=		-DUSE_CURL:BOOL=OFF
 DSSI_DESC=		Build DSSI/LADSPA host opcodes
@@ -105,10 +106,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex"
 .endif
 
-.if ${PORT_OPTIONS:MALSA} && ${PORT_OPTIONS:MDSSI}
-IGNORE=		ALSA and DSSI options are mutually exclusive
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/-O3/s|^|#| ; \
@@ -138,8 +135,7 @@ post-patch:
 post-install:
 	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6
 	@${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6
-.if ${PORT_OPTIONS:MFLTK}
+post-install-FLTK-on:
 	@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
-.endif
 
 .include <bsd.port.mk>

Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/deadbeef/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -73,6 +73,7 @@ PULSEAUDIO_CONFIGURE_OFF=	--disable-puls
 
 GUI_USE=	gnome=gtk20,glib20
 GUI_CONFIGURE_OFF=	--disable-gtkui --disable-gtk3
+GUI_IMPLIES=		CONVERTER
 
 VFS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 VFS_CONFIGURE_OFF=	--disable-vfs-curl
@@ -84,6 +85,7 @@ ART_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/
 			libImlib2.so:${PORTSDIR}/graphics/imlib2
 ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
+ART_IMPLIES=		VFS
 
 SUPEREQ_CONFIGURE_OFF=	--disable-supereq
 
@@ -168,16 +170,6 @@ PLTBROWSER_CONFIGURE_OFF=	--disable-pltb
 
 WMA_CONFIGURE_OFF=		--disable-wma
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MART} && ! ${PORT_OPTIONS:MVFS}
-BROKEN=		VFS plugin required for album art loader, please rerun 'make config' and either disable ART or enable VFS
-.endif
-
-.if ${PORT_OPTIONS:MCONVERTER} && ! ${PORT_OPTIONS:MGUI}
-BROKEN=		CONVERTER plugin required for gui, please rerun 'make config' and either disable CONVERTER or enable GUI
-.endif
-
 post-patch:
 # Do not link to libsupc++ which may be PIC-unsafe (breaks 64-bit arches)
 	@${REINPLACE_CMD} -e 's, -lsupc++,,' \

Modified: head/audio/dumb-allegro/Makefile
==============================================================================
--- head/audio/dumb-allegro/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/dumb-allegro/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -3,5 +3,6 @@
 
 OPTIONS_SLAVE=	ALLEGRO
 MASTERDIR=	${.CURDIR}/../dumb
+PKGNAMESUFFIX=	-allegro
 
 .include "${MASTERDIR}/Makefile"

Modified: head/audio/dumb/Makefile
==============================================================================
--- head/audio/dumb/Makefile	Wed Aug 19 13:09:12 2015	(r394777)
+++ head/audio/dumb/Makefile	Wed Aug 19 13:29:59 2015	(r394778)
@@ -13,26 +13,19 @@ COMMENT=	IT, XM, S3M, and MOD player lib
 USES=		gmake
 
 OPTIONS_DEFINE=	ALLEGRO
+OPTIONS_SUB=	yes
 ALLEGRO_DESC=	Enable allegro support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALLEGRO}
-LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
-PLIST_SUB+=	ALLEGRO=""
-MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
-MAKE_ARGS+=	LINK_ALLEGRO="`allegro-config --libs` -lm"
-PKGNAMESUFFIX=	-allegro
-CONFLICTS=	dumb-[0-9]*
-.else
-PLIST_SUB+=	ALLEGRO="@comment "
-MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS=
-CONFLICTS=	dumb-allegro-[0-9]*
-.endif
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
-CFLAGS+=	-fPIC
-.endif
+ALLEGRO_LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+ALLEGRO_MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" \
+			LINK_ALLEGRO="`allegro-config --libs` -lm"
+ALLEGRO_CONFLICTS=	dumb-[0-9]*
+ALLEGRO_MAKE_ARGS_OFF=	_PORT_ALLEGRO_CFLAGS=
+ALLEGRO_CONFLICTS_OFF=	dumb-allegro-[0-9]*
+
+CFLAGS_amd64=	-fPIC
+CFLAGS_ia64=	-fPIC
+CFLAGS_sparc64=	-fPIC
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_INSTALL_PATH := |&$${DESTDIR}|' ${WRKSRC}/Makefile
@@ -40,8 +33,7 @@ post-patch:
 do-configure:
 	@${ECHO_CMD} 'include make/unix.inc' > ${WRKSRC}/make/config.txt
 	@${ECHO_CMD} 'ALL_TARGETS := core core-examples core-headers' >> ${WRKSRC}/make/config.txt
-.if ${PORT_OPTIONS:MALLEGRO}
+do-configure-ALLEGRO-on:
 	@${ECHO_CMD} 'ALL_TARGETS += allegro allegro-examples allegro-headers' >> ${WRKSRC}/make/config.txt
-.endif
 
 .include <bsd.port.mk>

Modified: head/audio/dvda-author/Makefile
==============================================================================
--- head/audio/dvda-author/Makefile	Wed Aug 19 13:09:12 2015	(r394777)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-ports-all mailing list