Index: head/archivers/file-roller/Makefile =================================================================== --- head/archivers/file-roller/Makefile +++ head/archivers/file-roller/Makefile @@ -45,14 +45,10 @@ ${WRKSRC}/src/fr-command-tar.c \ ${WRKSRC}/src/fr-command-zip.c -.include - -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 Index: head/archivers/php5-snappy/Makefile =================================================================== --- head/archivers/php5-snappy/Makefile +++ head/archivers/php5-snappy/Makefile @@ -23,16 +23,10 @@ WRKSRC= ${WRKDIR}/${PROJECTHOST} OPTIONS_DEFINE= TEST -.include -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 Index: head/archivers/xarchiver/Makefile =================================================================== --- head/archivers/xarchiver/Makefile +++ head/archivers/xarchiver/Makefile @@ -27,14 +27,9 @@ NLS_CPPFLAGS+= -I${LOCALBASE}/include NLS_LDFLAGS+= -L${LOCALBASE}/lib -.include - -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 Index: head/astro/boinc-astropulse/Makefile =================================================================== --- head/astro/boinc-astropulse/Makefile +++ head/astro/boinc-astropulse/Makefile @@ -42,11 +42,7 @@ XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm X11_CONFIGURE_ENABLE= graphics -.include - -.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 @@ ${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 Index: head/astro/boinc-setiathome-v7/Makefile =================================================================== --- head/astro/boinc-setiathome-v7/Makefile +++ head/astro/boinc-setiathome-v7/Makefile @@ -45,11 +45,7 @@ XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm X11_CONFIGURE_ENABLE= graphics -.include - -.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 @@ ${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 Index: head/astro/google-earth/Makefile =================================================================== --- head/astro/google-earth/Makefile +++ head/astro/google-earth/Makefile @@ -28,17 +28,11 @@ USE_PERL5= patch build #SUB_FILES= bin/googleearth -.include -.include 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 @@ 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 @@ ${LN} -sf ${DATADIR}/bin/googleearth \ ${STAGEDIR}${PREFIX}/bin/ -.include +.include Index: head/astro/gpsd/Makefile =================================================================== --- head/astro/gpsd/Makefile +++ head/astro/gpsd/Makefile @@ -75,189 +75,68 @@ UBLOX_DESC= u-blox protocol support USB_DESC= libusb support for USB devices -.include - # 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 Index: head/astro/gpsdrive/Makefile =================================================================== --- head/astro/gpsdrive/Makefile +++ head/astro/gpsdrive/Makefile @@ -36,13 +36,10 @@ NLS_USES= gettext NLS_USES_OFF= gettext-tools -.include - 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 Index: head/astro/gpsman/Makefile =================================================================== --- head/astro/gpsman/Makefile +++ head/astro/gpsman/Makefile @@ -19,13 +19,9 @@ NO_BUILD= yes PORTDOCS= * -.include - 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 @@ ${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 @@ .for i in gif txt ps ${INSTALL_DATA} ${WRKSRC}/manual/html/info/*.${i} ${STAGEDIR}${DOCSDIR}/html/info .endfor - @${CAT} ${PKGMESSAGE} -.endif .include Index: head/astro/merkaartor/Makefile =================================================================== --- head/astro/merkaartor/Makefile +++ head/astro/merkaartor/Makefile @@ -34,27 +34,20 @@ 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 +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 Index: head/astro/osmium/Makefile =================================================================== --- head/astro/osmium/Makefile +++ head/astro/osmium/Makefile @@ -29,6 +29,7 @@ -L${LOCALBASE}/lib NO_ARCH= yes +NO_BUILD= yes PORTDOCS= * OPTIONS_DEFINE= JAVASCRIPT DOXYGEN DOCS @@ -38,19 +39,13 @@ JAVASCRIPT_LIB_DEPENDS= libv8.so:${PORTSDIR}/lang/v8 \ libshp.so:${PORTSDIR}/devel/shapelib \ libicuuc.so:${PORTSDIR}/devel/icu -.include -.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 @@ 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 Index: head/astro/viking/Makefile =================================================================== --- head/astro/viking/Makefile +++ head/astro/viking/Makefile @@ -53,6 +53,7 @@ OPTIONS_SUB= yes GEOCACHES_CONFIGURE_ENABLE= geocaches +GEOCACHES_SUB_FILES= pkg-message NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext @@ -66,12 +67,6 @@ JOSM_RUN_DEPENDS= josm:${PORTSDIR}/astro/josm MERKAATOR_RUN_DEPENDS= merkaartor:${PORTSDIR}/astro/merkaartor -.include - -.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;|' \ Index: head/astro/xtide/Makefile =================================================================== --- head/astro/xtide/Makefile +++ head/astro/xtide/Makefile @@ -85,14 +85,12 @@ @${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 Index: head/audio/abraca/Makefile =================================================================== --- head/audio/abraca/Makefile +++ head/audio/abraca/Makefile @@ -28,13 +28,9 @@ OPTIONS_SUB= yes NLS_USES= gettext -.include - -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} Index: head/audio/alsa-plugins/Makefile =================================================================== --- head/audio/alsa-plugins/Makefile +++ head/audio/alsa-plugins/Makefile @@ -40,6 +40,7 @@ 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_CONFIGURE_ON= --with-speex=lib SPEEX_CONFIGURE_OFF= --without-speex -.include - -.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' \ Index: head/audio/alure/Makefile =================================================================== --- head/audio/alure/Makefile +++ head/audio/alure/Makefile @@ -49,21 +49,18 @@ SNDFILE_CMAKE_ON= -DSNDFILE:BOOL=TRUE SNDFILE_CMAKE_OFF= -DSNDFILE:BOOL=FALSE -.include - 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} Index: head/audio/ario/Makefile =================================================================== --- head/audio/ario/Makefile +++ head/audio/ario/Makefile @@ -34,21 +34,11 @@ OPTIONS_DEFINE= AVAHI NLS AVAHI_DESC= Zeroconf support (Avahi) -.include +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 ; \ Index: head/audio/asunder/Makefile =================================================================== --- head/audio/asunder/Makefile +++ head/audio/asunder/Makefile @@ -35,18 +35,13 @@ APE_RUN_DEPENDS= mac:${PORTSDIR}/audio/mac NLS_CONFIGURE_ENABLE= yes -.include - 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 Index: head/audio/baudline/Makefile =================================================================== --- head/audio/baudline/Makefile +++ head/audio/baudline/Makefile @@ -28,9 +28,6 @@ MMPG123_RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -.include -.include - .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-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 +.include Index: head/audio/clementine-player/Makefile =================================================================== --- head/audio/clementine-player/Makefile +++ head/audio/clementine-player/Makefile @@ -66,90 +66,49 @@ OPTIONS_DEFAULT= AUDIOCD BOX DEVICEKIT DROPBOX GIO GOOGLE_DRIVE GPOD \ LASTFM MTP VISUALISATION WIIMOTEDEV MOODBAR -.include +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 Index: head/audio/csound/Makefile =================================================================== --- head/audio/csound/Makefile +++ head/audio/csound/Makefile @@ -131,8 +131,6 @@ CSOUND_DOCS= Csound${PORTVERSION:R}_manual_html.zip .endif -.include - .if ${ARCH} == amd64 || ${ARCH} == sparc64 || ${ARCH} == ia64 MAKE_ARGS+= Word64=1 .endif @@ -148,8 +146,6 @@ CXXLIB= # empty .endif -.include - post-patch: @${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|" \ @@ -190,4 +186,4 @@ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so* \ ${STAGEDIR}${PREFIX}/lib/csound/plugins64/*.so -.include +.include Index: head/audio/csound6/Makefile =================================================================== --- head/audio/csound6/Makefile +++ head/audio/csound6/Makefile @@ -48,6 +48,7 @@ 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 @@ 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-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 Index: head/audio/deadbeef/Makefile =================================================================== --- head/audio/deadbeef/Makefile +++ head/audio/deadbeef/Makefile @@ -73,6 +73,7 @@ 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 @@ 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 @@ WMA_CONFIGURE_OFF= --disable-wma -.include - -.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++,,' \ Index: head/audio/dumb-allegro/Makefile =================================================================== --- head/audio/dumb-allegro/Makefile +++ head/audio/dumb-allegro/Makefile @@ -3,5 +3,6 @@ OPTIONS_SLAVE= ALLEGRO MASTERDIR= ${.CURDIR}/../dumb +PKGNAMESUFFIX= -allegro .include "${MASTERDIR}/Makefile" Index: head/audio/dumb/Makefile =================================================================== --- head/audio/dumb/Makefile +++ head/audio/dumb/Makefile @@ -13,26 +13,19 @@ USES= gmake OPTIONS_DEFINE= ALLEGRO +OPTIONS_SUB= yes ALLEGRO_DESC= Enable allegro support -.include - -.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 @@ 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 Index: head/audio/dvda-author/Makefile =================================================================== --- head/audio/dvda-author/Makefile +++ head/audio/dvda-author/Makefile @@ -33,11 +33,7 @@ OPTIONS_DEFINE= DOCS -.include - -.if ! ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+= --docdir=${WRKDIR}/doc -.endif +DOCS_CONFIGURE_OFF= --docdir=${WRKDIR}/doc post-patch: @${REINPLACE_CMD} 's|-std=c99||g' \ Index: head/audio/easytag/Makefile =================================================================== --- head/audio/easytag/Makefile +++ head/audio/easytag/Makefile @@ -48,19 +48,13 @@ SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= speex -.include - NLS_USES= gettext-runtime -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+=--with-gtk2 -.endif - -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFIGURE_ARGS+=--without-gtk2 -.endif +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ON=--with-gtk2 + +GTK3_USE= GNOME=gtk30 +GTK3_CONFIGURE_ON=--without-gtk2 post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/audio/espeak/Makefile =================================================================== --- head/audio/espeak/Makefile +++ head/audio/espeak/Makefile @@ -49,13 +49,11 @@ BROKEN_sparc64= Does not compile on sparc64 -.include post-patch: cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES} -.if ${PORT_OPTIONS:MPORTAUDIO} +post-patch-PORTAUDIO-on: ${MV} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h -.endif post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/audio/etktab/Makefile =================================================================== --- head/audio/etktab/Makefile +++ head/audio/etktab/Makefile @@ -23,14 +23,10 @@ PLIST_FILES= bin/${PORTNAME} PORTDOCS= * -.include - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= canada_multi-3.2.etk:keyboard \ +DOCS_DISTFILES= canada_multi-3.2.etk:keyboard \ dvorak-3.2.etk:keyboard \ uk-3.2.etk:keyboard \ us-3.2.etk:keyboard -.endif post-patch: ${REINPLACE_CMD} -e 's|wish|${WISH}|g' ${WRKSRC}/eTktab @@ -42,12 +38,11 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/eTktab ${STAGEDIR}${PREFIX}/bin/etktab -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in CHANGES.html LICENSE.html README.html eTktab-small.xpm eTktab.xpm \ canada_multi-3.2.etk dvorak-3.2.etk uk-3.2.etk us-3.2.etk ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/audio/festival/Makefile =================================================================== --- head/audio/festival/Makefile +++ head/audio/festival/Makefile @@ -75,18 +75,12 @@ ${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/*/config/systems/default.mak -.include - .for m in nas esd -. if ${PORT_OPTIONS:M${m:tu}} -LIB_DEPENDS+= lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound} -post-patch:: +${m:tu}_LIB_DEPENDS= lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound} +post-patch-${m:tu}-on: ${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:tu}_AUDIO,INCLUDE_MODULES += ${m:tu}_AUDIO,' \ ${WRKDIR}/*/config/config.in -CONFIGURE_ARGS+=--enable-$m -. else -CONFIGURE_ARGS+=--disable-$m -. endif +${m:tu}_CONFIGURE_ENABLE=${m} .endfor do-configure: Index: head/audio/firefly/Makefile =================================================================== --- head/audio/firefly/Makefile +++ head/audio/firefly/Makefile @@ -51,13 +51,9 @@ OPTIONS_DEFINE= JAPANESE DOCS JAPANESE_DESC= Japanese support in ID3 tags -.include - -.if ${PORT_OPTIONS:MJAPANESE} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_scan-mp3.c -USES+= iconv -CONFIGURE_ARGS+= --enable-iconv -.endif +JAPANESE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_scan-mp3.c +JAPANESE_USES= iconv +JAPANESE_CONFIGURE_ON= --enable-iconv pre-everything:: @${ECHO_CMD} "Define vars below if you need:" @@ -66,17 +62,17 @@ @${ECHO_CMD} "DAAPD_DBDIR=${DAAPD_DBDIR} (default: /var/db/${PORTNAME})" post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in README AUTHORS COPYING CREDITS \ - ChangeLog INSTALL NEWS TODO - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor -.endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/mt-daapd.conf.sample @${MKDIR} ${STAGEDIR}${DAAPD_DBDIR} @${MKDIR} ${STAGEDIR}${DATADIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in README AUTHORS COPYING CREDITS \ + ChangeLog INSTALL NEWS TODO + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} +.endfor + .include Index: head/audio/gbsplay/Makefile =================================================================== --- head/audio/gbsplay/Makefile +++ head/audio/gbsplay/Makefile @@ -29,15 +29,10 @@ .endif -.include - .if ${PKGNAMEPREFIX} == "" -.if ${PORT_OPTIONS:MNAS} -LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas -.else -CONFIGURE_ARGS+= --disable-nas -.endif +NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas +NAS_CONFIGURE_ENABLE= nas .endif Index: head/audio/gimmix/Makefile =================================================================== --- head/audio/gimmix/Makefile +++ head/audio/gimmix/Makefile @@ -16,6 +16,7 @@ LICENSE= GPLv2 OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes USE_GNOME= gtk20 intltool libglade2 @@ -24,18 +25,10 @@ CONFIGURE_ENV= DATADIRNAME=share -.include - -.if ${PORT_OPTIONS:MNLS} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lintl -CONFIGURE_ARGS+= --enable-nls -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext post-patch: @${LN} -sf ${LOCALBASE}/share/intltool/Makefile.in.in ${WRKSRC}/po/Makefile.in.in Index: head/audio/gmpc/Makefile =================================================================== --- head/audio/gmpc/Makefile +++ head/audio/gmpc/Makefile @@ -31,17 +31,9 @@ OPTIONS_DEFINE= MMKEYS XSPF OPTIONS_DEFAULT= MMKEYS -.include +MMKEYS_CONFIGURE_ON=--disable-mmkeys -.if ${PORT_OPTIONS:MMMKEYS} -CONFIGURE_ARGS+=--disable-mmkeys -.endif - -.if ${PORT_OPTIONS:MXSPF} -LIB_DEPENDS+= libxspf.so:${PORTSDIR}/multimedia/libxspf -CONFIGURE_ARGS+=--enable-libxspf -.else -CONFIGURE_ARGS+=--disable-libxspf -.endif +XSPF_LIB_DEPENDS= libxspf.so:${PORTSDIR}/multimedia/libxspf +XSPF_CONFIGURE_ENABLE= libxspf .include Index: head/audio/gmusicbrowser/Makefile =================================================================== --- head/audio/gmusicbrowser/Makefile +++ head/audio/gmusicbrowser/Makefile @@ -34,8 +34,6 @@ NLS_RUN_DEPENDS= p5-Locale-gettext>=1.0:${PORTSDIR}/devel/p5-Locale-gettext OPTIONS_SUB= yes -.include - do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MANPREFIX}/man/man1/${MAN1} @@ -47,9 +45,8 @@ ${INSTALL_SCRIPT} iceserver.pl ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) -.if ${PORT_OPTIONS:MNLS} +do-install-NLS-on: (cd ${WRKSRC}/locale && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/locale) -.endif .include Index: head/audio/gnome-media/Makefile =================================================================== --- head/audio/gnome-media/Makefile +++ head/audio/gnome-media/Makefile @@ -34,17 +34,10 @@ OPTIONS_DEFINE= PULSEAUDIO OPTIONS_DEFAULT=PULSEAUDIO +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio -CONFIGURE_ARGS+=--enable-pulseaudio -PLIST_SUB+= PULSE="" -.else -CONFIGURE_ARGS+=--disable-pulseaudio -PLIST_SUB+= PULSE="@comment " -.endif +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE=pulseaudio post-patch: @${REINPLACE_CMD} -e 's|have_gladeui=true|have_gladeui=false|g' \ Index: head/audio/gnome-media/pkg-plist =================================================================== --- head/audio/gnome-media/pkg-plist +++ head/audio/gnome-media/pkg-plist @@ -1,9 +1,9 @@ bin/gnome-audio-profiles-properties bin/gnome-sound-recorder -%%PULSE%%bin/gnome-volume-control -%%PULSE%%bin/gnome-volume-control-applet +%%PULSEAUDIO%%bin/gnome-volume-control +%%PULSEAUDIO%%bin/gnome-volume-control-applet bin/gstreamer-properties -%%PULSE%%etc/xdg/autostart/gnome-volume-control-applet.desktop +%%PULSEAUDIO%%etc/xdg/autostart/gnome-volume-control-applet.desktop include/gnome-media/profiles/audio-profile-choose.h include/gnome-media/profiles/audio-profile-edit.h include/gnome-media/profiles/audio-profile.h @@ -16,48 +16,48 @@ lib/libgnome-media-profiles.so.0.0.0 libdata/pkgconfig/gnome-media-profiles.pc share/applications/gnome-sound-recorder.desktop -%%PULSE%%share/applications/gnome-volume-control.desktop +%%PULSEAUDIO%%share/applications/gnome-volume-control.desktop share/applications/gstreamer-properties.desktop %%DATADIR%%/gnome-audio-profile-edit.ui %%DATADIR%%/gnome-audio-profile-new.ui -%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png -%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png -%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png -%%PULSE%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png -%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png -%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png -%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png -%%PULSE%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png -%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png -%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png -%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png -%%PULSE%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png -%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png -%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png -%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png -%%PULSE%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg -%%PULSE%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-center-back.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg +%%PULSEAUDIO%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg %%DATADIR%%/sounds/gnome-sounds-default.xml share/gnome-sound-recorder/ui/ui.xml share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png @@ -157,21 +157,21 @@ share/gstreamer-properties/gstreamer-properties.ui share/gstreamer-properties/icons/gstreamer-properties.png share/icons/hicolor/16x16/apps/gnome-sound-recorder.png -%%PULSE%%share/icons/hicolor/16x16/apps/multimedia-volume-control.png -%%PULSE%%share/icons/hicolor/16x16/apps/multimedia-volume-control.svg +%%PULSEAUDIO%%share/icons/hicolor/16x16/apps/multimedia-volume-control.png +%%PULSEAUDIO%%share/icons/hicolor/16x16/apps/multimedia-volume-control.svg share/icons/hicolor/22x22/apps/gnome-sound-recorder.png -%%PULSE%%share/icons/hicolor/22x22/apps/multimedia-volume-control.png -%%PULSE%%share/icons/hicolor/22x22/apps/multimedia-volume-control.svg +%%PULSEAUDIO%%share/icons/hicolor/22x22/apps/multimedia-volume-control.png +%%PULSEAUDIO%%share/icons/hicolor/22x22/apps/multimedia-volume-control.svg share/icons/hicolor/24x24/apps/gnome-sound-recorder.png -%%PULSE%%share/icons/hicolor/24x24/apps/multimedia-volume-control.png +%%PULSEAUDIO%%share/icons/hicolor/24x24/apps/multimedia-volume-control.png share/icons/hicolor/32x32/apps/gnome-sound-recorder.png -%%PULSE%%share/icons/hicolor/32x32/apps/multimedia-volume-control.png -%%PULSE%%share/icons/hicolor/32x32/apps/multimedia-volume-control.svg +%%PULSEAUDIO%%share/icons/hicolor/32x32/apps/multimedia-volume-control.png +%%PULSEAUDIO%%share/icons/hicolor/32x32/apps/multimedia-volume-control.svg share/icons/hicolor/48x48/apps/gnome-sound-recorder.png -%%PULSE%%share/icons/hicolor/48x48/apps/multimedia-volume-control.png +%%PULSEAUDIO%%share/icons/hicolor/48x48/apps/multimedia-volume-control.png share/icons/hicolor/48x48/apps/gstreamer-properties.png share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg -%%PULSE%%share/icons/hicolor/scalable/apps/multimedia-volume-control.svg +%%PULSEAUDIO%%share/icons/hicolor/scalable/apps/multimedia-volume-control.svg share/locale/af/LC_MESSAGES/gnome-media-2.0.mo share/locale/am/LC_MESSAGES/gnome-media-2.0.mo share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo Index: head/audio/goobox/Makefile =================================================================== --- head/audio/goobox/Makefile +++ head/audio/goobox/Makefile @@ -33,13 +33,7 @@ OPTIONS_DEFINE= NOTIFY OPTIONS_DEFAULT=NOTIFY -.include - -.if ${PORT_OPTIONS:MNOTIFY} -LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify -CONFIGURE_ARGS+=--enable-notification -.else -CONFIGURE_ARGS+=--disable-notification -.endif +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +NOTIFY_CONFIGURE_ENABLE=notification .include Index: head/audio/gspeakers/Makefile =================================================================== --- head/audio/gspeakers/Makefile +++ head/audio/gspeakers/Makefile @@ -24,13 +24,8 @@ OPTIONS_DEFINE= SPICE SPICE_DESC= Use spice instead of gnucap -.include - -.if ${PORT_OPTIONS:MSPICE} -RUN_DEPENDS+= spice3:${PORTSDIR}/cad/spice -.else -RUN_DEPENDS+= gnucap:${PORTSDIR}/cad/gnucap -.endif +SPICE_RUN_DEPENDS= spice3:${PORTSDIR}/cad/spice +SPICE_RUN_DEPENDS_OFF= gnucap:${PORTSDIR}/cad/gnucap post-extract: @${FIND} ${WRKSRC} -type l -delete Index: head/audio/jack/Makefile =================================================================== --- head/audio/jack/Makefile +++ head/audio/jack/Makefile @@ -41,18 +41,11 @@ READLINE_LIB_DEPENDS= libreadline.so:${PORTSDIR}/devel/readline -.include +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen +DOXYGEN_CONFIGURE_ENV_OFF= ac_cv_prog_HAVE_DOXYGEN="false" -.if ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen -.else -CONFIGURE_ENV+= ac_cv_prog_HAVE_DOXYGEN="false" -.endif - -.if ! ${PORT_OPTIONS:MREADLINE} -CONFIGURE_ENV+= ac_cv_lib_readline_readline=no \ +READLINE_CONFIGURE_ENV_OFF= ac_cv_lib_readline_readline=no \ ac_cv_header_readline_chardefs_h=no -.endif post-patch: @${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \ Index: head/audio/jack_ghero/Makefile =================================================================== --- head/audio/jack_ghero/Makefile +++ head/audio/jack_ghero/Makefile @@ -21,13 +21,9 @@ OPTIONS_DEFINE= DEBUG -.include - MAKE_ARGS+= HAVE_MAN="YES" MAKE_ARGS+= PTHREAD_LIBS="-lpthread" -.if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+= HAVE_DEBUG="YES" -.endif +DEBUG_MAKE_ARGS= HAVE_DEBUG="YES" .include Index: head/audio/jack_umidi/Makefile =================================================================== --- head/audio/jack_umidi/Makefile +++ head/audio/jack_umidi/Makefile @@ -23,24 +23,16 @@ DEVD_SCRIPT_DESC= Install devd script to auto-launch jack_umidi -.include - -.if ${PORT_OPTIONS:MDEVD_SCRIPT} -PLIST_FILES+= etc/devd/jack_umidi.conf -.endif +DEVD_SCRIPT_PLIST_FILES= etc/devd/jack_umidi.conf MAKE_ARGS+= HAVE_MAN="YES" MAKE_ARGS+= PTHREAD_LIBS="-lpthread" -.if ${PORT_OPTIONS:MDEBUG} -MAKE_ARGS+= HAVE_DEBUG="YES" -.endif +DEBUG_MAKE_ARGS= HAVE_DEBUG="YES" -post-install: -.if ${PORT_OPTIONS:MDEVD_SCRIPT} +post-install-DEVD_SCRIPT-on:: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd ${INSTALL_DATA} ${WRKDIR}/jack_umidi.conf \ ${STAGEDIR}${PREFIX}/etc/devd -.endif .include Index: head/audio/juke/Makefile =================================================================== --- head/audio/juke/Makefile +++ head/audio/juke/Makefile @@ -17,11 +17,7 @@ OPTIONS_DEFINE= VI_BINDINGS VI_BINDINGS_DESC= Use vi-like key bindings -.include - -.if ${PORT_OPTIONS:MVI_BINDINGS} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-vi -.endif +VI_BINDINGS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-vi post-install: ${INSTALL_DATA} ${WRKSRC}/juke.conf ${STAGEDIR}${PREFIX}/etc/juke.conf.sample Index: head/audio/kaudiocreator/Makefile =================================================================== --- head/audio/kaudiocreator/Makefile +++ head/audio/kaudiocreator/Makefile @@ -31,11 +31,7 @@ OPTIONS_SUB= yes NLS_USES= gettext -.include - -.if empty(PORT_OPTIONS:MNLS) -post-patch: +post-patch-NLS-off: ${REINPLACE_CMD} 's,add_subdirectory(po),,' ${WRKSRC}/CMakeLists.txt -.endif .include Index: head/audio/lash/Makefile =================================================================== --- head/audio/lash/Makefile +++ head/audio/lash/Makefile @@ -37,19 +37,11 @@ PYTHON_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 PYTHON_CONFIGURE_OFF= --disable-pylash -.include +READLINE_USES= readline +READLINE_CONFIGURE_ENV_OFF= vl_cv_lib_readline=no -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline -.else -CONFIGURE_ENV+= vl_cv_lib_readline=no -.endif - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -.else -CONFIGURE_ENV+= ac_cv_prog_lash_texi2html=no -.endif +DOCS_BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html +DOCS_CONFIGURE_ENV_OFF= ac_cv_prog_lash_texi2html=no post-patch: @${REINPLACE_CMD} -e \ @@ -57,11 +49,9 @@ @${REINPLACE_CMD} -e \ '/texi2html/s|--number||' ${WRKSRC}/docs/Makefile.in -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/lash-manual-html-one-page/lash-manual.html \ ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/audio/liba52/Makefile =================================================================== --- head/audio/liba52/Makefile +++ head/audio/liba52/Makefile @@ -28,22 +28,17 @@ DJBFFT_LDFLAGS= -L${LOCALBASE}/lib DJBFFT_CONFIGURE_ON= --enable-djbfft -.include - CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_powerpc= -fPIC HEADER_FILES= liba52/a52_internal.h -post-patch: -.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} +post-patch-OPTIMIZED_CFLAGS-off: @${REINPLACE_CMD} -E -e 's!-O3!${CFLAGS}!' -e 's!-mcpu=[^"]+"!"!' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif -.if ${PORT_OPTIONS:MDJBFFT} +post-patch-DJBFFT-on: @${REINPLACE_CMD} -E -e 's|(fftc4.h)|djbfft/\1|' ${WRKSRC}/liba52/imdct.c -.endif post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/audio/libaacplus/Makefile =================================================================== --- head/audio/libaacplus/Makefile +++ head/audio/libaacplus/Makefile @@ -42,15 +42,10 @@ FFTW3_DESC= Use FFTW3 library for performance -.include - -.if ${PORT_OPTIONS:MFFTW3} -LIB_DEPENDS+= libfftw3.so:${PORTSDIR}/math/fftw3 \ - libfftw3f.so:${PORTSDIR}/math/fftw3-float -CONFIGURE_ARGS+=--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE} -.else -CONFIGURE_ARGS+=--with-fftw3=no -.endif +FFTW3_LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ + libfftw3f.so:${PORTSDIR}/math/fftw3-float +FFTW3_CONFIGURE_ON= --with-fftw3=yes --with-fftw3-prefix=${LOCALBASE} +FFTW3_CONFIGURE_OFF= --with-fftw3=no pre-configure: @${CP} ${DISTDIR}/26410-800.zip ${WRKSRC}/src Index: head/audio/libamrnb/Makefile =================================================================== --- head/audio/libamrnb/Makefile +++ head/audio/libamrnb/Makefile @@ -41,15 +41,11 @@ SRC26104= 26104-b00.zip -.include - post-extract: @${CP} ${_DISTDIR}/${SRC26104} ${WRKSRC}/ -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-off: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ -.endif .include Index: head/audio/libamrwb/Makefile =================================================================== --- head/audio/libamrwb/Makefile +++ head/audio/libamrwb/Makefile @@ -40,15 +40,11 @@ SRC26204= 26204-b00.zip -.include - post-extract: - @${CP} ${_DISTDIR}/${SRC26204} ${WRKSRC}/ + @${CP} ${_DISTDIR}/${SRC26204} ${WRKSRC} -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ -.endif + @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/audio/libfishsound/Makefile =================================================================== --- head/audio/libfishsound/Makefile +++ head/audio/libfishsound/Makefile @@ -24,16 +24,12 @@ USE_LDCONFIG= yes USES= libtool pathfix pkgconfig -.include - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen PORTDOCS= * -.endif -post-patch: -.if !${PORT_OPTIONS:MDOCS} || !${PORT_OPTIONS:MDOXYGEN} +DOXYGEN_BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen +DOXYGEN_IMPLIES= DOCS + +post-patch-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS = / s| doc||' ${WRKSRC}/Makefile.in -.endif .include Index: head/audio/liblo/Makefile =================================================================== --- head/audio/liblo/Makefile +++ head/audio/liblo/Makefile @@ -26,8 +26,6 @@ DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen -.include - post-patch: .if ${ARCH} == i386 || ${ARCH} == powerpc @${REINPLACE_CMD} -e 's,deadbeef,, ; s,f00baa23,,' \ @@ -39,13 +37,12 @@ .for f in AUTHORS ChangeLog NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.if ${PORT_OPTIONS:MDOXYGEN} - (cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} l*.3 p*.3 \ - ${STAGEDIR}${MAN3PREFIX}/man/man3/) - (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) -.endif @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} \ ${STAGEDIR}${EXAMPLESDIR} +post-install-DOXYGEN-on: + (cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} l*.3 p*.3 \ + ${STAGEDIR}${MAN3PREFIX}/man/man3/) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) .include Index: head/audio/libmpdclient/Makefile =================================================================== --- head/audio/libmpdclient/Makefile +++ head/audio/libmpdclient/Makefile @@ -16,13 +16,9 @@ OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_SUB= yes +DOXYGEN_IMPLIES= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -.else -CONFIGURE_ARGS= --disable-documentation -.endif +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen +DOCS_CONFIGURE_OFF= --disable-documentation .include Index: head/audio/libnjb/Makefile =================================================================== --- head/audio/libnjb/Makefile +++ head/audio/libnjb/Makefile @@ -25,13 +25,8 @@ OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -.else -CONFIGURE_ENV+= ac_cv_prog_HAVE_DOXYGEN=no -.endif +DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen +DOCS_CONFIGURE_ENV_OFF= ac_cv_prog_HAVE_DOXYGEN=no post-patch: @${REINPLACE_CMD} -e \ Index: head/audio/libsidplayfp/Makefile =================================================================== --- head/audio/libsidplayfp/Makefile +++ head/audio/libsidplayfp/Makefile @@ -34,8 +34,6 @@ BUILD_DEPENDS+= xa65:${PORTSDIR}/devel/xa65 -.include - SIDPLAYFP_SHLIB_VERSION= 3.2.0 STILVIEW_SHLIB_VERSION= 0.0.2 PLIST_SUB+= \ @@ -44,17 +42,13 @@ STILVIEW_SHLIB_VER=${STILVIEW_SHLIB_VERSION:C/\.[[:digit:].]+//} \ STILVIEW_SHLIB_VERSION=${STILVIEW_SHLIB_VERSION} -post-build: -.if ${PORT_OPTIONS:MDOXYGEN} +post-build-DOXYGEN-on: cd ${WRKSRC} && ${MAKE} doc -.endif -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ; \ cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MDOXYGEN} +post-install-DOXYGEN-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html ; \ ${INSTALL_MAN} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html ; \ ${RM} -f ${WRKDIR}/PLIST.doc ; \ @@ -62,6 +56,5 @@ ${SED} 's|${STAGEDIR}${PREFIX}/||' \ >> ${WRKDIR}/PLIST.doc cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST} -.endif .include Index: head/audio/mctoolame-decoder/Makefile =================================================================== --- head/audio/mctoolame-decoder/Makefile +++ head/audio/mctoolame-decoder/Makefile @@ -19,8 +19,6 @@ OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's|$$(ARCH)||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ @@ -29,9 +27,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mctoolamed ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html ${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html -.endif .include Index: head/audio/mctoolame-encoder/Makefile =================================================================== --- head/audio/mctoolame-encoder/Makefile +++ head/audio/mctoolame-encoder/Makefile @@ -19,8 +19,6 @@ OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's|$$(ARCH)||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -E \ @@ -29,9 +27,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mctoolame ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html ${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}/html -.endif .include Index: head/audio/mma/Makefile =================================================================== --- head/audio/mma/Makefile +++ head/audio/mma/Makefile @@ -33,11 +33,7 @@ python_OLD_CMD= /usr/bin/env python -.include - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz -.endif +DOCS_DISTFILES= ${PORTNAME}-pdf-${DISTVERSION:S,a,,}.tar.gz post-patch: @(cd ${WRKSRC} && \ Index: head/audio/mp3asm/Makefile =================================================================== --- head/audio/mp3asm/Makefile +++ head/audio/mp3asm/Makefile @@ -21,8 +21,6 @@ OPTIONS_DEFINE= DOCS -.include - post-extract: ${RM} ${WRKSRC}/config.cache @@ -33,10 +31,8 @@ -e 's|\([ (!]\)\(log[\.;]\)|\1mp3asm\2|g' \ ${WRKSRC}/src/mp3asm.h ${WRKSRC}/src/*.c -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ -.endif .include Index: head/audio/mp3blaster/Makefile =================================================================== --- head/audio/mp3blaster/Makefile +++ head/audio/mp3blaster/Makefile @@ -22,43 +22,23 @@ OPTIONS_DEFAULT= SIDPLAY VORBIS SIDPLAY_DESC= Sidplayer support -.include - -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= AUTHORS CREDITS ChangeLog FAQ README TODO -.endif -.if ${PORT_OPTIONS:MLIRC} -LIB_DEPENDS+= liblirc_client.so:${PORTSDIR}/comms/lirc -CONFIGURE_ARGS+= --with-lirc -.endif +LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc +LIRC_CONFIGURE_WITH= lirc -.if ${PORT_OPTIONS:MSIDPLAY} -LIB_DEPENDS+= libsidplay.so:${PORTSDIR}/audio/libsidplay -.else -CONFIGURE_ARGS+= --without-sidplay -.endif +SIDPLAY_LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay +SIDPLAY_CONFIGURE_WITH= sidplay -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbisfile.so:${PORTSDIR}/audio/libvorbis -.else -CONFIGURE_ARGS+= --without-oggvorbis -.endif +VORBIS_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_WITH= oggvorbis -.if ${PORT_OPTIONS:MSDL} -CONFIGURE_ARGS+= --with-sdl -USE_SDL= yes -.else -CONFIGURE_ARGS+= --without-sdl -.endif +SDL_CONFIGURE_WITH= sdl +SDL_USE= SDL=yes -.if ${PORT_OPTIONS:MNAS} -CONFIGURE_ARGS+= --with-nas -LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas -LDFLAGS+= -laudio -.else -CONFIGURE_ARGS+= --without-nas -.endif +NAS_CONFIGURE_WITH= nas +NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas +NAS_LDFLAGS= -laudio .include .if ${HAVE_GNOME:Mesound} != "" @@ -72,12 +52,10 @@ @${REINPLACE_CMD} -e 's|/usr/local/share/mp3blaster/win2koi.tbl|${DATADIR}/charmap/win2koi.tbl|' \ ${WRKSRC}/doc/sample.mp3blasterrc -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/audio/mp3stat/Makefile =================================================================== --- head/audio/mp3stat/Makefile +++ head/audio/mp3stat/Makefile @@ -32,14 +32,9 @@ lib/mp3stat/ui_gtk2.so \ lib/mp3stat/ui_console.so -.include - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -PLIST_FILES+= lib/mp3stat/input_vorb.so -.else -MAKE_ARGS+= VORBIS="" -.endif +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis +VORBIS_PLIST_FILES= lib/mp3stat/input_vorb.so +VORBIS_MAKE_ARGS_OFF= VORBIS="" post-patch: @${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -59,11 +54,10 @@ ${STAGEDIR}${PREFIX}/lib/mp3stat) (cd ${WRKSRC}/input/mp3 && ${INSTALL_LIB} input_mp3.so \ ${STAGEDIR}${PREFIX}/lib/mp3stat) -.if ${PORT_OPTIONS:MVORBIS} - (cd ${WRKSRC}/input/vorbis && ${INSTALL_LIB} input_vorb.so \ - ${STAGEDIR}${PREFIX}/lib/mp3stat) -.endif @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) +do-install-VORBIS-on: + (cd ${WRKSRC}/input/vorbis && ${INSTALL_LIB} input_vorb.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) .include Index: head/audio/mpdscribble/Makefile =================================================================== --- head/audio/mpdscribble/Makefile +++ head/audio/mpdscribble/Makefile @@ -23,25 +23,19 @@ OPTIONS_DEFINE= SOUP DOCS SOUP_DESC= Use libsoup instead of libcurl -.include - -.if ${PORT_OPTIONS:MSOUP} -LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup -CONFIGURE_ARGS+= --with-http-client=soup -.else -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -CONFIGURE_ARGS+= --with-http-client=curl -.endif +SOUP_LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup +SOUP_CONFIGURE_ON= --with-http-client=soup +SOUP_LIB_DEPENDS_OFF= libcurl.so:${PORTSDIR}/ftp/curl +SOUP_CONFIGURE_OFF= --with-http-client=curl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${STAGEDIR}${PREFIX}/bin/mpdscribble ${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mpdscribble.1 ${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${STAGEDIR}${PREFIX}/etc/mpdscribble.conf.sample -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS NEWS README ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/audio/mps/Makefile =================================================================== --- head/audio/mps/Makefile +++ head/audio/mps/Makefile @@ -24,12 +24,7 @@ USES= python USE_PYTHON= distutils autoplist -.include - -.if ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -.elif ${PORT_OPTIONS:MMPV} -RUN_DEPENDS= mpv:${PORTSDIR}/multimedia/mpv -.endif +MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer +MPV_RUN_DEPENDS= mpv:${PORTSDIR}/multimedia/mpv .include Index: head/audio/muse/Makefile =================================================================== --- head/audio/muse/Makefile +++ head/audio/muse/Makefile @@ -37,15 +37,12 @@ X11_USE= GNOME=gtk20 X11_CONFIGURE_OFF= --without-x --with-rubik -.include - post-patch: @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \ ${WRKSRC}/src/portaudio/pa_unix_oss.c -.if empty(PORT_OPTIONS:MSNDFILE) +post-patch-SNDFILE-off: @${REINPLACE_CMD} -e '/sndfile >=/s|$$PKG_CONFIG|${FALSE}|' \ ${WRKSRC}/configure -.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/audio/musicpc/Makefile =================================================================== --- head/audio/musicpc/Makefile +++ head/audio/musicpc/Makefile @@ -27,14 +27,9 @@ PORTDOCS= AUTHORS README NEWS PORTEXAMPLES= * -.include - -.if ${PORT_OPTIONS:MICONV} -USES+= iconv -LDFLAGS+= ${ICONV_LIB} -.else -CONFIGURE_ARGS+=--disable-iconv -.endif +ICONV_USES= iconv +ICONV_LDFLAGS= ${ICONV_LIB} +ICONV_CONFIGURE_ENABLE= iconv post-patch: @${REINPLACE_CMD} -e 's|-lintl|${ICONV_LIB}|g' ${WRKSRC}/configure Index: head/audio/ncmpc/Makefile =================================================================== --- head/audio/ncmpc/Makefile +++ head/audio/ncmpc/Makefile @@ -23,8 +23,6 @@ OPTIONS_DEFAULT= LYRICS LYRICS_DESC= Compile with lyrics screen -.include - USES= iconv pkgconfig PLIST_FILES= bin/ncmpc \ man/man1/ncmpc.1.gz \ @@ -32,23 +30,17 @@ %%EXAMPLESDIR%%/keys \ %%EXAMPLESDIR%%/ncmpc.lirc -.if ${PORT_OPTIONS:MNLS} -USES+= gettext +NLS_USES= gettext + LANGUAGES=cs da de eo es fi fr gl he hu it ko nb nl pl pt_BR ru sk sv uk zh_CN .for language in ${LANGUAGES} -PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo +NLS_PLIST_FILES+=share/locale/${language}/LC_MESSAGES/ncmpc.mo .endfor -.else -CONFIGURE_ARGS+=--disable-nls -.endif +NLS_CONFIGURE_OFF=--disable-nls -.if ${PORT_OPTIONS:MLYRICS} -CONFIGURE_ARGS+=--enable-lyrics-screen -PLIST_FILES+= lib/ncmpc/lyrics/10-hd.sh \ +LYRICS_CONFIGURE_ENABLE= lyrics-screen +LYRICS_PLIST_FILES= lib/ncmpc/lyrics/10-hd.sh \ lib/ncmpc/lyrics/20-lyricwiki.rb -.else -CONFIGURE_ARGS+=--disable-lyrics-screen -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpc ${STAGEDIR}${PREFIX}/bin @@ -57,14 +49,13 @@ ${INSTALL_DATA} ${WRKSRC}/doc/keys.sample ${STAGEDIR}${EXAMPLESDIR}/keys ${INSTALL_DATA} ${WRKSRC}/doc/ncmpc.lirc ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_MAN} ${WRKSRC}/doc/ncmpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.if ${PORT_OPTIONS:MNLS} +do-install-NLS-on: .for language in ${LANGUAGES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${language}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${language}.gmo \ ${STAGEDIR}${PREFIX}/share/locale/${language}/LC_MESSAGES/ncmpc.mo .endfor -.endif -.if ${PORT_OPTIONS:MLYRICS} +do-install-LYRICS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ncmpc/lyrics (cd ${WRKSRC}/lyrics && ${INSTALL_SCRIPT} \ 10-hd.sh 20-lyricwiki.rb \ Index: head/audio/ncmpcpp/Makefile =================================================================== --- head/audio/ncmpcpp/Makefile +++ head/audio/ncmpcpp/Makefile @@ -50,8 +50,6 @@ VISUALIZER_BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 VISUALIZER_CONFIGURE_ENABLE= visualizer -.include - .if ${NCURSESBASE} == /usr # no need to use ncurses-config if we use ncurses from the base system CONFIGURE_ARGS+= NCURSES_CONFIG=/usr/bin/true @@ -59,10 +57,9 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/bindings ${WRKSRC}/doc/config ${STAGEDIR}${DOCSDIR}/ -.endif -.include +.include Index: head/audio/openal/Makefile =================================================================== --- head/audio/openal/Makefile +++ head/audio/openal/Makefile @@ -44,8 +44,6 @@ NOT_FOR_ARCHS= ia64 NOT_FOR_ARCHS_REASON_ia64= does not compile -.include - post-patch: @${REINPLACE_CMD} -e 's/x86_64\*/amd64\* | \*ia64\*/g; \ /CPPFLAGS=/ d; s/ \*linux\*)/ \*bsd\*)/' ${WRKSRC}/configure @@ -55,8 +53,7 @@ ${WRKSRC}/src/mixaudio16.h @${REINPLACE_CMD} -e 's|@requirements@||' \ ${WRKSRC}/admin/pkgconfig/openal.pc.in -.if ! ${PORT_OPTIONS:MASM} +post-patch-ASM-off: @${REINPLACE_CMD} -e '/^NASM=/ s|=.*|=no|' ${WRKSRC}/configure -.endif .include Index: head/audio/opusfile/Makefile =================================================================== --- head/audio/opusfile/Makefile +++ head/audio/opusfile/Makefile @@ -33,8 +33,6 @@ INSTALL_TARGET= install-strip -.include - post-patch: @${REINPLACE_CMD} -e 's| @openssl@||' \ ${WRKSRC}/opusfile.pc.in ${WRKSRC}/opusurl.pc.in @@ -43,13 +41,11 @@ ${WRKSRC}/Makefile.am @${CP} ${FILESDIR}/ftime.c ${WRKSRC}/src/ -post-install: -.if ${PORT_OPTIONS:MDOXYGEN} +post-install-DOXYGEN-on: @${RM} -f ${WRKDIR}/PLIST.doc ; \ ${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \ ${SED} 's|${STAGEDIR}${PREFIX}/||' \ >> ${WRKDIR}/PLIST.doc ; \ (cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}) -.endif .include Index: head/audio/pacpl/Makefile =================================================================== --- head/audio/pacpl/Makefile +++ head/audio/pacpl/Makefile @@ -58,8 +58,6 @@ VORBIS_RUN_DEPENDS= vorbiscomment:${PORTSDIR}/audio/vorbis-tools WAVPACK_RUN_DEPENDS= wavpack:${PORTSDIR}/audio/wavpack -.include - post-patch: @${REINPLACE_CMD} -e \ 's|"/etc/pacpl|"${ETCDIR}| ; \ @@ -100,12 +98,11 @@ ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/plugins/gnome/nautilus && ${INSTALL_SCRIPT} PACPL-Convert \ ${STAGEDIR}${PREFIX}/libexec) -.if ${PORT_OPTIONS:MKDE4} +do-install-KDE4-on: (cd ${WRKSRC}/plugins/kde && ${INSTALL_SCRIPT} PACPL-Konvert \ ${STAGEDIR}${PREFIX}/libexec) @${MKDIR} ${STAGEDIR}${PREFIX}/share/kde4/services/ServiceMenus (cd ${WRKSRC}/plugins/kde && ${INSTALL_DATA} pacpl.desktop \ ${STAGEDIR}${PREFIX}/share/kde4/services/ServiceMenus) -.endif .include Index: head/audio/paprefs/Makefile =================================================================== --- head/audio/paprefs/Makefile +++ head/audio/paprefs/Makefile @@ -21,20 +21,12 @@ CONFIGURE_ARGS= --disable-lynx OPTIONS_DEFINE= PK NLS +OPTIONS_SUB= yes PK_DESC= Force dependency on PackageKit -.include +PK_LIB_DEPENDS= libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit -.if ${PORT_OPTIONS:MPK} -LIB_DEPENDS+= libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls .include Index: head/audio/portaudio/Makefile =================================================================== --- head/audio/portaudio/Makefile +++ head/audio/portaudio/Makefile @@ -46,49 +46,38 @@ EXAMPLES_BIN= pa_d* pa_f* paex_* PATEST_BIN= pa_m* paqa_* patest* -.include - -.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -.endif +DOXYGEN_IMPLIES= DOCS +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen post-patch: @${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \ ${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript @${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure -.if ! ${PORT_OPTIONS:MEXAMPLES} +post-patch-EXAMPLES-off: @${REINPLACE_CMD} -i '' '/EXAMPLES =/,/bin\/paex_write_sine_nonint/s/^/#/' \ ${WRKSRC}/Makefile.in -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libportaudio.so.2 -.if ${PORT_OPTIONS:MEXAMPLES} -.for f in ${EXAMPLES_BIN} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/ -.endfor -.endif - -.if ${PORT_OPTIONS:MPATEST} +post-install-PATEST-on: .for f in ${PATEST_BIN} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/ .endfor -.endif -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS} +post-install-DOXYGEN-on: @cd ${WRKSRC} && doxygen @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -.endif +post-install-EXAMPLES-on: +.for f in ${EXAMPLES_BIN} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/ +.endfor + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/audio/pulseaudio/Makefile =================================================================== --- head/audio/pulseaudio/Makefile +++ head/audio/pulseaudio/Makefile @@ -79,8 +79,6 @@ PULSE_VERSION= ${PORTVERSION} PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} -.include - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/daemon/default.pa.in @@ -94,8 +92,7 @@ ${INSTALL_DATA} ${WRKSRC}/src/${ii} \ ${STAGEDIR}${PREFIX}/etc/pulse/${ii}.sample .endfor -.if !${PORT_OPTIONS:MBASH} +post-install-BASH-off: @${RM} -rf ${STAGEDIR}${PREFIX}/etc/bash_completion.d -.endif -.include +.include Index: head/audio/scrobbler/Makefile =================================================================== --- head/audio/scrobbler/Makefile +++ head/audio/scrobbler/Makefile @@ -41,11 +41,6 @@ ENCODINGS_PATCH_USES= iconv -.include - -post-patch:: -.if ${PORT_OPTIONS:MENCODINGS_PATCH} - @${PATCH} ${PATCH_ARGS} -p1 < ${FILESDIR}/extra-encodings-patch -.endif +ENCODINGS_PATCH_EXTRA_PATCHES= ${FILESDIR}/extra-encodings-patch:-p1 .include Index: head/audio/shairport/Makefile =================================================================== --- head/audio/shairport/Makefile +++ head/audio/shairport/Makefile @@ -34,8 +34,6 @@ OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's|avahi-|${LOCALBASE}/bin/avahi-|g' \ -e 's|$$FindBin.*|"${PREFIX}/bin/hairtunes";|' \ @@ -48,11 +46,10 @@ .for file in ${PORTNAME} hairtunes ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin .endfor -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} -p ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/audio/shoutcast/Makefile =================================================================== --- head/audio/shoutcast/Makefile +++ head/audio/shoutcast/Makefile @@ -27,6 +27,7 @@ OPTIONS_DEFAULT= SERVERSETUP EXAMPLES OPTIONS_DEFINE= SERVERSETUP DOCS EXAMPLES +OPTIONS_SUB= yes SETUPSERVER_DESC= SHOUTcast Server Setup Tools EXAMPLE_DESC= SHOUTcast Server Example Configuration Files @@ -50,8 +51,6 @@ USERS= ${SHOUTCASTUSER} GROUPS= ${SHOUTCASTGROUP} -.include - .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010 .if ${ARCH} == "i386" RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x @@ -60,12 +59,6 @@ .endif .endif -.if ${PORT_OPTIONS:MSERVERSETUP} -PLIST_SUB+= SERVERSETUP="" -.else -PLIST_SUB+= SERVERSETUP="@comment " -.endif - post-patch: .for _file in basic public relay simple @${REINPLACE_CMD} -e '/sc_serv2 directory/d' \ @@ -80,7 +73,8 @@ ${MKDIR} ${STAGEDIR}${SHOUTCASTDIR} ${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/logs ${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/control -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/DNAS_Server_Changelog.html ${STAGEDIR}${DOCSDIR}/DNAS_Server_Changelog.html ${INSTALL_DATA} ${WRKSRC}/Readme_DNAS_Server.html ${STAGEDIR}${DOCSDIR}/Readme_DNAS_Server.html @@ -127,20 +121,18 @@ ${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Windows.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Windows.png ${INSTALL_DATA} ${WRKSRC}/docs/res/View_Source_Connection_Details.png ${STAGEDIR}${DOCSDIR}/docs/res/View_Source_Connection_Details.png -.endif -.if ${PORT_OPTIONS:MSERVERSETUP} +do-install-SERVERSETUP-on: ${MKDIR} ${STAGEDIR}${WWWDIR}/setup ${INSTALL_DATA} ${WRKSRC}/setup.sh ${STAGEDIR}${WWWDIR}/setup.sh ${INSTALL_DATA} ${WRKSRC}/setup/setup.js ${STAGEDIR}${WWWDIR}/setup/setup.js ${INSTALL_DATA} ${WRKSRC}/setup/setup.html ${STAGEDIR}${WWWDIR}/setup/setup.html ${INSTALL_DATA} ${WRKSRC}/setup/setup.txt ${STAGEDIR}${WWWDIR}/setup/setup.txt -.endif -.if ${PORT_OPTIONS:MEXAMPLES} + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_basic.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_basic.conf ${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_public.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_public.conf ${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_relay.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_relay.conf ${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_simple.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_simple.conf -.endif .include Index: head/audio/soundtracker/Makefile =================================================================== --- head/audio/soundtracker/Makefile +++ head/audio/soundtracker/Makefile @@ -23,6 +23,7 @@ OPTIONS_DEFINE= JACK SDL NLS OPTIONS_DEFINE_i386= ASM +OPTIONS_SUB= yes ASM_DESC= Use optimized assembly (potentially unstable) CONFIGURE_ARGS+= --disable-gnome @@ -31,31 +32,16 @@ "${PREFIX}/share/pixmaps/${PORTNAME}.xpm" \ "soundtracker" "AudioVideo;Audio;AudioVideoEditing;" false -.include +ASM_CONFIGURE_ENABLE= asm -.if ${PORT_OPTIONS:MASM} -CONFIGURE_ARGS+= --enable-asm -.endif - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack -.else -CONFIGURE_ARGS+= --disable-jack -.endif - -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -.else -CONFIGURE_ARGS+= --disable-sdl -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CONFIGURE_ENABLE= jack + +DSL_USE= SDL=sdl +DSL_CONFIGURE_ENABLE= sdl + +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e 's|soundtracker.desktop||' \ @@ -67,10 +53,8 @@ @${REINPLACE_CMD} -e 's|PREFIX"/share/soundtracker|DATADIR"|' \ ${WRKSRC}/app/gui.c -pre-build: -.if ${PORT_OPTIONS:MNLS} +pre-build-NLS-on: cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c -o ja.gmo ja.po -.endif post-install: ${INSTALL_DATA} ${WRKSRC}/sharp.xpm \ Index: head/audio/sox/Makefile =================================================================== --- head/audio/sox/Makefile +++ head/audio/sox/Makefile @@ -92,14 +92,10 @@ OPUS_CONFIGURE_WITH= opus OPUS_LIB_DEPENDS= libopusfile.so:${PORTSDIR}/audio/opusfile -.include - -.if ! ${PORT_OPTIONS:MGSM} # We cannot ask for gsm to be enabled without it trying to use external gsm, # so force the autoconf checks to fail -CONFIGURE_ENV+= ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \ +GSM_CONFIGURE_ENV_OFF= ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \ ac_cv_lib_gsm_gsm_create=no -.endif INSTALL_TARGET= install-strip Index: head/audio/sphinxbase/Makefile =================================================================== --- head/audio/sphinxbase/Makefile +++ head/audio/sphinxbase/Makefile @@ -28,21 +28,12 @@ SNDFILE_DESC= libsndfile support THREADS_DESC= Build with thread safety support -.include +SNDFILE_USES= pkgconfig +SNDFILE_LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile +SNDFILE_CONFIGURE_ENV_OFF= HAVE_PKGCONFIG=no -.if ${PORT_OPTIONS:MSNDFILE} -USES+= pkgconfig -LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile -.else -CONFIGURE_ENV+= HAVE_PKGCONFIG=no -.endif - -.if ${PORT_OPTIONS:MTHREADS} -LDFLAGS+= -lpthread -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif +THREADS_LDFLAGS= -lpthread +THREADS_CONFIGURE_ENABLE= threads post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsphinx*.so Index: head/audio/spiralsynth/Makefile =================================================================== --- head/audio/spiralsynth/Makefile +++ head/audio/spiralsynth/Makefile @@ -23,8 +23,6 @@ OPTIONS_DEFINE= DOCS -.include - post-patch: .for ii in \ Makefile.in \ @@ -70,11 +68,10 @@ .else ${ECHO_CMD} bin/SpiralSynth > ${PLIST} .endif -.if ${PORT_OPTIONS:MDOCS} +pre-install-DOCS-on: .for ii in ${DOC_FILES} ${ECHO_CMD} share/doc/spiralsynth/${ii} >> ${PLIST} .endfor -.endif do-install: .if defined(PLUGIN) @@ -83,11 +80,10 @@ ${INSTALL_PROGRAM} ${WRKSRC}/SpiralSynth ${STAGEDIR}${PREFIX}/bin .endif -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for ii in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/audio/squeezeboxserver/Makefile =================================================================== --- head/audio/squeezeboxserver/Makefile +++ head/audio/squeezeboxserver/Makefile @@ -44,28 +44,14 @@ GROUPS= ${SLIMGROUP} USES= perl5 tar:tgz -.include - USE_MYSQL= server -.if ${PORT_OPTIONS:MAPE} -RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac -.endif -.if ${PORT_OPTIONS:MFAAD} -RUN_DEPENDS+= faad:${PORTSDIR}/audio/faad -.endif -.if ${PORT_OPTIONS:MFLAC} -RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac -.endif -.if ${PORT_OPTIONS:MLAME} -RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame -.endif -.if ${PORT_OPTIONS:MSHORTEN} -RUN_DEPENDS+= shorten:${PORTSDIR}/audio/shorten -.endif -.if ${PORT_OPTIONS:MSOX} -RUN_DEPENDS+= sox:${PORTSDIR}/audio/sox -.endif +APE_RUN_DEPENDS= mac:${PORTSDIR}/audio/mac +FAAD_RUN_DEPENDS= faad:${PORTSDIR}/audio/faad +FLAC_RUN_DEPENDS= flac:${PORTSDIR}/audio/flac +LAME_RUN_DEPENDS= lame:${PORTSDIR}/audio/lame +SHORTEN_RUN_DEPENDS= shorten:${PORTSDIR}/audio/shorten +SOX_RUN_DEPENDS= sox:${PORTSDIR}/audio/sox USE_RC_SUBR= squeezeboxserver TMP_SLIMDIR= ${WRKDIR}/_squeezeboxserver @@ -187,10 +173,9 @@ .for _CONF in ${CONFFILES} @cd ${WRKSRC} && ${INSTALL_DATA} ${_CONF} ${TMP_SLIMDIR}/${_CONF}.sample .endfor -.if ${PORT_OPTIONS:MDOCS} +do-build-DOCS-on: @${MKDIR} ${TMP_DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${TMP_DOCSDIR} -.endif pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -208,9 +193,8 @@ ${LOCALBASE}/share/mysql/english/errmsg.sys \ ${STAGEDIR}${PREFIX}/${SLIMDIR}/MySQL/ @${INSTALL_SCRIPT} ${WRKDIR}/softsqueeze.sh ${STAGEDIR}${PREFIX}/bin/softsqueeze -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${TMP_DOCSDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.endif -.include +.include Index: head/audio/streamripper/Makefile =================================================================== --- head/audio/streamripper/Makefile +++ head/audio/streamripper/Makefile @@ -38,19 +38,11 @@ CDK_VERSION= 5.0-20060507 -.include +FAAD_CONFIGURE_OFF= ac_cv_lib_faad_NeAACDecDecode2=no +FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad -.if ! ${PORT_OPTIONS:MFAAD} -CONFIGURE_ARGS+=ac_cv_lib_faad_NeAACDecDecode2=no -.else -LIB_DEPENDS+= libfaad.so:${PORTSDIR}/audio/faad -.endif - -.if ! ${PORT_OPTIONS:MVORBIS} -CONFIGURE_ARGS+=--without-ogg -.else -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -.endif +VORBIS_CONFIGURE_WITH= ogg +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis post-extract: ${MV} ${WRKDIR}/cdk-${CDK_VERSION} ${WRKSRC} Index: head/audio/swhplugins/Makefile =================================================================== --- head/audio/swhplugins/Makefile +++ head/audio/swhplugins/Makefile @@ -27,26 +27,17 @@ CFLAGS+= -fPIC -DPIC OPTIONS_DEFINE= NLS 3DNOW SSE +OPTIONS_SUB= yes 3DNOW_DESC= use 3DNow! instructions SSE_DESC= use SSE instructions -.include -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -LDFLAGS+= -lintl -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:M3DNOW} -CONFIGURE_ARGS+= --enable-3dnow -.endif - -.if ${PORT_OPTIONS:MSSE} -CONFIGURE_ARGS+= --enable-sse -.endif +NLS_USES= gettext +NLS_LDFLAGS= -lintl +NLS_CONFIGURE_ENABLE= nls + +3DNOW_CONFIGURE_ENABLE= 3dnow + +SSE_CONFIGURE_ENABLE= sse post-patch: @${REINPLACE_CMD} -e \ Index: head/audio/taglib/Makefile =================================================================== --- head/audio/taglib/Makefile +++ head/audio/taglib/Makefile @@ -35,15 +35,12 @@ RCC_CFLAGS= -I${LOCALBASE}/include RCC_LDFLAGS= -L${LOCALBASE}/lib -.include - -post-patch: -.if ${PORT_OPTIONS:MRCC} +post-patch-RCC-on: @${REINPLACE_CMD} -e 's|-ltag|-ltag -lrcc|g' \ ${WRKSRC}/taglib.pc.cmake ${WRKSRC}/taglib-config.cmake @${REINPLACE_CMD} -e 's|-ltag_c|-ltag_c -lrcc|g' \ ${WRKSRC}/bindings/c/taglib_c.pc.cmake -.endif +post-patch: ${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt ${WRKSRC}/bindings/c/CMakeLists.txt Index: head/audio/tempest_for_eliza/Makefile =================================================================== --- head/audio/tempest_for_eliza/Makefile +++ head/audio/tempest_for_eliza/Makefile @@ -20,14 +20,11 @@ OPTIONS_DEFINE= DOCS -.include - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/tempest ${INSTALL_DATA} ${SONGS:S,^,${WRKSRC}/songs/,} ${STAGEDIR}${PREFIX}/share/tempest -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/audio/timemachine/Makefile =================================================================== --- head/audio/timemachine/Makefile +++ head/audio/timemachine/Makefile @@ -23,13 +23,8 @@ GNU_CONFIGURE= yes LDFLAGS+= -lm -.include - -.if ${PORT_OPTIONS:MLASH} -LIB_DEPENDS+= liblash.so:${PORTSDIR}/audio/lash -.else -CONFIGURE_ARGS+=--disable-lash -.endif +LASH_LIB_DEPENDS= liblash.so:${PORTSDIR}/audio/lash +LASH_CONFIGURE_OFF= --disable-lash post-patch: @${REINPLACE_CMD} -e \ Index: head/audio/uade/Makefile =================================================================== --- head/audio/uade/Makefile +++ head/audio/uade/Makefile @@ -35,31 +35,18 @@ play_loop_state_diagram.txt uade.html OPTIONS_DEFINE= TEXTSCOPE FUSE XMMS DOCS +OPTIONS_SUB= yes TEXTSCOPE_DESC= Audio register debug mode XMMS_DESC= XMMS plugin -.include +TEXTSCOPE_CONFIGURE_WITH= text-scope -.if ${PORT_OPTIONS:MTEXTSCOPE} -CONFIGURE_ARGS+=--with-text-scope -.endif - -.if ${PORT_OPTIONS:MFUSE} -USES+= fuse -PLIST_SUB+= FUSE="" -.else -CONFIGURE_ARGS+=--without-uadefs -PLIST_SUB+= FUSE="@comment " -.endif - -.if ${PORT_OPTIONS:MXMMS} -LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms -PLIST_SUB+= XMMS="" -.else -CONFIGURE_ARGS+=--without-xmms -PLIST_SUB+= XMMS="@comment " -.endif +FUSE_USES= fuse +FUSE_CONFIGURE_WITH= uadefs + +XMMS_LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms +XMMS_CONFIGURE_WITH= xmms post-extract: @${RM} -rf ${WRKSRC}/players/S Index: head/audio/vagalume/Makefile =================================================================== --- head/audio/vagalume/Makefile +++ head/audio/vagalume/Makefile @@ -25,7 +25,6 @@ OPTIONS_SUB= NLS DBUS TRAY_DESC= Tray icon and libnotify support -.include DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib DBUS_CONFIGURE_ON= --enable-dbus --enable-im-status @@ -35,26 +34,21 @@ TRAY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify TRAY_CONFIGURE_ENABLE= tray-icon -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+=--disable-nls -.endif +NLS_USES= gettext +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LDFLAGS= -L${LOCALBASE}/lib +NLS_CONFIGURE_ENABLE= nls -.if ${PORT_OPTIONS:MGCONF} -USE_GNOME+= gconf2 -CONFIGURE_ARGS+=--enable-gconf +GCONF_USE= GNOME=gconf2 +GCONF_CONFIGURE_ENABLE= gconf .endif post-patch: @${REINPLACE_CMD} -e 's|serviceentrydir = @serviceentrydir@|serviceentrydir = ${PREFIX}/share/dbus-1/services|' \ ${WRKSRC}/Makefile.in -.if empty(PORT_OPTIONS:MNLS) +post-patch-NLS-off: @${REINPLACE_CMD} -e 's|SUBDIRS = src po|SUBDIRS = src|' \ ${WRKSRC}/Makefile.in -.endif post-install: ${CP} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps Index: head/audio/voipong/Makefile =================================================================== --- head/audio/voipong/Makefile +++ head/audio/voipong/Makefile @@ -16,10 +16,7 @@ OPTIONS_DEFINE= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR}/users-manual ${INSTALL_DATA} ${WRKSRC}/docs/users-manual/*.html ${STAGEDIR}${DOCSDIR}/users-manual/ @@ -27,6 +24,5 @@ .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/audio/xmp/Makefile =================================================================== --- head/audio/xmp/Makefile +++ head/audio/xmp/Makefile @@ -27,22 +27,12 @@ OPTIONS_DEFINE= ALSA PULSEAUDIO -.include +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins +ALSA_CONFIGURE_ENABLE= alsa -.if ${PORT_OPTIONS:MALSA} -LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins -CONFIGURE_ARGS+= --enable-alsa -.else -CONFIGURE_ARGS+= --disable-alsa -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio -CONFIGURE_ARGS+= --enable-pulseaudio -.else -CONFIGURE_ARGS+= --disable-pulseaudio -.endif +PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio post-patch: @${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in Index: head/audio/yell/Makefile =================================================================== --- head/audio/yell/Makefile +++ head/audio/yell/Makefile @@ -9,25 +9,19 @@ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Command-line pc speaker bell -PLIST_FILES= bin/yell - ONLY_FOR_ARCHS= i386 amd64 OPTIONS_DEFINE= SUID SUID_DESC= Use suid to allow execution as non root -.include +SUID_PLIST_FILES= "@(,,4110) bin/yell" +SUID_PLIST_FILES_OFF= "@(,,0100) bin/yell" do-build: ${CC} ${WRKSRC}/yell.c ${CFLAGS} -o ${WRKSRC}/${PORTNAME} do-install: -.if ${PORT_OPTIONS:MSUID} - ${INSTALL_PROGRAM} -m 4110 ${WRKSRC}/${PORTNAME} \ - ${STAGEDIR}/${PREFIX}/bin -.else - ${INSTALL_PROGRAM} -m 0100 ${WRKSRC}/${PORTNAME} \ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ ${STAGEDIR}/${PREFIX}/bin -.endif .include Index: head/benchmarks/expedite/Makefile =================================================================== --- head/benchmarks/expedite/Makefile +++ head/benchmarks/expedite/Makefile @@ -24,24 +24,8 @@ SDL_DESC= Enable SDL evas engine X11_DESC= Enable X11 evas engine -.include - -.if ${PORT_OPTIONS:MOPENGL} -CONFIGURE_ARGS+= --enable-opengl-x11 -.else -CONFIGURE_ARGS+= --disable-opengl-x11 -.endif - -.if ${PORT_OPTIONS:MSDL} -CONFIGURE_ARGS+= --enable-software-sdl -.else -CONFIGURE_ARGS+= --disable-software-sdl -.endif - -.if ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+= --enable-software-x11 --enable-xrender-x11 -.else -CONFIGURE_ARGS+= --disable-software-x11 --disable-xrender-x11 -.endif +OPENGL_CONFIGURE_ENABLE= opengl-x11 +SDL_CONFIGURE_ENABLE= software-sdl +X11_CONFIGURE_ENABLE= software-x11 xrender-x11 .include Index: head/benchmarks/fio/Makefile =================================================================== --- head/benchmarks/fio/Makefile +++ head/benchmarks/fio/Makefile @@ -16,20 +16,15 @@ OPTIONS_DEFINE= GNUPLOT EXAMPLES GNUPLOT_DESC= Support for plotting graphs -.include +GNUPLOT_BUILD_DEPENDS= ${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fio ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/tools/fio_generate_plots ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/fio.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/tools/fio_generate_plots.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) -.endif - -.if ${PORT_OPTIONS:MGNUPLOT} -BUILD_DEPENDS+= ${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot -.endif .include Index: head/benchmarks/gtkperf/Makefile =================================================================== --- head/benchmarks/gtkperf/Makefile +++ head/benchmarks/gtkperf/Makefile @@ -17,18 +17,11 @@ USE_GNOME= gtk20 gnomeprefix OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext iconv -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --enable-nls -PLIST_SUB= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB= NLS="@comment " -.endif +NLS_USES= gettext iconv +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LDFLAGS= -L${LOCALBASE}/lib +NLS_CONFIGURE_ENABLE= nls .include Index: head/benchmarks/imb/Makefile =================================================================== --- head/benchmarks/imb/Makefile +++ head/benchmarks/imb/Makefile @@ -32,17 +32,12 @@ CHECK_RESULTS_DESC= Check results (not valid as real benchmark data) CHECK_RESULTS_CFLAGS= -DCHECK -.include - -.if ${PORT_OPTIONS:MOPENMPI} -BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi -RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi -MAKE_ENV+= MPI_HOME=${LOCALBASE}/mpi/openmpi -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2 -RUN_DEPENDS+= ${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2 -MAKE_ENV+= MPI_HOME=${LOCALBASE} -.endif +OPENMPI_BUILD_DEPENDS= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi +OPENMPI_RUN_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi +OPENMPI_MAKE_ENV= MPI_HOME=${LOCALBASE}/mpi/openmpi +OPENMPI_BUILD_DEPENDS_OFF= ${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2 +OPENMPI_RUN_DEPENDS_OFF= ${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2 +OPENMPI_MAKE_ENV_OFF= MPI_HOME=${LOCALBASE} do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -53,4 +48,4 @@ (cd ${WRKSRC} && ${INSTALL_PROGRAM} IMB-EXT IMB-IO IMB-MPI1 \ ${STAGEDIR}${PREFIX}/bin) -.include +.include Index: head/benchmarks/iozone/Makefile =================================================================== --- head/benchmarks/iozone/Makefile +++ head/benchmarks/iozone/Makefile @@ -28,19 +28,12 @@ SSH_DESC= Use ssh in distributed measurement THREADS_DESC= Enable threading (uses pthreads) -.include +THREADS_LDFLAGS= -lpthread +THREADS_CFLAGS_OFF= -DNO_THREADS -.if ${PORT_OPTIONS:MTHREADS} -LDFLAGS+= -lpthread -.else -CFLAGS+= -DNO_THREADS -.endif - -post-patch: -.if ${PORT_OPTIONS:MSSH} +post-patch-SSH-on: @${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' \ ${WRKSRC}/iozone.c -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${STAGEDIR}${PREFIX}/bin Index: head/benchmarks/netio/Makefile =================================================================== --- head/benchmarks/netio/Makefile +++ head/benchmarks/netio/Makefile @@ -22,20 +22,16 @@ OPTIONS_DEFINE= IPV6 IPV6_PLIST_FILES= bin/netio6 -.include - do-build: @(cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} O=.o CFLAGS="${CFLAGS}" ${MAKE_CMD} all) -.if ${PORT_OPTIONS:MIPV6} +do-build-IPV6-on: @(cd ${WRKSRC} && \ ${MAKE_ENV} O=.6o X=6 CFLAGS="${CFLAGS} -DUSE_IPV6" ${MAKE_CMD} all) -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/netio ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MIPV6} +do-install-IPV6-on: ${INSTALL_PROGRAM} ${WRKSRC}/netio6 ${STAGEDIR}${PREFIX}/bin -.endif .include Index: head/benchmarks/netperf/Makefile =================================================================== --- head/benchmarks/netperf/Makefile +++ head/benchmarks/netperf/Makefile @@ -28,37 +28,11 @@ INFO= netperf -.include - -.if ${PORT_OPTIONS:MSOCKETS} -CONFIGURE_ARGS+= --enable-unixdomain -.else -CONFIGURE_ARGS+= --disable-unixdomain -.endif - -.if ${PORT_OPTIONS:MSCTP} -CONFIGURE_ARGS+= --enable-sctp -.else -CONFIGURE_ARGS+= --disable-sctp -.endif - -.if ${PORT_OPTIONS:MEXS} -CONFIGURE_ARGS+= --enable-exs -.else -CONFIGURE_ARGS+= --disable-exs -.endif - -.if ${PORT_OPTIONS:MHISTOGRAM} -CONFIGURE_ARGS+= --enable-histogram -.else -CONFIGURE_ARGS+= --disable-histogram -.endif - -.if ${PORT_OPTIONS:MOMNI} -CONFIGURE_ARGS+= --enable-omni -.else -CONFIGURE_ARGS+= --disable-omni -.endif +SOCKETS_CONFIGURE_ENABLE= unixdomain +SCTP_CONFIGURE_ENABLE= sctp +EXS_CONFIGURE_ENABLE= exs +HISTOGRAM_CONFIGURE_ENABLE= histogram +OMNI_CONFIGURE_ENABLE= omni SCRIPTS= arr_script packet_byte_script sctp_stream_script snapshot_script \ tcp_range_script tcp_rr_script tcp_stream_script udp_rr_script \ Index: head/benchmarks/nqueens/Makefile =================================================================== --- head/benchmarks/nqueens/Makefile +++ head/benchmarks/nqueens/Makefile @@ -40,10 +40,9 @@ do-build: cd ${WRKSRC} && \ ${CC} ${CFLAGS} -o qn24b_base base/queens.c -.if ${PORT_OPTIONS:MMPI} +do-build-MPI-on: cd ${WRKSRC} && \ ${MPICC} ${CFLAGS} -o qn24b_mpi mpi/main.c -.endif PLIST_FILES= ${PROGS:S/^/bin\//} Index: head/benchmarks/nuttcp/Makefile =================================================================== --- head/benchmarks/nuttcp/Makefile +++ head/benchmarks/nuttcp/Makefile @@ -25,8 +25,6 @@ OPTIONS_SUB= yes NUTTSCP_USES= perl5 -.include - post-extract: ${CP} ${DISTDIR}/beta/${NUTTSCPDISTFILE} ${WRKDIR}/nuttscp ${CP} ${DISTDIR}/beta/${PORTNAME}-${PORTVERSION}.c ${WRKDIR}/ @@ -38,12 +36,11 @@ do-build: cd ${WRKDIR} && ${CC} -o ${PORTNAME} nuttcp-${PORTVERSION}.c -do-install: -. if ${PORT_OPTIONS:MNUTTSCP} - ${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${STAGEDIR}${PREFIX}/bin/ - ( cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp ) -. endif +do-install-NUTTSCP-on: + ${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${STAGEDIR}${PREFIX}/bin/ + ( cd ${STAGEDIR}${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp ) +do-install: ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ Index: head/benchmarks/polygraph/Makefile =================================================================== --- head/benchmarks/polygraph/Makefile +++ head/benchmarks/polygraph/Makefile @@ -32,28 +32,17 @@ OPTIONS_DEFAULT= OPENSSL ZLIB -.include +GNUPLOT_RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -.if ${PORT_OPTIONS:MGNUPLOT} -RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot -.endif +OPENSSL_USE= OPENSSL=yes +PERL_USES= perl5 +PERL_USE= PERL5=run +ZLIB_CONFIGURE_WITH= zlib=/usr + +.include .if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.else -CONFIGURE_ARGS+= --without-ssl -.endif - -.if ${PORT_OPTIONS:MPERL} -USES+= perl5 -USE_PERL5= run -.endif - -.if ${PORT_OPTIONS:MZLIB} -CONFIGURE_ARGS+= --with-zlib=/usr -.else -CONFIGURE_ARGS+= --without-zlib .endif .include Index: head/biology/avida/Makefile =================================================================== --- head/biology/avida/Makefile +++ head/biology/avida/Makefile @@ -34,8 +34,6 @@ BROKEN_powerpc= Does not compile: invokes i386 asm BROKEN_sparc64= Does not compile: invokes i386 asm -.include - post-patch: @${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \ ${REINPLACE_CMD} -e \ @@ -63,10 +61,9 @@ (cd ${WRKSRC}/avida-core/support/config && ${INSTALL_DATA} *.org \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/avida-core/documentation && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DOCSDIR}) -.endif .include Index: head/biology/gff2ps/Makefile =================================================================== --- head/biology/gff2ps/Makefile +++ head/biology/gff2ps/Makefile @@ -35,9 +35,8 @@ @${MKDIR} ${WRKDIR} @${GZCAT} ${DISTDIR}/${PORTNAME}_v${PORTVERSION}.gz \ > ${WRKDIR}/${PORTNAME} -.if ${PORT_OPTIONS:MDOCS} +do-extract-DOCS-on: @${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKDIR}/${GFF2PS_MAN} -.endif post-patch: @${REINPLACE_CMD} -e \ @@ -46,9 +45,8 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/biology/ortep3/Makefile =================================================================== --- head/biology/ortep3/Makefile +++ head/biology/ortep3/Makefile @@ -30,11 +30,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES PGPLOT PGPLOT_DESC= Fortran subroutine package for drawing graphs -.include - -.if ${PORT_OPTIONS:MPGPLOT} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa -.endif +PGPLOT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-aa post-extract: ${MV} ${WRKSRC}/ortep.f ${WRKSRC}/ortep.f-1.0 @@ -45,15 +41,13 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/src ${INSTALL_DATA} ${WRKSRC}/../README.1st ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/../man/* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/000readme.txt ${STAGEDIR}${DOCSDIR}/src -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/../examples/* ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: head/biology/platon/Makefile =================================================================== --- head/biology/platon/Makefile +++ head/biology/platon/Makefile @@ -28,8 +28,6 @@ MAKEFILE= ${FILESDIR}/Makefile -.include - pre-patch: ${GUNZIP_CMD} ${WRKSRC}/platon.f.gz ${WRKSRC}/xdrvr.c.gz @@ -37,7 +35,7 @@ ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/platon \ ${STAGEDIR}${PREFIX}/bin ${LN} -fs platon ${STAGEDIR}${PREFIX}/bin/pluton -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MV} ${WRKDIR}/${DISTNAME}/README* ${STAGEDIR}${DOCSDIR}/ ${MV} ${SAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ @@ -46,6 +44,5 @@ ${MV} ${WRKSRC}/TEST ${STAGEDIR}${DOCSDIR}/ ${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} ${_SHAREMODE} -.endif -.include +.include Index: head/biology/protomol/Makefile =================================================================== --- head/biology/protomol/Makefile +++ head/biology/protomol/Makefile @@ -37,20 +37,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -OPTIONS_DEFINE= GLUT +OPTIONS_DEFINE= GLUT EXAMPLES OPTIONS_DEFAULT= GLUT GLUT_CONFIGURE_ON= --with-glut=yes GLUT_USE= GL=glut GLUT_CONFIGURE_OFF= --with-glut=no -.include - -.if ${PORT_OPTIONS:MEXAMPLES} -post-install: +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples ; \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name .cvsignore" -.endif .include Index: head/biology/tinker/Makefile =================================================================== --- head/biology/tinker/Makefile +++ head/biology/tinker/Makefile @@ -57,15 +57,13 @@ (cd ${WRKSRC}/params && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/params) ${MKDIR} ${STAGEDIR}${DATADIR}/test (cd ${WRKSRC}/test && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/test) -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${INSTALL_DATA} 0README *.pdf *.txt ${STAGEDIR}${DOCSDIR}) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/example && ${INSTALL_DATA} \ 0README *.make *.dyn *.int *.frac *.key *.seq *.pdb *.xyz \ ${STAGEDIR}${EXAMPLESDIR}) -.endif .include Index: head/biology/xmolwt/Makefile =================================================================== --- head/biology/xmolwt/Makefile +++ head/biology/xmolwt/Makefile @@ -19,15 +19,11 @@ PORTDOCS= * PLIST_FILES= bin/gmolwt bin/molwt -.include - -.if ${PORT_OPTIONS:MGTK2} -USES+= pkgconfig -USE_GNOME= gtk20 -MAKE_ENV+= GTKCONFIG="pkg-config gtk+-2.0" -.else -USE_GNOME= gtk12 -MAKE_ENV+= GTKCONFIG="${GTK_CONFIG}" +GTK2_USES= pkgconfig +GTK2_USE= GNOME=gtk20 +GTK2_MAKE_ENV= GTKCONFIG="pkg-config gtk+-2.0" +GTK2_USE_OFF= GNOME=gtk12 +GTK2_MAKE_ENV_OFF= GTKCONFIG="${GTK_CONFIG}" .endif post-patch: Index: head/cad/admesh/Makefile =================================================================== --- head/cad/admesh/Makefile +++ head/cad/admesh/Makefile @@ -20,16 +20,13 @@ PORTDOCS= admesh.doc PLIST_FILES= bin/admesh -.include - post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/admesh ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ADMESH.DOC ${STAGEDIR}${DOCSDIR}/admesh.doc -.endif .include Index: head/cad/brickutils/Makefile =================================================================== --- head/cad/brickutils/Makefile +++ head/cad/brickutils/Makefile @@ -40,12 +40,8 @@ INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 128x128 -.include - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${PORTNAME}-manual-it.pdf:docs \ +DOCS_DISTFILES= ${PORTNAME}-manual-it.pdf:docs \ ${PORTNAME}-manual.pdf:docs -.endif post-patch: @${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}|' \ @@ -76,10 +72,9 @@ ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} @(cd ${_DISTDIR} && ${CP} -a *.pdf ${STAGEDIR}${DOCSDIR}) -.endif .include Index: head/cad/cider/Makefile =================================================================== --- head/cad/cider/Makefile +++ head/cad/cider/Makefile @@ -19,8 +19,6 @@ CFLAGS+= -Wno-return-type -.include - pre-patch: @${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt \ ${WRKSRC}/cider/common/lib/helpdir/spice.txt @@ -71,12 +69,11 @@ ${STAGEDIR}${DATADIR}/spice3/scripts ${INSTALL_SCRIPT} ${WRKSRC}/spice/common/lib/scripts/spinit \ ${STAGEDIR}${DATADIR}/cider/scripts -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/spice3 ${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir \ ${STAGEDIR}${EXAMPLESDIR}/spice3 cd ${WRKSRC}/cider/common/examples && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: head/cad/dinotrace/Makefile =================================================================== --- head/cad/dinotrace/Makefile +++ head/cad/dinotrace/Makefile @@ -36,8 +36,7 @@ post-patch: @${REINPLACE_CMD} -e 's|"-O3"|""|' ${WRKSRC}/configure -post-install: -.if ${PORT_OPTIONS:MEMACS} +post-install-EMACS-on: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} .for F in dinotrace.el sim-log.el ${INSTALL_DATA} ${WRKSRC}/lisp/${F} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} Index: head/cad/fidocadj/Makefile =================================================================== --- head/cad/fidocadj/Makefile +++ head/cad/fidocadj/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFINE= DOCS -.include +DOCS_DISTFILES= ${PORTNAME}_manual_en.pdf:docs FDCJ_MANUAL= ${PORTNAME}_manual_en.pdf @@ -33,13 +33,8 @@ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${DATADIR}; \ ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.jar ${STAGEDIR}${DATADIR}/ -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} && \ ${INSTALL_DATA} ${DISTDIR}/${FDCJ_MANUAL} ${STAGEDIR}${DOCSDIR}/ -.endif - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${PORTNAME}_manual_en.pdf:docs -.endif .include Index: head/cad/geda-gattrib/Makefile =================================================================== --- head/cad/geda-gattrib/Makefile +++ head/cad/geda-gattrib/Makefile @@ -31,16 +31,10 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -E \ Index: head/cad/geda-gschem/Makefile =================================================================== --- head/cad/geda-gschem/Makefile +++ head/cad/geda-gschem/Makefile @@ -32,16 +32,10 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -E \ Index: head/cad/gnucap/Makefile =================================================================== --- head/cad/gnucap/Makefile +++ head/cad/gnucap/Makefile @@ -24,13 +24,8 @@ PLIST_FILES= bin/gnucap bin/gnucap-modelgen \ man/man1/gnucap-ibis.1.gz man/man1/gnucap.1.gz -.include - -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline -.else -CONFIGURE_ARGS+=--with-readline=no -.endif +READLINE_USES= readline +READLINE_CONFIGURE_OFF= --with-readline=no post-patch: @${REINPLACE_CMD} -e \ @@ -43,20 +38,18 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/acs-tutorial ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/history ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/relnotes.* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/whatisit ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/runall ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.ckt ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.doc ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: head/cad/gtkwave/Makefile =================================================================== --- head/cad/gtkwave/Makefile +++ head/cad/gtkwave/Makefile @@ -19,22 +19,15 @@ OPTIONS_DEFINE= TCL GCONF TCL_DESC= Enable support for TCL/TK TCL_USES= tk +TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR} \ + --with-tk=${TK_LIBDIR} +TCL_CONFIGURE_OFF= --disable-tcl -PORTDOCS= gtkwave.odt +GCONF_CONFIGURE_WITH= gconf +GCONF_USE= GNOME=gconf2 -.include +PORTDOCS= gtkwave.odt -.if ${PORT_OPTIONS:MTCL} -CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} \ - --with-tk=${TK_LIBDIR} -.else -CONFIGURE_ARGS+= --disable-tcl -.endif - -.if ${PORT_OPTIONS:MGCONF} -CONFIGURE_ARGS+= --with-gconf -USE_GNOME+= gconf2 -.endif post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: head/cad/jspice3/Makefile =================================================================== --- head/cad/jspice3/Makefile +++ head/cad/jspice3/Makefile @@ -17,21 +17,16 @@ OPTIONS_DEFAULT= X11 WRKSRC= ${WRKDIR}/${PORTNAME}-2.5 -.include - -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xaw xt -.endif +X11_USE= XORG=x11,xaw,xt pre-configure: @${REINPLACE_CMD} -e 's+/usr/local+${PREFIX}+g;s+-O -g+${CFLAGS}+g;' \ ${WRKSRC}/conf/unixconf/mkheader.0 -.if ${PORT_OPTIONS:MX11} +pre-confiure-X11-on: @${REINPLACE_CMD} -e 's+#%%WITH_X%%++g' \ ${WRKSRC}/conf/unixconf/mkheader.0 -.else +pre-configure-X11-off: @${ECHO} "#undef HAVE_X11" >> ${WRKSRC}/src/include/spice.h -.endif do-build: (cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} build) @@ -50,7 +45,7 @@ ${STAGEDIR}${PREFIX}/lib/jspice3/sced ${INSTALL_DATA} ${WRKSRC}/lib/scripts/* \ ${STAGEDIR}${PREFIX}/lib/jspice3/scripts -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/jspice3/cryocmos \ ${STAGEDIR}${PREFIX}/share/examples/jspice3/josephson ${INSTALL_DATA} ${WRKSRC}/examples/*.* \ @@ -59,6 +54,5 @@ ${STAGEDIR}${PREFIX}/share/examples/jspice3/cryocmos ${INSTALL_DATA} ${WRKSRC}/examples/josephson/* \ ${STAGEDIR}${PREFIX}/share/examples/jspice3/josephson -.endif .include Index: head/cad/kicad/Makefile =================================================================== --- head/cad/kicad/Makefile +++ head/cad/kicad/Makefile @@ -83,17 +83,15 @@ ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/library && ${COPYTREE_SHARE} library ${STAGEDIR}${DATADIR}) (cd ${WRKSRC}/library && ${COPYTREE_SHARE} modules ${STAGEDIR}${DATADIR}) -.if ${PORT_OPTIONS:MNLS} +post-install-NLS-on: ${MKDIR} ${STAGEDIR}${DATADIR}/internat (cd ${WRKSRC}/doc/internat && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/internat) ${RM} -f ${STAGEDIR}${DATADIR}/internat/CMakeLists.txt ${FIND} ${STAGEDIR}${DATADIR}/internat -name kicad.po -delete -.endif -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.endif .include Index: head/cad/libgeda/Makefile =================================================================== --- head/cad/libgeda/Makefile +++ head/cad/libgeda/Makefile @@ -27,16 +27,10 @@ LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -E \ Index: head/cad/netgen/Makefile =================================================================== --- head/cad/netgen/Makefile +++ head/cad/netgen/Makefile @@ -31,18 +31,13 @@ OPTIONS_DEFAULT= OCC BROKEN_sparc64= internal gcc error (Bug 23159) -.include -.if ${PORT_OPTIONS:MOCC} -LIB_DEPENDS+= libTKernel.so:${PORTSDIR}/cad/opencascade -CXXFLAGS+= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE -CONFIGURE_ARGS+= --enable-occ -.endif - -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 -CONFIGURE_ARGS+= --enable-ffmpeg -.endif +OCC_LIB_DEPENDS= libTKernel.so:${PORTSDIR}/cad/opencascade +OCC_CXXFLAGS= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE +OCC_CONFIGURE_ENABLE= occ + +FFMPEG_LIB_DEPENDS= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 +FFMPEG_CONFIGURE_ENABLE=ffmpeg MACHINE= ${OPSYS:tu} Index: head/cad/opencascade/Makefile =================================================================== --- head/cad/opencascade/Makefile +++ head/cad/opencascade/Makefile @@ -67,22 +67,18 @@ libgl2ps.so:${PORTSDIR}/print/gl2ps \ libfreeimageplus.so:${PORTSDIR}/graphics/freeimage -.include - -.if ${PORT_OPTIONS:MVIS} -CMAKE_ARGS+= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} \ +VIS_CMAKE_ON= -D3RDPARTY_FREETYPE_DIR=${LOCALBASE} \ -D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE} \ -D3RDPARTY_GL2PS_DIR=${LOCALBASE} -.endif -.if ${PORT_OPTIONS:MDOCS} -USE_TEX+= latex:build -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ - doxygen:${PORTSDIR}/devel/doxygen \ - dot:${PORTSDIR}/graphics/graphviz \ - inkscape:${PORTSDIR}/graphics/inkscape -RUN_DEPENDS+= ${LOCALBASE}/www/MathJax/MathJax.js:${PORTSDIR}/www/mathjax -.endif +DOCS_USE= TEX=latex:build +DOCS_BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ + doxygen:${PORTSDIR}/devel/doxygen \ + dot:${PORTSDIR}/graphics/graphviz \ + inkscape:${PORTSDIR}/graphics/inkscape +DOCS_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:${PORTSDIR}/www/mathjax + +.include .if ${ARCH} == "i386" BITS= 32 @@ -106,10 +102,8 @@ ${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es} .endfor -post-build: -.if ${PORT_OPTIONS:MDOCS} +post-build-DOCS-on: (cd ${WRKSRC} && ./gendoc -overview) -.endif post-install: ${MV} ${STAGEDIR}${OCCROOT}/bsd${BITS}/${COMPILER_TYPE}/bin/DRAWEXE \ @@ -129,11 +123,10 @@ ${RM} -rf ${STAGEDIR}${OCCROOT}/inc ${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc (cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT}) -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) ${RMDIR} ${STAGEDIR}${DOCSDIR}/latex -.endif .if defined(MAINTAINER_MODE) regression-test: install Index: head/cad/pcb/Makefile =================================================================== --- head/cad/pcb/Makefile +++ head/cad/pcb/Makefile @@ -64,10 +64,6 @@ ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Uses x86 specific libc functions and has not been ported -.include - -.if ${PORT_OPTIONS:MDOCS} -INFO= pcb -.endif +DOCS_INFO= pcb .include Index: head/cad/pdnmesh/Makefile =================================================================== --- head/cad/pdnmesh/Makefile +++ head/cad/pdnmesh/Makefile @@ -25,23 +25,17 @@ DESKTOP_ENTRIES="pdnMesh" "${COMMENT}" "" "${PORTNAME}" "" true -.include - -.if ${PORT_OPTIONS:MATLAS} -USES+= blaslapack:atlas -CONFIGURE_ARGS+=--with-blas=cblas --with-lapack=alapack -.else -USES+= blaslapack -CONFIGURE_ARGS+=--with-blas=blas --with-lapack=lapack -.endif +ATLAS_USES= blaslapack:atlas +ATLAS_CONFIGURE_ON=--with-blas=cblas --with-lapack=alapack +ATLAS_USES_OFF= blaslapack +ATLAS_CONFIGURE_OFF=--with-blas=blas --with-lapack=lapack post-patch: @${REINPLACE_CMD}-e \ '/^SUBDIRS/s|doc|| ; \ s|^pkgdata_DATA|#pkgdata_DATA|' ${WRKSRC}/Makefile.in -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} \ && ${INSTALL_DATA} ChangeLog ${STAGEDIR}${DOCSDIR} \ @@ -50,11 +44,9 @@ (cd ${WRKSRC}/doc/tutorial \ && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}/tutorial \ && ${INSTALL_DATA} tutorial.* ${STAGEDIR}${DOCSDIR}/tutorial) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: (cd ${WRKSRC}/doc/examples && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) ${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile* -.endif .include Index: head/cad/qfsm/Makefile =================================================================== --- head/cad/qfsm/Makefile +++ head/cad/qfsm/Makefile @@ -24,23 +24,19 @@ GRAPHVIZ_RUN_DEPENDS= graphviz>=2.22:${PORTSDIR}/graphics/graphviz GRAPHVIZ_CMAKE_OFF= -DQFSM_AVOID_GRAPHVIZ:BOOL=ON -.include - pre-configure: ${REINPLACE_CMD} -e \ '/\/usr\//d' ${WRKSRC}/FindGraphViz.cmake ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ -e '/examples/s|share/qfsm|share/examples/${PORTNAME}|' \ ${WRKSRC}/CMakeLists.txt -.if ${PORT_OPTIONS:MDOCS} +pre-configure-DOCS-on: ${REINPLACE_CMD} -e 's|%%PD%%||' ${WRKSRC}/CMakeLists.txt -.else +pre-configure-DOCS-off: ${REINPLACE_CMD} -e 's|%%PD%%|#|' ${WRKSRC}/CMakeLists.txt -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +pre-configure-EXAMPLES-on: ${REINPLACE_CMD} -e 's|%%PE%%||' ${WRKSRC}/CMakeLists.txt -.else +pre-configure-EXAMPLES-off: ${REINPLACE_CMD} -e 's|%%PE%%|#|' ${WRKSRC}/CMakeLists.txt -.endif .include Index: head/cad/scotch/Makefile =================================================================== --- head/cad/scotch/Makefile +++ head/cad/scotch/Makefile @@ -61,7 +61,7 @@ PLIST_SUB+= MPI="@comment " .endif -.include +.include .if ${ARCH} == "i386" MF= i686 @@ -90,16 +90,14 @@ ${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt ${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf ${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt -.endif .if defined(MAINTAINER_MODE) regression-test: install @@ -115,4 +113,4 @@ . endif .endif -.include +.include Index: head/cad/spice/Makefile =================================================================== --- head/cad/spice/Makefile +++ head/cad/spice/Makefile @@ -83,22 +83,19 @@ post-extract: @${DO_NADA} -.if ${PORT_OPTIONS:MDEV_BSIM3} +post-extract-DEV_BSIM3-on: @${MKDIR} ${WRKSRC}/src/lib/dev/bsim3 ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/BSIM3v330.tar.Z \ -C ${WRKSRC}/src/lib/dev/bsim3 -.endif -.if ${PORT_OPTIONS:MDEV_BSIM4} +post-extract-DEV_BSIM4-on: @${MKDIR} ${WRKSRC}/src/lib/dev/bsim4 ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/BSIM480_Code.zip \ -d ${WRKSRC}/src/lib/dev/bsim4 -.endif -.if ${PORT_OPTIONS:MDEV_HISIM2} +post-extract-DEV_HISIM2-on: ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/HiSIM_2.8.0_Release_20140605.zip \ -d ${WRKDIR} ${MV} ${WRKDIR}/HiSIM_2.8.0_Release_20140605/HiSIM_2.8.0_C-Code/hisim2 \ ${WRKSRC}/src/lib/dev -.endif ${CONFIGFILE}:: @${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure @@ -112,16 +109,13 @@ do-configure: ${CONFIGFILE} @${DO_NADA} -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${CAT} ${DISTDIR}/${DIST_SUBDIR}/*.ps | ${GZIP_CMD} > \ ${STAGEDIR}${DOCSDIR}/${PORTDOCS} -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && \ ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: head/cad/tochnog/Makefile =================================================================== --- head/cad/tochnog/Makefile +++ head/cad/tochnog/Makefile @@ -71,13 +71,12 @@ s,%%SUPERLU%%,${SUPERLU},g ; \ s,%%BLAS_LIBS%%,-L${LOCALBASE}/lib ${BLAS_LIBS},g' \ ${WRKSRC}/makefile -.if ${PORT_OPTIONS:MTHREADS} +pre-configure-THREADS-on: ${REINPLACE_CMD} -e 's,SUPERLU_MT_USE 0,SUPERLU_MT_USE 1,' \ ${WRKSRC}/tnsuplu.h -.else # Serial +pre-configure-THREADS-off: ${REINPLACE_CMD} -e 's,SUPERLU_USE 0,SUPERLU_USE 1,' \ ${WRKSRC}/tnsuplu.h -.endif post-build: (cd ${WRKDIR}/Sources/tools && ${CXX} ${CXXFLAGS} -o aba2tn aba2tn.cc) @@ -93,10 +92,9 @@ ${STAGEDIR}${GID_PTYPES}/tochnog.gid ${INSTALL_SCRIPT} ${WRKDIR}/Sources/gid/tochnog.gid/tochnog.ba* \ ${STAGEDIR}${GID_PTYPES}/tochnog.gid -.if ${PORT_OPTIONS:MEXAMPLES} +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${RM} -f ${WRKDIR}/Sources/test/*.orig ${INSTALL_DATA} ${WRKDIR}/Sources/test/* ${STAGEDIR}${EXAMPLESDIR} -.endif .include Index: head/chinese/auto-cn-l10n/Makefile =================================================================== --- head/chinese/auto-cn-l10n/Makefile +++ head/chinese/auto-cn-l10n/Makefile @@ -25,32 +25,13 @@ MINICHINPUT_DESC= A tiny version of Chinput RELAXCONF_DESC= A set of utilities for FreeBSD LiveCD -.include - -.if ${PORT_OPTIONS:MWQY} -RUN_DEPENDS+= ${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy -.endif - -.if ${PORT_OPTIONS:MFIREFLYTTF} -RUN_DEPENDS+= ${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf -.endif - -.if ${PORT_OPTIONS:MFCITX} -RUN_DEPENDS+= fcitx:${PORTSDIR}/chinese/fcitx -.endif - -.if ${PORT_OPTIONS:MSCIM} -RUN_DEPENDS+= ${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables -RUN_DEPENDS+= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin -.endif - -.if ${PORT_OPTIONS:MMINICHINPUT} -RUN_DEPENDS+= chinput:${PORTSDIR}/chinese/miniChinput -.endif - -.if ${PORT_OPTIONS:MRELAXCONF} -RUN_DEPENDS+= relaxconf:${PORTSDIR}/sysutils/relaxconf -.endif +WQY_RUN_DEPENDS= ${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy +FIREFLYTTF_RUN_DEPENDS= ${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf +FCITX_RUN_DEPENDS= fcitx:${PORTSDIR}/chinese/fcitx +SCIM_RUN_DEPENDS= ${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables \ + ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin +MINICHINPUT_RUN_DEPENDS= chinput:${PORTSDIR}/chinese/miniChinput +RELAXCONF_RUN_DEPENDS= relaxconf:${PORTSDIR}/sysutils/relaxconf post-patch: @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \ @@ -60,4 +41,4 @@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN ${CP} ${WRKSRC}/* ${STAGEDIR}${PREFIX}/share/skel/zh_CN.eucCN -.include +.include Index: head/chinese/cnprint/Makefile =================================================================== --- head/chinese/cnprint/Makefile +++ head/chinese/cnprint/Makefile @@ -24,8 +24,6 @@ A4SIZE_DESC= Set A4 (not Letter) as a default paper size -.include - do-extract: ${MKDIR} ${WRKSRC} .for i in ${DISTFILES} @@ -42,10 +40,9 @@ @${REINPLACE_CMD} -e 's/\(DEFAULT_JIS_FONT\):.*$$/\1: kanji48.hbf/; \ s/\(DEFAULT_BIG5FONT\):.*$$/\1: ntu_kai48.hbf/; \ s/\(DEFAULT_ENCODING\):.*$$/\1: BIG5/' ${WRKSRC}/cnprint33.cmd -.if ${PORT_OPTIONS:MA4SIZE} +post-patch-A4SIZE-on: @${REINPLACE_CMD} -e 's/\(DEFAULT_PAPERSIZE\):.*$$/\1: 8.27 11.69/' \ ${WRKSRC}/cnprint33.cmd -.endif do-build: cd ${WRKSRC} ; \ @@ -57,4 +54,4 @@ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}33.cmd ${STAGEDIR}${DATADIR}/${PORTNAME}.cmd ${INSTALL_DATA} ${FILES} ${STAGEDIR}${DATADIR} -.include +.include Index: head/chinese/fcitx-configtool/Makefile =================================================================== --- head/chinese/fcitx-configtool/Makefile +++ head/chinese/fcitx-configtool/Makefile @@ -26,17 +26,10 @@ OPTIONS_DEFAULT=GTK2 OPTIONS_SUB= yes -.include +GTK2_CMAKE_ON= -DENABLE_GTK2=ON +GTK2_USE= GNOME=gtk20 -.if ${PORT_OPTIONS:MGTK2} -CMAKE_ARGS+= -DENABLE_GTK2=ON -USE_GNOME+= gtk20 -.endif - -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -.else -CMAKE_ARGS+= -DENABLE_GTK3=OFF -.endif +GTK3_USE= GNOME=gtk30 +GTK3_CMAKE_OFF= -DENABLE_GTK3=OFF .include Index: head/chinese/gcin/Makefile =================================================================== --- head/chinese/gcin/Makefile +++ head/chinese/gcin/Makefile @@ -20,29 +20,19 @@ USE_XORG= x11 xtst xext INSTALLS_ICONS= YES USE_LDCONFIG= YES + OPTIONS_DEFINE= ANTHY QT_IM_MODULE DOCS +OPTIONS_SUB= yes ANTHY_DESC= Japanese anthy IM module QT_IM_MODULE_DESC= QT IM module -.include - -.if ${PORT_OPTIONS:MQT_IM_MODULE} -USE_QT4= inputmethods qmake_build moc_build corelib gui -LIB_DEPENDS+= libmng.so:${PORTSDIR}/graphics/libmng -PLIST_SUB+= QT_IM_MODULE="" -.else -CONFIGURE_ARGS+= --use_qt4=N -PLIST_SUB+= QT_IM_MODULE="@comment " -.endif - -.if ${PORT_OPTIONS:MANTHY} -BUILD_DEPENDS+= ${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy -LIB_DEPENDS+= libanthy.so:${PORTSDIR}/japanese/anthy -PLIST_SUB+= ANTHY_MODULE="" -.else -CONFIGURE_ARGS+= --use_anthy=N -PLIST_SUB+= ANTHY_MODULE="@comment " -.endif +QT_IM_MODULE_USE= QT4=inputmethods,qmake_build,moc_build,corelib,gui +QT_IM_MODULE_LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng +QT_IM_MODULE_CONFIGURE_OFF= --use_qt4=N + +ANTHY_BUILD_DEPENDS= ${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy +ANTHY_LIB_DEPENDS= libanthy.so:${PORTSDIR}/japanese/anthy +ANTHY_CONFIGURE_OFF= --use_anthy=N post-patch: @${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \ @@ -78,9 +68,8 @@ ${WRKSRC}/scripts/utf8-edit @${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile @${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile -.if empty(PORT_OPTIONS:MDOCS) +post-patch-DOCS-off: @${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile -.endif post-build: .if !defined(DEBUG_FLAGS) Index: head/chinese/gcin/pkg-plist =================================================================== --- head/chinese/gcin/pkg-plist +++ head/chinese/gcin/pkg-plist @@ -21,7 +21,7 @@ bin/tslearn bin/txt2gtab-phrase %%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so -%%ANTHY_MODULE%%lib/gcin/anthy-module.so +%%ANTHY%%lib/gcin/anthy-module.so lib/gcin/gcin1.so lib/gcin/gcin2.so lib/gcin/intcode-module.so Index: head/chinese/ibus-libpinyin/Makefile =================================================================== --- head/chinese/ibus-libpinyin/Makefile +++ head/chinese/ibus-libpinyin/Makefile @@ -26,46 +26,23 @@ OPTIONS_DEFINE= ENGLISH STROKE OPENCC NLS OPTIONS_DEFAULT= ENGLISH STROKE NLS +OPTIONS_SUB= yes ENGLISH_DESC= Enable English input mode STROKE_DESC= Enable stroke input mode OPENCC_DESC= Use opencc for simplified and traditional Chinese conversion -.include +ENGLISH_CONFIGURE_ENABLE= english-input-mode +STROKE_CONFIGURE_ENABLE= stroke-input-mode -.if ${PORT_OPTIONS:MENGLISH} -CONFIGURE_ARGS+= --enable-english-input-mode -PLIST_SUB+= ENGLISH="" -.else -CONFIGURE_ARGS+= --disable-english-input-mode -PLIST_SUB+= ENGLISH="@comment " -.endif - -.if ${PORT_OPTIONS:MSTROKE} -CONFIGURE_ARGS+= --enable-stroke-input-mode -PLIST_SUB+= STROKE="" -.else -CONFIGURE_ARGS+= --disable-stroke-input-mode -PLIST_SUB+= STROKE="@comment " -.endif - -.if ${PORT_OPTIONS:MOPENCC} -BROKEN= Requires newer OpenCC -CONFIGURE_ARGS+= --enable-opencc -LIB_DEPENDS+= libopencc.so:${PORTSDIR}/chinese/opencc -.else -CONFIGURE_ARGS+= --disable-opencc -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -USE_GNOME+= intltool -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +OPENCC_BROKEN= Requires newer OpenCC +OPENCC_CONFIGURE_ENABLE= opencc +OPENCC_LIB_DEPENDS= libopencc.so:${PORTSDIR}/chinese/opencc + +NLS_USES= gettext +NLS_USE= GNOME=intltool +NLS_CONFIGURE_ENABLE= nls post-configure: @${REINPLACE_CMD} -e 's|DATADIRNAME = lib|DATADIRNAME = share|' ${WRKSRC}/po/Makefile -.include +.include Index: head/chinese/ibus-pinyin/Makefile =================================================================== --- head/chinese/ibus-pinyin/Makefile +++ head/chinese/ibus-pinyin/Makefile @@ -26,17 +26,11 @@ OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -USE_GNOME+= intltool -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_USE= GNOME=intltool +NLS_CONFIGURE_ENABLE= nls post-patch: @${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|' ${WRKSRC}/configure Index: head/chinese/libtabe/Makefile =================================================================== --- head/chinese/libtabe/Makefile +++ head/chinese/libtabe/Makefile @@ -47,15 +47,14 @@ @${ECHO_CMD} "" .endif -post-patch: -.if !${PORT_OPTIONS:MX11} +post-patch-X11-off: ${REINPLACE_CMD} -e '/all:/s/ bims//; /bims/d' \ ${WRKSRC}/src/Makefile.in -.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtabe.so -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tsi-src/README \ ${STAGEDIR}${DOCSDIR}/README.tsi @@ -67,6 +66,5 @@ et26.txt libtabe.sgml ${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/chinese/muni/Makefile =================================================================== --- head/chinese/muni/Makefile +++ head/chinese/muni/Makefile @@ -11,16 +11,13 @@ OPTIONS_DEFINE= DOCS -.include - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/muni ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/muni ${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${PREFIX}/share/doc/muni ${INSTALL_DATA} ${WRKSRC}/yung.gif ${STAGEDIR}${PREFIX}/share/doc/muni ${INSTALL_DATA} ${WRKSRC}/kang.gif ${STAGEDIR}${PREFIX}/share/doc/muni -.endif .include Index: head/chinese/oxim/Makefile =================================================================== --- head/chinese/oxim/Makefile +++ head/chinese/oxim/Makefile @@ -16,6 +16,7 @@ OPTIONS_DEFINE= GTK2 CHEWING UNICODE OPTIONS_DEFAULT= GTK2 CHEWING UNICODE +OPTIONS_SUB= yes GTK2_DESC= GTK2 input method module CHEWING_DESC= Chewing input module UNICODE_DESC= Unicode input module @@ -36,43 +37,21 @@ # oxim requires qinputcontextplugin.h which only exists in Debian package CONFIGURE_ARGS+=--disable-qt-immodule -.include +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ENABLE= gtk-immodule -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --enable-gtk-immodule -PLIST_SUB+= GTK2="" -.else -CONFIGURE_ARGS+= --disable-gtk-immodule -PLIST_SUB+= GTK2="@comment " -.endif - -.if ${PORT_OPTIONS:MCHEWING} # make sure we have the required libchewing -BUILD_DEPENDS+= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing -RUN_DEPENDS+= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing +CHEWING_BUILD_DEPENDS= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing +CHEWING_RUN_DEPENDS= ${CHEWING_BUILD_DEPENDS} +CHEWING_CONFIGURE_ENABLE= chewing-module +CHEWING_CONFIGURE_ENV= CHEWING_CFLAGS=-I${LOCALBASE}/include -CONFIGURE_ARGS+= --enable-chewing-module -CONFIGURE_ENV+= CHEWING_CFLAGS=-I${LOCALBASE}/include -PLIST_SUB+= CHEWING="" -.else -CONFIGURE_ARGS+= --disable-chewing-module -PLIST_SUB+= CHEWING="@comment " -.endif - -.if ${PORT_OPTIONS:MUNICODE} -CONFIGURE_ARGS+= --enable-unicode-module -PLIST_SUB+= UNICODE="" -.else -CONFIGURE_ARGS+= --disable-unicode-module -PLIST_SUB+= UNICODE="@comment " -.endif +UNICODE_CONFIGURE_ENABLE= unicode-module # TODO WITHOUT_NLS knob #.if ${PORT_OPTIONS:MNLS} USES+= gettext LDFLAGS+= -lintl -PLIST_SUB+= NLS="" #.else #CONFIGURE_ARGS+=--disable-nls #PLIST_SUB+= NLS="@comment " Index: head/chinese/pcmanx/Makefile =================================================================== --- head/chinese/pcmanx/Makefile +++ head/chinese/pcmanx/Makefile @@ -19,6 +19,7 @@ OPTIONS_DEFINE= NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY OPTIONS_DEFAULT= DOCKLET NOTIFIER NANCY MOUSE EXTERNAL +OPTIONS_SUB= yes DOCKLET_DESC= Docklet / system tray support NOTIFIER_DESC= Popup notifier support @@ -29,55 +30,22 @@ IPLOOKUP_DESC= IP location lookup support PROXY_DESC= Proxy support -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -USES+= gettext -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if empty(PORT_OPTIONS:MDOCKLET) -CONFIGURE_ARGS+=--disable-docklet -.endif - -.if empty(PORT_OPTIONS:MNOTIFIER) -CONFIGURE_ARGS+=--disable-notifier -.endif - -.if ${PORT_OPTIONS:MLIBNOTIFY} -CONFIGURE_ARGS+=--enable-libnotify -LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify -.endif - -.if empty(PORT_OPTIONS:MNANCY) -CONFIGURE_ARGS+=--disable-nancy -.endif - -.if empty(PORT_OPTIONS:MMOUSE) -CONFIGURE_ARGS+=--disable-mouse -.endif - -.if empty(PORT_OPTIONS:MEXTERNAL) -CONFIGURE_ARGS+=--disable-external -.endif - -.if ${PORT_OPTIONS:MIPLOOKUP} -CONFIGURE_ARGS+=--enable-iplookup -.endif - -.if ${PORT_OPTIONS:MPROXY} -CONFIGURE_ARGS+=--enable-proxy -.endif +NLS_USES= gettext +NLS_USES_OFF= gettext-tools +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LDFLAGS= -L${LOCALBASE}/lib +NLS_CONFIGURE_ENABLE=nls + +DEBUG_CONFIGURE_ENABLE= debug +DOCKLET_CONFIGURE_ENABLE= docklet +NOTIFIER_CONFIGURE_ENABLE= notifier +LIBNOTIFY_CONFIGURE_ENABLE= libnotify +LIBNOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify +NANCY_CONFIGURE_ENABLE= nancy +MOUSE_CONFIGURE_ENABLE= mouse +EXTERNAL_CONFIGURE_ENABLE= external +IPLOOKUP_CONFIGURE_ENABLE= iplookup +PROXY_CONFIGURE_ENABLE= proxy post-install: @# create directory for user friendly Index: head/chinese/pyzy/Makefile =================================================================== --- head/chinese/pyzy/Makefile +++ head/chinese/pyzy/Makefile @@ -26,45 +26,24 @@ OPTIONS_DEFINE= ANDROID_DB OPENPHRASE_DB OPENCC OPTIONS_DEFAULT= ANDROID_DB +OPTIONS_SUB= yes ANDROID_DB_DESC= Build Android DB OPENPHRASE_DB_DESC= Build Open Phrase DB OPENCC_DESC= Use opencc for simplified and traditional Chinese conversion -.include - -.include - -.if ${PORT_OPTIONS:MANDROID_DB} -CONFIGURE_ARGS+= --enable-db-android -PLIST_SUB+= ANDROID_DB="" -.else -CONFIGURE_ARGS+= --disable-db-android -PLIST_SUB+= ANDROID_DB="@comment " -.endif +ANDROID_DB_CONFIGURE_ENABLE= db-android OPENPHRASE_DBVER= 1.0.0 OPENPHRASE_DBFILE= pyzy-database-${OPENPHRASE_DBVER}.tar.bz2 -.if ${PORT_OPTIONS:MOPENPHRASE_DB} -CONFIGURE_ARGS+= --enable-db-open-phrase -DISTFILES+= ${OPENPHRASE_DBFILE} -PLIST_SUB+= OPENPHRASE_DB="" -.else -CONFIGURE_ARGS+= --disable-db-open-phrase -PLIST_SUB+= OPENPHRASE_DB="@comment " -.endif - -.if ${PORT_OPTIONS:MOPENCC} -CONFIGURE_ARGS+= --enable-opencc -LIB_DEPENDS+= libopencc.so:${PORTSDIR}/chinese/opencc -.else -CONFIGURE_ARGS+= --disable-opencc -.endif +OPENPHRASE_DB_CONFIGURE_ENABLE= db-open-phrase +OPENPHRASE_DB_DISTFILES= ${OPENPHRASE_DBFILE} + +OPENCC_CONFIGURE_ENABLE= opencc +OPENCC_LIB_DEPENDS= libopencc.so:${PORTSDIR}/chinese/opencc -post-extract: -.if ${PORT_OPTIONS:MOPENPHRASE_DB} +post-extract-OPENPHRASE_DB-on: @${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase -.endif post-patch: @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/Makefile.in @@ -72,4 +51,4 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}-1.0.so -.include +.include Index: head/chinese/qterm/Makefile =================================================================== --- head/chinese/qterm/Makefile +++ head/chinese/qterm/Makefile @@ -27,45 +27,28 @@ QTSCRIPT_DESC= Scripting support via QtScript Bindings KDE_DESC= Password management via KWallet -.include +OPENSSL_USE= OPENSSL=yes +OPENSSL_CMAKE_ON= -DQTERM_ENABLE_SSH:BOOL=TRUE +OPENSSL_CMAKE_OFF= -DQTERM_ENABLE_SSH:BOOL=FALSE + +DBUS_USE= QT4=dbus +DBUS_CMAKE_ON= -DQTERM_ENABLE_DBUS:BOOL=TRUE +DBUS_CMAKE_OFF= -DQTERM_ENABLE_DBUS:BOOL=FALSE + +PHONON_USE= QT4=phonon +PHONON_CMAKE_ON= -DQTERM_ENABLE_PHONON:BOOL=TRUE +PHONON_CMAKE_OFF= -DQTERM_ENABLE_PHONON:BOOL=FALSE + +QTSCRIPT_USE= QT4=script +QTSCRIPT_RUN_DEPENDS= ${QT_PLUGINDIR}/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator +QTSCRIPT_CMAKE_ON= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE +QTSCRIPT_CMAKE_OFF= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CMAKE_ARGS+= -DQTERM_ENABLE_SSH:BOOL=TRUE -.else -CMAKE_ARGS+= -DQTERM_ENABLE_SSH:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MDBUS} -USE_QT4+= dbus -CMAKE_ARGS+= -DQTERM_ENABLE_DBUS:BOOL=TRUE -.else -CMAKE_ARGS+= -DQTERM_ENABLE_DBUS:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MPHONON} -USE_QT4+= phonon -CMAKE_ARGS+= -DQTERM_ENABLE_PHONON:BOOL=TRUE -.else -CMAKE_ARGS+= -DQTERM_ENABLE_PHONON:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MQTSCRIPT} -USE_QT4+= script -RUN_DEPENDS+= ${QT_PLUGINDIR}/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator -CMAKE_ARGS+= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE -.else -CMAKE_ARGS+= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE -.endif - -.if ${PORT_OPTIONS:MKDE} -USE_KDE4= kdelibs automoc4 -.endif +KDE_USE= KDE4=kdelibs,automoc4 -post-patch: -.if !${PORT_OPTIONS:MKDE} +post-patch-KDE-off: ${REINPLACE_CMD} -e "/^find_package(KDE4)/d" ${WRKSRC}/CMakeLists.txt -.endif +post-patch: ${REINPLACE_CMD} -e "/^set(QT_MIN_VERSION/d" ${WRKSRC}/CMakeLists.txt .include Index: head/comms/anyremote/Makefile =================================================================== --- head/comms/anyremote/Makefile +++ head/comms/anyremote/Makefile @@ -23,27 +23,18 @@ OPTIONS_DEFINE= DOCS DBUS X11 OPTIONS_DEFAULT= DBUS X11 -.include +DBUS_CONFIGURE_ENABLE=dbus +DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -.if ! ${PORT_OPTIONS:MDBUS} -CONFIGURE_ARGS+=--disable-dbus -.else -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -.endif - -.if ! ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+=--disable-xtest -.else -USE_XORG= x11 xtst -.endif +X11_CONFIGURE_ENABLE=xtest +X11_USE= XORG=x11,xtst MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib" post-patch: @${REINPLACE_CMD} -e 's|(datadir)/man/man1|(mandir)/man1|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|xtext|xtest|g' ${WRKSRC}/configure -.if ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-on: @${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in -.endif .include Index: head/comms/conserver-com/Makefile =================================================================== --- head/comms/conserver-com/Makefile +++ head/comms/conserver-com/Makefile @@ -22,25 +22,16 @@ UDS_DESC= Use Unix domain sockets for client/server STRIPREALM_DESC=Strip @REALM when using GSSAPI GSSAPIONLY_DESC=Never prompt for a password when using GSSAPI - -.include +STRIPREALM_IMPLIES= GSSAPI +GSSAPIONLY_IMPLIES= GSSAPI DEFAULTPORT?= 782 DEFAULTHOST?= localhost -.if ${PORT_OPTIONS:MUDS} -CONFIGURE_ARGS+= --with-uds -.endif - -.if ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+= --with-gssapi -.if ${PORT_OPTIONS:MSTRIPREALM} -CONFIGURE_ARGS+= --with-striprealm -.endif -.if ${PORT_OPTIONS:MGSSAPIONLY} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-conserver__master.c -.endif -.endif +UDS_CONFIGURE_WITH= uds +GSSAPI_CONFIGURE_WITH= gssapi +STRIPREALM_CONFIGURE_WITH= striprealm +GSSAPIONLY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-conserver__master.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/conserver-convert Index: head/comms/dabstick-radio/Makefile =================================================================== --- head/comms/dabstick-radio/Makefile +++ head/comms/dabstick-radio/Makefile @@ -63,10 +63,9 @@ ${WRKSRC}/dabreceiver-V2/dabreceiver \ ${WRKSRC}/spectrum-viewer/spectrum-viewer \ ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 ${STAGEDIR}${DOCSDIR}/fmreceiver-dab ${INSTALL_DATA} ${WRKSRC}/dabreceiver-V2/README ${STAGEDIR}${DOCSDIR}/dabreceiver-V2 ${INSTALL_DATA} ${WRKSRC}/fmreceiver-dab/README ${STAGEDIR}${DOCSDIR}/fmreceiver-dab -.endif .include Index: head/comms/esmska/Makefile =================================================================== --- head/comms/esmska/Makefile +++ head/comms/esmska/Makefile @@ -21,8 +21,6 @@ OPTIONS_DEFINE= DOCS -.include - do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/esmska.jar ${STAGEDIR}${DATADIR}/ @@ -32,12 +30,10 @@ (cd ${WRKSRC}/ && ${COPYTREE_SHARE} license ${STAGEDIR}${DATADIR}/) ${INSTALL_SCRIPT} ${WRKDIR}/esmska ${STAGEDIR}${PREFIX}/bin/ -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor -.endif .include Index: head/comms/fl_moxgen/Makefile =================================================================== --- head/comms/fl_moxgen/Makefile +++ head/comms/fl_moxgen/Makefile @@ -22,14 +22,9 @@ OPTIONS_DEFAULT= PDF PDF_DESC= Enable PDF Writing (requires libharu) -.include - -.if ${PORT_OPTIONS:MPDF} - LIB_DEPENDS+= libhpdf.so:${PORTSDIR}/print/libharu - ALL_TARGET= fl_moxgen -.else - ALL_TARGET= fl_moxgen_no_pdf -.endif +PDF_LIB_DEPENDS= libhpdf.so:${PORTSDIR}/print/libharu +PDF_ALL_TARGET= fl_moxgen +PDF_ALL_TARGET_OFF= fl_moxgen_no_pdf post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ Index: head/comms/fldigi/Makefile =================================================================== --- head/comms/fldigi/Makefile +++ head/comms/fldigi/Makefile @@ -54,14 +54,8 @@ NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -.include +BROKEN_sparc64= Fails to install -.if ${ARCH} == "sparc64" -BROKEN= Fails to install -.endif -.if ${PORT_OPTIONS:MFLARQ} -MAN1+= flarq.1 -.endif PLIST_SUB+= XMLRPC="" # Always need asciidoc for man pages CONFIGURE_ARGS+=--with-asciidoc @@ -83,4 +77,4 @@ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/comms/gammu/Makefile =================================================================== --- head/comms/gammu/Makefile +++ head/comms/gammu/Makefile @@ -41,14 +41,9 @@ ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) -.include - -.if ${PORT_OPTIONS:MBASH} -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash -PLIST_FILES+= etc/bash_completion.d/gammu -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-contrib_CMakeLists.txt -.endif +BASH_BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash +BASH_RUN_DEPENDS= ${BASH_BUILD_DEPENDS} +BASH_PLIST_FILES= etc/bash_completion.d/gammu +BASH_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-contrib_CMakeLists.txt .include Index: head/comms/ge-x2212/Makefile =================================================================== --- head/comms/ge-x2212/Makefile +++ head/comms/ge-x2212/Makefile @@ -20,12 +20,8 @@ OPTIONS_DEFINE= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${FILESDIR}/schematic.txt ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/comms/gmfsk/Makefile =================================================================== --- head/comms/gmfsk/Makefile +++ head/comms/gmfsk/Makefile @@ -33,18 +33,12 @@ HAMLIB_DESC= Enable HAMLIB Support OPTIONS_DEFAULT= HAMLIB -.include - -.if ${PORT_OPTIONS:MHAMLIB} -LIB_DEPENDS+= libhamlib.so:${PORTSDIR}/comms/hamlib -CONFIGURE_ARGS+= --enable-hamlib -CONFIGURE_ENV+= PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig -.else -CONFIGURE_ARGS+= --disable-hamlib -.endif +HAMLIB_LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib +HAMLIB_CONFIGURE_ENABLE= hamlib +HAMLIB_CONFIGURE_ENV= PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig post-patch: @${REINPLACE_CMD} -e 's|[$$][(]localstatedir[)]/lib/scrollkeeper|${SCROLLKEEPER_DIR}|g' \ ${WRKSRC}/omf.make ${WRKSRC}/help/gmfsk/C/Makefile.in -.include +.include Index: head/comms/gnuradio/Makefile =================================================================== --- head/comms/gnuradio/Makefile +++ head/comms/gnuradio/Makefile @@ -66,39 +66,26 @@ VP= ${GCC_DEFAULT:S/.//} GCC_LIBS= ${LOCALBASE}/lib/gcc${VP} -.include - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ - ${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \ - dot:${PORTSDIR}/graphics/graphviz \ - xmlto:${PORTSDIR}/textproc/xmlto \ - freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf -CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="ON" -CMAKE_ARGS+= -DENABLE_DOCS:STRING="ON" -CMAKE_ARGS+= -DENABLE_BAD_BOOST="ON" +DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ + ${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \ + dot:${PORTSDIR}/graphics/graphviz \ + xmlto:${PORTSDIR}/textproc/xmlto \ + freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf +DOCS_CMAKE_ON= -DENABLE_DOXYGEN:STRING="ON" \ + -DENABLE_DOCS:STRING="ON" \ + -DENABLE_BAD_BOOST="ON" +DOCS_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \ + -DENABLE_DOCS:STRING="OFF" \ + -DENABLE_BAD_BOOST="ON" HAVE_PORTDOCS= YES -.else -CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="OFF" -CMAKE_ARGS+= -DENABLE_DOCS:STRING="OFF" -CMAKE_ARGS+= -DENABLE_BAD_BOOST="ON" -.endif - -.if ${PORT_OPTIONS:MUSRP} -CMAKE_ARGS+= -DENABLE_GR_UHD:STRING="ON" -BUILD_DEPENDS+= ${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp -PLIST_SUB+= UHD="" -.else -CMAKE_ARGS+= -DENABLE_GR_UHD:STRING="OFF" -PLIST_SUB+= UHD="@comment " -.endif - -.if ${PORT_OPTIONS:MTESTING} -CMAKE_ARGS+= -DENABLE_TESTING:STRING="ON" -BUILD_DEPENDS+= cppunit-config:${PORTSDIR}/devel/cppunit -.else -CMAKE_ARGS+= -DENABLE_TESTING:STRING="OFF" -.endif + +USRP_CMAKE_ON= -DENABLE_GR_UHD:STRING="ON" +USRP_CMAKE_OFF= -DENABLE_GR_UHD:STRING="OFF" +USRP_BUILD_DEPENDS= ${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp + +TESTING_CMAKE_ON= -DENABLE_TESTING:STRING="ON" +TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF" +TESTING_BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit post-patch: @${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \ @@ -110,4 +97,4 @@ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/FindPortaudio.cmake -.include +.include Index: head/comms/jerm/Makefile =================================================================== --- head/comms/jerm/Makefile +++ head/comms/jerm/Makefile @@ -17,11 +17,7 @@ PORTDOCS= README -.include - -.if ! ${PORT_OPTIONS:MJUPITER} -MAKE_ARGS+= JUPITER_FLAGS= -.endif +JUPITER_MAKE_ARGS_OFF= JUPITER_FLAGS= post-patch: @${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS?=|' \ @@ -34,12 +30,12 @@ ${INSTALL_PROGRAM} ${WRKSRC}/tiocdtr ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/jerm.1 ${STAGEDIR}${PREFIX}/man/man1/ -.if ${PORT_OPTIONS:MJUPITER} +do-install-JUPITER-on: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/jerm ${INSTALL_SCRIPT} ${WRKSRC}/init.sh ${STAGEDIR}${PREFIX}/libexec/jerm/ ${INSTALL_SCRIPT} ${WRKSRC}/rock.pl ${STAGEDIR}${PREFIX}/libexec/jerm/ -.endif +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Index: head/comms/jsdr/Makefile =================================================================== --- head/comms/jsdr/Makefile +++ head/comms/jsdr/Makefile @@ -28,8 +28,6 @@ OPTIONS_DEFINE= DOCS -.include - do-configure: cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \ ${QMAKE} ${QMAKE_ARGS} @@ -58,9 +56,9 @@ ${STAGEDIR}${PREFIX}/bin/spectrum-viewer-${PORTVERSION} ${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \ ${STAGEDIR}${PREFIX}/bin/fmreceiver-${PORTVERSION} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} -.endif -.include +.include Index: head/comms/lirc/Makefile =================================================================== --- head/comms/lirc/Makefile +++ head/comms/lirc/Makefile @@ -35,8 +35,6 @@ PORTEXAMPLES= remotes SUB_FILES= pkg-message lircd.conf -.include - .if exists(${LOCALBASE}/lib/libvga.so.1) LIB_DEPENDS+= libvga.so:${PORTSDIR}/graphics/svgalib PLIST_SUB+= SMODE2= @@ -44,21 +42,14 @@ PLIST_SUB+= SMODE2="@comment " .endif -.if empty(PORT_OPTIONS:MMINIMAL) -LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi \ +MINIMAL_LIB_DEPENDS_OFF= libftdi.so:${PORTSDIR}/devel/libftdi \ libirman.so:${PORTSDIR}/comms/libirman -CONFIGURE_ARGS+= --with-driver=userspace -.else -CONFIGURE_ARGS+= --with-driver=dvico -.endif +MINIMAL_CONFIGURE_OFF= --with-driver=userspace +MINIMAL_CONFIGURE_ON= --with-driver=dvico -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-debug -.endif +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MUARTLIRC} -RUN_DEPENDS+= uartlirc>=0.3:${PORTSDIR}/comms/uartlirc -.endif +UARTLIRC_RUN_DEPENDS= uartlirc>=0.3:${PORTSDIR}/comms/uartlirc post-patch: @${REINPLACE_CMD} \ @@ -66,16 +57,14 @@ -e 's/`$${LIBUSB_CONFIG} --cflags`//' \ ${WRKSRC}/configure.ac -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/) @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}/) @(cd ${WRKSRC}/doc && ${INSTALL_DATA} irxevent.keys lirc.css lirc.hwdb ${STAGEDIR}${DOCSDIR}/) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} +post-install-EXAMPLES-on: @(cd ${WRKSRC} && ${COPYTREE_SHARE} remotes ${STAGEDIR}${EXAMPLESDIR}/) -.endif +post-install: @${INSTALL_DATA} ${WRKDIR}/lircd.conf ${STAGEDIR}${PREFIX}/etc/lircd.conf.sample @${MKDIR} ${STAGEDIR}/var/run/lirc -.include +.include Index: head/comms/lrzsz/Makefile =================================================================== --- head/comms/lrzsz/Makefile +++ head/comms/lrzsz/Makefile @@ -17,13 +17,8 @@ OPTIONS_DEFINE= NLS -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_FILES+= share/locale/de/LC_MESSAGES/lrzsz.mo -.else -CONFIGURE_ARGS+= --disable-nls -.endif +NLS_USES= gettext +NLS_PLIST_FILES= share/locale/de/LC_MESSAGES/lrzsz.mo +NLS_CONFIGURE_ENABLE= nls .include Index: head/comms/mgetty+sendfax/Makefile =================================================================== --- head/comms/mgetty+sendfax/Makefile +++ head/comms/mgetty+sendfax/Makefile @@ -28,15 +28,9 @@ FIDO_DESC= Enable FIDO EMSI support -.include - CFLAGS+= -DAUTO_PPP -.if ${PORT_OPTIONS:MFIDO} -CFLAGS+= -DFIDO -.endif - -.include +FIDO_CFLAGS= -DFIDO pre-install: @(cd ${WRKSRC}/doc; ${MAKE} manpages) @@ -56,4 +50,4 @@ ${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${STAGEDIR}${PREFIX}/bin ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/faxq-helper -.include +.include Index: head/comms/ncid/Makefile =================================================================== --- head/comms/ncid/Makefile +++ head/comms/ncid/Makefile @@ -31,8 +31,6 @@ NCID-API.odt NCID-SDK.md NCID_Documentation.md README.docdir ReleaseNotes.md \ TODO.md Verbose.md mk-epub ncid-1.jpg -.include - post-extract: cd ${WRKSRC}/FreeBSD;for i in *.rc; do \ x=`echo $$i | cut -f 1 -d .`; ${CP} $$i $$x; done @@ -74,15 +72,14 @@ ncid-page ncid-samba ncid-speak ncid-yac ncid-initmodem ${INSTALL_DATA} ${WRKSRC}/FreeBSD/${i} ${STAGEDIR}${PREFIX}/etc/rc.d .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for j in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR} -.endfor -.endif ${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/man/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/man/*.7 ${STAGEDIR}${MAN7PREFIX}/man/man7 ${INSTALL_MAN} ${WRKSRC}/man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for j in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${j} ${STAGEDIR}${DOCSDIR} +.endfor .include Index: head/comms/owfs/Makefile =================================================================== --- head/comms/owfs/Makefile +++ head/comms/owfs/Makefile @@ -117,15 +117,12 @@ @echo "Preparing build using autotools..." # Workarounds for different problems -post-install: -.if ${PORT_OPTIONS:MOWPYTHON} +post-install-OWPYTHON-on: (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/ow/_OW.so -.endif -.if ${PORT_OPTIONS:MOWPERL} +post-install-OWPERL-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OW/OW.so -.endif .include Index: head/comms/pr/Makefile =================================================================== --- head/comms/pr/Makefile +++ head/comms/pr/Makefile @@ -23,8 +23,6 @@ OPTIONS_DEFINE= DOCS -.include - do-install: (cd ${WRKSRC}/sbin && \ ${INSTALL_SCRIPT} ${PROGRAMS} ${STAGEDIR}${PREFIX}/sbin) @@ -32,9 +30,8 @@ ${INSTALL_DATA} ${RCDFILES} ${STAGEDIR}${PREFIX}/etc/rc.d) (cd ${WRKSRC}/etc && \ ${INSTALL_DATA} ${ETCFLS} ${STAGEDIR}${PREFIX}/etc) -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/share/doc/pr/PR.html ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/comms/py-bulksms/Makefile =================================================================== --- head/comms/py-bulksms/Makefile +++ head/comms/py-bulksms/Makefile @@ -19,12 +19,8 @@ OPTIONS_DEFINE= DOCS -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_MAN} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/comms/qpage/Makefile =================================================================== --- head/comms/qpage/Makefile +++ head/comms/qpage/Makefile @@ -18,11 +18,7 @@ OPTIONS_DEFINE= IDENT_PATCH IDENT_PATCH_DESC= Disable libwrap ident lookups -.include - -.if ${PORT_OPTIONS:MIDENT_PATCH} -EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c -.endif +IDENT_PATCH_EXTRA_PATCHES=${FILESDIR}/libwrap_ident_patch-srvrsnpp.c .if !defined(WITH_QPAGE_SYSLOG_FACILITY) || !defined(WITH_QPAGE_USER) .if !defined(WITH_QPAGE_SYSLOG_FACILITY) && !defined(WITH_QPAGE_USER) Index: head/comms/rtl-sdr/Makefile =================================================================== --- head/comms/rtl-sdr/Makefile +++ head/comms/rtl-sdr/Makefile @@ -24,13 +24,8 @@ OPTIONS_DEFINE= DOCS -.include - -.if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.am -.endif +DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen +DOCS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile.am post-patch: @${REINPLACE_CMD} 's|^pkgdocdir=.*|pkgdocdir=${DOCSDIR}|' \ Index: head/comms/scmxx/Makefile =================================================================== --- head/comms/scmxx/Makefile +++ head/comms/scmxx/Makefile @@ -34,9 +34,8 @@ post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR} -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/comms/smstools3/Makefile =================================================================== --- head/comms/smstools3/Makefile +++ head/comms/smstools3/Makefile @@ -42,14 +42,10 @@ PORTDOCS= * PORTEXAMPLES= .procmailrc .qmailrc * -.include +STATS_LIB_DEPENDS= libmm.so:${PORTSDIR}/devel/mm +STATS_CFLAGS= -I${LOCALBASE}/include +STATS_CFLAGS_OFF= -DNOSTATS -.if ${PORT_OPTIONS:MSTATS} -LIB_DEPENDS+= libmm.so:${PORTSDIR}/devel/mm -CFLAGS+= -I${LOCALBASE}/include -.else -CFLAGS+= -DNOSTATS -.endif SMSTOOLS_DEFAULT_COMPORT?= /dev/cuau0 post-patch: Index: head/comms/svxlink/Makefile =================================================================== --- head/comms/svxlink/Makefile +++ head/comms/svxlink/Makefile @@ -55,8 +55,6 @@ OPTIONS_SUB= yes PORTDOCS= * -.include - post-patch: @${GREP} -lr /dev/ttyS0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \ ${REINPLACE_CMD} -e 's|/dev/ttyS0|/dev/ttyu0|' @@ -70,12 +68,11 @@ @${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|' \ ${WRKSRC}/src/doc/man/svxlink.conf.5 \ ${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in -.if ${PORT_OPTIONS:MOSS} +post-patch-OSS-on: @${GREP} -lr alsa:default ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \ ${REINPLACE_CMD} -e 's|alsa:default|oss:/dev/dsp|' @${GREP} -lr alsa:plughw:0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \ ${REINPLACE_CMD} -e 's|alsa:plughw:0|oss:/dev/dsp|' -.endif .if ${PORTNAME}==svxlink post-stage: Index: head/comms/trustedqsl/Makefile =================================================================== --- head/comms/trustedqsl/Makefile +++ head/comms/trustedqsl/Makefile @@ -41,21 +41,14 @@ OPTIONS_SUB= yes -.include - -post-stage: -.if ${PORT_OPTIONS:MGEN_CRQ} +post-stage-GEN_CRQ-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/gen_crq ${STAGEDIR}${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MLOAD_CERT} +post-stage-LOAD_CERT-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/load_cert ${STAGEDIR}${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MSTATION_LOC} +post-stage-STATION_LOC-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/station_loc ${STAGEDIR}${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MCONVERTER} +post-stage-CONVERTER-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin -.endif post-patch: @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \ Index: head/comms/vrflash/Makefile =================================================================== --- head/comms/vrflash/Makefile +++ head/comms/vrflash/Makefile @@ -16,15 +16,12 @@ OPTIONS_DEFINE= DOCS -.include - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vrflash ${STAGEDIR}${PREFIX}/bin/ -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/ .endfor -.endif .include Index: head/comms/xastir/Makefile =================================================================== --- head/comms/xastir/Makefile +++ head/comms/xastir/Makefile @@ -40,74 +40,38 @@ OPTIONS_DEFAULT= SHAPELIB DBFAWK MAGICK CURL RTREE BDB -.include +SHAPELIB_LIB_DEPENDS= libshp.so:${PORTSDIR}/devel/shapelib +SHAPELIB_CONFIGURE_WITH= shapelib -.if ${PORT_OPTIONS:MSHAPELIB} -LIB_DEPENDS+= libshp.so:${PORTSDIR}/devel/shapelib -.else -CONFIGURE_ARGS+= --without-shapelib -.endif - -.if ${PORT_OPTIONS:MMAGICK} -LIB_DEPENDS+= libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick -.else -CONFIGURE_ARGS+= --without-imagemagick --without-graphicsmagick -.endif - -.if ${PORT_OPTIONS:MDBFAWK} -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -.else -CONFIGURE_ARGS+= --without-dbfawk -.endif - -.if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -.endif - -.if ${PORT_OPTIONS:MGEOTIFF} -LIB_DEPENDS+= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff -.endif - -.if ${PORT_OPTIONS:MGDAL} -LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal -.else -CONFIGURE_ARGS+= --without-gdal -.endif - -.if ${PORT_OPTIONS:MGPSMAN} -BUILD_DEPENDS+= ${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp -SHAPELIB= true -.else -CONFIGURE_ARGS+= --without-gpsman -.endif - -.if ${PORT_OPTIONS:MFESTIVAL} -BUILD_DEPENDS+= festival:${PORTSDIR}/audio/festival -.else -CONFIGURE_ARGS+= --without-festival -.endif - -.if ${PORT_OPTIONS:MRTREE} -CONFIGURE_ARGS+= --with-rtree -.endif - -.if ${PORT_OPTIONS:MERRORPOP} -CONFIGURE_ARGS+= --with-errorpopups -.endif - -.if ${PORT_OPTIONS:MBDB} -USE_BDB= 41+ -WITH_BDB_HIGHEST= ${TRUE} -INVALID_BDB_VER= 2 3 40 -CONFIGURE_ARGS+= --with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR} -.endif - -.if ${PORT_OPTIONS:MOPTCFLAGS} -CFLAGS+= -O2 -pipe -.endif - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif +MAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick +MAGICK_CONFIGURE_WITH= imagemagick graphicsmagick + +DBFAWK_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +DBFAWK_CONFIGURE_WITH= dbfawk + +CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl + +GEOTIFF_LIB_DEPENDS= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff + +GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal +GDAL_CONFIGURE_WITH= gdal + +GPSMAN_BUILD_DEPENDS= ${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp +GPSMAN_IMPLIES= SHAPELIB +GPSMAN_CONFIGURE_WITH= gpsman + +FESTIVAL_BUILD_DEPENDS= festival:${PORTSDIR}/audio/festival +FESTIVAL_CONFIGURE_WITH=festival + +RTREE_CONFIGURE_WITH= rtree + +ERRORPOP_CONFIGURE_WITH= errorpopups + +BDB_USE= BDB=41+ +BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR} + +OPTCFLAGS_CFLAGS= -O2 -pipe + +BROKEN_sparc64= Does not compile on sparc64 .include Index: head/converters/iconv/Makefile =================================================================== --- head/converters/iconv/Makefile +++ head/converters/iconv/Makefile @@ -22,13 +22,8 @@ CCSUTIL_DESC= Install Coded character set (CCS) util -.include - -.if ${PORT_OPTIONS:MCCSUTIL} -USE_PERL5+= run -.else -EXTRA_PATCHES= ${FILESDIR}/extra-patch-ccs_Makefile -.endif +CCSUTIL_USE= PERL5=run +CCSUTIL_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-ccs_Makefile .if defined(NO_PROFILE) PLIST_SUB+= PROFILE="@comment " Index: head/converters/libiconv/Makefile =================================================================== --- head/converters/libiconv/Makefile +++ head/converters/libiconv/Makefile @@ -26,18 +26,11 @@ ENCODINGS_DESC= Include extra character sets PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS -.include +ENCODINGS_CONFIGURE_ENABLE= extra-encodings -.if ${PORT_OPTIONS:MENCODINGS} -CONFIGURE_ARGS+= --enable-extra-encodings -.endif - -.if ${PORT_OPTIONS:MPATCHES} -PATCH_SITES+= http://apolloron.org/software/libiconv-1.14-ja/ -PATCH_SITES+= LOCAL/kwm -PATCHFILES+= ${DISTNAME}-ja-1.patch.gz -PATCH_DIST_STRIP+= -p1 -.endif +PATCHES_PATCH_SITES= http://apolloron.org/software/libiconv-1.14-ja/ \ + LOCAL/kwm +PATCHES_PATCHFILES= ${DISTNAME}-ja-1.patch.gz:-p1 post-patch: @${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h Index: head/converters/p5-LaTeXML/Makefile =================================================================== --- head/converters/p5-LaTeXML/Makefile +++ head/converters/p5-LaTeXML/Makefile @@ -38,16 +38,13 @@ OPTIONS_DEFINE= DOCS -.include - post-install: ${FIND} ${STAGEDIR}/${PREFIX} -name .packlist | \ ${XARGS} ${REINPLACE_CMD} -e 's|^${STAGEDIR}||' ${RM} ${STAGEDIR}${PREFIX}/share/texmf-local/tex/latex/latexml/.packlist.bak -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include Index: head/converters/py-zfec/Makefile =================================================================== --- head/converters/py-zfec/Makefile +++ head/converters/py-zfec/Makefile @@ -25,18 +25,14 @@ OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e 's|share/doc|${DOCSDIR}|g ; \ s#(doc_loc, data_fnames)##g' ${WRKSRC}/setup.py -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for DOC in COPYING.GPL COPYING.TGPPL.html README.rst TODO changelog ${INSTALL_DATA} ${WRKSRC}/${DOC} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Index: head/converters/tnef/Makefile =================================================================== --- head/converters/tnef/Makefile +++ head/converters/tnef/Makefile @@ -19,13 +19,9 @@ PLIST_FILES= bin/tnef \ man/man1/tnef.1.gz -.include - -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif # This target is intended to be run by the port maintainer. x-test: build @@ -33,4 +29,4 @@ @cd ${WRKSRC}/tests/${dir} && ${MAKE} check-TESTS .endfor -.include +.include