diff options
38 files changed, 283 insertions, 243 deletions
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile index 3db24683282f..ee52b4840a22 100644 --- a/audio/kid3-kde4/Makefile +++ b/audio/kid3-kde4/Makefile @@ -27,36 +27,39 @@ CMAKE_ARGS= -DWITH_CHROMAPRINT=off USE_GETTEXT= yes MAKE_JOBS_SAFE= yes -OPTIONS= FLAC "Support for FLAC files" on \ - ID3LIB "Support for mp3 files" on \ - MP4V2 "Support for mp4 files" on \ - VORBIS "Support for Ogg/Vorbis files" on \ - TAGLIB "Support for various audio formats" on +OPTIONS_DEFINE= FLAC ID3LIB MP4V2 VORBIS TAGLIB +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} + +FLAC_DESC= Support for FLAC files +ID3LIB_DESC= Support for mp3 files +MP4V2_DESC= Support for mp4 files +VORBIS_DESC= Support for Ogg/Vorbis files +TAGLIB_DESC= Support for various audio formats .include <bsd.port.options.mk> -.if defined(WITHOUT_FLAC) +.if ${PORT_OPTIONS:MFLAC} CMAKE_ARGS+= -DWITH_FLAC=OFF .else CMAKE_ARGS+= -DWITH_FLAC=ON LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac .endif -.if defined(WITHOUT_ID3LIB) +.if ${PORT_OPTIONS:MID3LIB} CMAKE_ARGS+= -DWITH_ID3LIB=OFF .else CMAKE_ARGS+= -DWITH_ID3LIB=ON LIB_DEPENDS+= id3-3.8.3:${PORTSDIR}/audio/id3lib .endif -.if defined(WITHOUT_MP4V2) +.if ${PORT_OPTIONS:MMP4V2} CMAKE_ARGS+= -DWITH_MP4V2=OFF .else CMAKE_ARGS+= -DWITH_MP4V2=ON LIB_DEPENDS+= mp4v2.10:${PORTSDIR}/multimedia/mp4v2 .endif -.if defined(WITHOUT_VORBIS) +.if ${PORT_OPTIONS:MVORBIS} CMAKE_ARGS+= -DWITH_VORBIS=OFF .else CMAKE_ARGS+= -DWITH_VORBIS=ON @@ -64,7 +67,7 @@ LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis \ ogg:${PORTSDIR}/audio/libogg .endif -.if defined(WITHOUT_TAGLIB) +.if ${PORT_OPTIONS:MTAGLIB} CMAKE_ARGS+= -DWITH_TAGLIB=OFF .else CMAKE_ARGS+= -DWITH_TAGLIB=ON diff --git a/audio/mp3unicode/Makefile b/audio/mp3unicode/Makefile index e35c54b0dd5e..59adf313070b 100644 --- a/audio/mp3unicode/Makefile +++ b/audio/mp3unicode/Makefile @@ -27,11 +27,11 @@ MAN1= mp3unicode.1 PLIST_FILES= bin/mp3unicode PORTDOCS= COPYING README -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> pre-configure: -.if defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/^install-data-am/s|install-dist_docDATA||' ${WRKSRC}/Makefile.in .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile index 2d882f26278b..ab2048f9fea3 100644 --- a/cad/librecad/Makefile +++ b/cad/librecad/Makefile @@ -19,7 +19,9 @@ USE_QT4= help qt3support help-tools_build moc_build qmake_build \ rcc_build uic_build uic3_build MAKE_JOBS_SAFE= yes -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build PLIST_SUB+= NLS="" .else @@ -37,7 +39,7 @@ do-configure: @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}) post-build: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} @(cd ${WRKSRC} && ${LOCALBASE}/bin/lrelease-qt4 -compress librecad.pro) ${MKDIR} ${WRKSRC}/unix/resources/qm ${INSTALL_DATA} ${WRKSRC}/ts/*.qm ${WRKSRC}/unix/resources/qm diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile index e1e72fefc397..6c7f00159d47 100644 --- a/devel/qdevelop/Makefile +++ b/devel/qdevelop/Makefile @@ -15,14 +15,13 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION} MAINTAINER= makc@FreeBSD.org COMMENT= A development environment entirely dedicated to Qt4 -RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags \ - qt4-sqlite-plugin>=0:${PORTSDIR}/databases/qt4-sqlite3-plugin +RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags -USE_QT4= gui sql network xml designer \ +USE_QT4= gui sql network xml designer sql-sqlite3_run \ qmake_build moc_build uic_build rcc_build MAKE_JOBS_SAFE= yes -QMAKE_ARGS= -unix -recursive ${QMAKE_PRO} +QMAKE_ARGS= -recursive ${QMAKE_PRO} QMAKE_PRO= QDevelop.pro STRIP_FILES= bin/${PORTNAME} @@ -35,17 +34,20 @@ DESKTOP_ENTRIES= "QDevelop" \ "Qt;KDE;Development;" \ "false" -OPTIONS= TOOLS "Install Qt4 dev. tools (qmake, moc, etc.)" on +OPTIONS_DEFINE= TOOLS +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +TOOLS_DESC= Install Qt4 dev. tools (qmake, moc, etc.) -.include <bsd.port.pre.mk> -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif -.if !defined(WITHOUT_TOOLS) +.if ${PORT_OPTIONS:MTOOLS} USE_QT4+= assistant_run linguist_run \ qmake_run moc_run uic_run rcc_run .endif @@ -68,7 +70,7 @@ post-patch: ${WRKSRC}/plugins/formatting-astyle/astyleplugin.cpp do-configure: -.if !defined(WITHOUT_NLS) +.if !${PORT_OPTIONS:MNLS} cd ${WRKSRC} && ${QT_LRELEASE} ${QMAKE_PRO} .endif cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} @@ -76,15 +78,15 @@ do-configure: post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} ${INSTALL_DATA} ${WRKSRC}/resources/images/logo.png ${PREFIX}/share/pixmaps/qdevelop.png -.if !defined(WITHOUT_NLS) +.if !${PORT_OPTIONS:MNLS} ${MKDIR} ${DATADIR} cd ${WRKSRC}/resources/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations .endif -.if !defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for doc in ChangeLog.txt README.txt ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile index 123fe5ca110c..214177b21d73 100644 --- a/editors/kile-kde4/Makefile +++ b/editors/kile-kde4/Makefile @@ -15,23 +15,23 @@ MAINTAINER= makc@FreeBSD.org COMMENT= A LaTeX source editor for KDE RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX-base \ - identify:${PORTSDIR}/graphics/ImageMagick \ - ${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate + identify:${PORTSDIR}/graphics/ImageMagick USE_BZIP2= yes USE_CMAKE= yes USE_QT4= qmake_build moc_build rcc_build uic_build -USE_KDE4= kdeprefix kdelibs automoc4 sharedmime +USE_KDE4= kdeprefix kdelibs automoc4 sharedmime kate_run MAKE_JOBS_SAFE= yes LATEST_LINK= ${PORTNAME}-kde4 -OPTIONS= OKULAR "Use Okular for viewing" off +OPTIONS_DEFINE= OKULAR +OKULAR_DESC= Use Okular for viewing .include <bsd.port.options.mk> -.if defined(WITH_OKULAR) -RUN_DEPENDS+= ${KDE4_PREFIX}/bin/okular:${PORTSDIR}/graphics/okular +.if ${PORT_OPTIONS:MOKULAR) +USE_KDE4+= okular_run .endif .include <bsd.port.mk> diff --git a/emulators/qtemu/Makefile b/emulators/qtemu/Makefile index 511eedb918bf..790a65f525f5 100644 --- a/emulators/qtemu/Makefile +++ b/emulators/qtemu/Makefile @@ -22,9 +22,9 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \ "qtemu" "" false -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} #USE_QT4+= linguist BUILD_DEPENDS+= ${LOCALBASE}/bin/lupdate-qt4:${PORTSDIR}/devel/qt4-linguist PLIST_SUB+= NLS="" @@ -45,12 +45,12 @@ post-configure: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qtemu ${PREFIX}/bin/qtemu -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} ${MKDIR} ${DATADIR} (cd ${WRKSRC}/translations/ && ${COPYTREE_SHARE} 'qtemu*.qm' ${DATADIR}/translations) .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} (cd ${WRKSRC}/help/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile index 9b375c01a7ae..823d3ddaae3e 100644 --- a/games/darkplaces/Makefile +++ b/games/darkplaces/Makefile @@ -25,9 +25,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME} MAKEFILE= makefile ALL_TARGET= # -OPTIONS= CLIENT "Build GLX client" on \ - DEDICATED "Build dedicated server" on \ - SDL "Build SDL client" on +OPTIONS_MULTI= MODULE +OPTIONS_MULTI_MODULE= CLIENT DEDICATED SDL +OPTIONS_DEFAULT= ${OPTIONS_MULTI_MODULE} + +CLIENT_DESC= Build GLX client +DEDICATED_DESC= Build dedicated server +SDL_DESC= Build SDL client PLIST_FILES= %%DATADIR%%/dummy PLIST_DIRS= %%DATADIR%% @@ -37,18 +41,14 @@ PORTDOCS= darkplaces.txt .include <bsd.port.options.mk> -.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED) && !defined(WITH_SDL) -IGNORE= needs at least one of CLIENT, DEDICATED and SDL options -.endif - -.if defined(WITH_CLIENT) || defined(WITH_SDL) -USE_GL= yes +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSDL} +USE_GL= glu # Loads libraries at run-time, thus RUN_DEPENDS. RUN_DEPENDS+= ${LOCALBASE}/lib/libjpeg.so:${PORTSDIR}/graphics/jpeg \ ${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis .endif -.if defined(WITH_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} ALL_TARGET+= cl-release EXE_TARGETS+= ${PORTNAME}-glx PLIST_SUB+= CLIENT="" @@ -57,13 +57,13 @@ DESKTOP_ENTRIES+="Darkplaces GLX Client" "" "" "darkplaces-glx" \ "Game;ActionGame;" "false" .endif -.if defined(WITH_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= sv-release EXE_TARGETS+= ${PORTNAME}-dedicated PLIST_FILES+= bin/${PORTNAME}-dedicated .endif -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl ALL_TARGET+= sdl-release EXE_TARGETS+= ${PORTNAME}-sdl @@ -83,7 +83,7 @@ do-install: .endfor @${MKDIR} ${DATADIR} @${TOUCH} ${DATADIR}/dummy -.if !defined(NOPORTDOCS) +.if !{PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/darkplaces.txt ${DOCSDIR} .endif diff --git a/games/frozenbubble/Makefile b/games/frozenbubble/Makefile index 46fb293e391d..2ea85c928458 100644 --- a/games/frozenbubble/Makefile +++ b/games/frozenbubble/Makefile @@ -30,7 +30,9 @@ MAN6= frozen-bubble-editor.6 frozen-bubble.6 LEXECDIR= ${PREFIX}/libexec/${PORTNAME} -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} RUN_DEPENDS+= p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext PLIST_SUB+= NLS="" .else @@ -54,24 +56,18 @@ pre-install: do-install: cd ${WRKSRC}/c_stuff && ${GMAKE} install - -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} cd ${WRKSRC}/po && ${GMAKE} install .endif - ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble ${PREFIX}/bin/ ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/frozen-bubble-editor ${PREFIX}/bin/ - ${INSTALL_MAN} ${MAN6:S,^,${WRKSRC}/doc/,} ${PREFIX}/man/man6/ - ${MKDIR} ${DATADIR} @(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "gfx snd data" ${DATADIR}/) - ${MKDIR} ${LEXECDIR} ${INSTALL_PROGRAM} ${WRKSRC}/server/fb-server ${LEXECDIR}/ post-install: - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/games/toppler/Makefile b/games/toppler/Makefile index 1641ceace52a..05816ac1fcee 100644 --- a/games/toppler/Makefile +++ b/games/toppler/Makefile @@ -25,6 +25,8 @@ MAN6= ${PORTNAME}.6 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e \ 's|DATA install-dist_pkgdocDATA|DATA|g' ${WRKSRC}/Makefile.in @@ -34,7 +36,7 @@ post-install: @${CHOWN} root:games ${PREFIX}/bin/${PORTNAME} @${CHMOD} 0664 ${DATADIR}/${PORTNAME}.hsc @${CHOWN} root:games ${DATADIR}/${PORTNAME}.hsc -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in AUTHORS ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} diff --git a/games/trigger/Makefile b/games/trigger/Makefile index 887dac39d47f..82328b96c58e 100644 --- a/games/trigger/Makefile +++ b/games/trigger/Makefile @@ -35,6 +35,8 @@ DATAVERSION= 0.5.2 DESKTOP_ENTRIES="Trigger" "Car racing game" "" \ "trigger" "" false +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|SDL/||' \ ${WRKSRC}/src/trigger/main.cpp \ @@ -61,7 +63,7 @@ do-install: ${FIND} ${DATADIR}/* -type f -exec ${CHMOD} 444 {} \; ${FIND} ${DATADIR}/* -type d -exec ${CHMOD} 555 {} \; -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} .for f in README-stereo.txt README.txt ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} diff --git a/games/trophy/Makefile b/games/trophy/Makefile index f973d36d0ccf..049b17134fa2 100644 --- a/games/trophy/Makefile +++ b/games/trophy/Makefile @@ -26,12 +26,14 @@ MAN6= trophy.6 PORTDOCS= AUTHORS COPYING ChangeLog README TODO +.include <bsd.port.options.mk> + pre-configure: ${REINPLACE_CMD} -e "/^icondir =/s,icons,pixmaps," \ ${WRKSRC}/resources/Makefile.in post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} && \ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif diff --git a/games/warmux/Makefile b/games/warmux/Makefile index d5a6efac8153..9ec7fc3c196b 100644 --- a/games/warmux/Makefile +++ b/games/warmux/Makefile @@ -18,7 +18,7 @@ COMMENT= Wormux game LIB_DEPENDS= xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \ curl:${PORTSDIR}/ftp/curl -CONFLICTS= wormux-* +CONFLICTS_INSTALL= wormux-* USE_BZIP2= yes GNU_CONFIGURE= yes @@ -30,9 +30,9 @@ USE_DOS2UNIX= fixed_class.h MANCOMPRESSED= no MAN6= warmux.6 -OPTIONS+= NLS "Native Language Support via gettext utilities" on \ - FRIBIDI "Enable bi-directional unicode support" off \ - SERVER "Enable dedicated server" off +OPTIONS_DEFINE= FRIBIDI SERVER +FRIBIDI_DESC= Enable bi-directional unicode support +SERVER_DESC= Enable dedicated server WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:R} @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --enable-debug \ --enable-logging .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" CPPFLAGS+= -I${LOCALBASE}/include @@ -59,14 +59,14 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_SERVER) +.if ${PORT_OPTIONS:MSERVER} PLIST_SUB+= SERVER="" CONFIGURE_ARGS+= --enable-servers .else PLIST_SUB+= SERVER="@comment " .endif -.if defined(WITH_FRIBIDI) +.if ${PORT_OPTIONS:MFRIBIDI} LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi CONFIGURE_ARGS+= --enable-fribidi .else diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile index a555677bbd74..30f54a673c59 100644 --- a/graphics/fraqtive/Makefile +++ b/graphics/fraqtive/Makefile @@ -24,13 +24,14 @@ CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" \ CONFIGURE_ARGS= -prefix ${PREFIX} -qmake ${QMAKE} MAKE_JOBS_SAFE= yes -OPTIONS= SSE2 "Enable SSE2 optimization" off +OPTIONS_DEFINE= SSE2 +SSE2_DESC= Enable SSE2 optimization STRIP_FILES= bin/fraqtive -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITH_SSE2) +.if !${PORT_OPTIONS:MSSE2} CONFIGURE_ARGS+=-no-sse2 .endif @@ -44,4 +45,4 @@ post-configure: post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/povray-meta/Makefile b/graphics/povray-meta/Makefile index 9890f20d96d9..89fae748d4d4 100644 --- a/graphics/povray-meta/Makefile +++ b/graphics/povray-meta/Makefile @@ -25,38 +25,34 @@ DEFAULT_VER?= 36 #To change version linked by default define WITH_DEFAULT${ver}. #Please, note that only one of WITH_DEFAULT* can be set at once. -OPT_POVRAY${DEFAULT_VER}= on -OPT_DEFAULT${DEFAULT_VER}= on +OPTIONS_MULTI= POVRAY +OPTIONS_SINGLE= DEFAULT + +OPTIONS_DEFAULT= POVRAY${DEFAULT_VER} DEFAULT${DEFAULT_VER} .for ver in ${POV_VERSIONS_ALL} POVRAY${ver}_BIN= ${LOCALBASE}/bin/povray${ver} POVRAY${ver}_PORT= graphics/povray${ver} -OPT_POVRAY${ver}?= off -OPT_DEFAULT${ver}?= off -OPTIONS+= POVRAY${ver} "Install graphics/povray${ver}" ${OPT_POVRAY${ver}} -OPTIONS+= DEFAULT${ver} "Create link bin/povray -> bin/povray${ver}" ${OPT_DEFAULT${ver}} + +OPTIONS_MULTI_POVRAY+= POVRAY${ver} +OPTIONS_SINGLE_DEFAULT+= DEFAULT${ver} + +POVRAY${ver}_DESC= Install graphics/povray${ver} +DEFAULT${ver}_DESC= Create link bin/povray -> bin/povray${ver} .endfor .include <bsd.port.options.mk> .for ver in ${POV_VERSIONS_ALL} -. if defined(WITH_DEFAULT${ver}) -WITH_POVRAY${ver}= yes -. if defined(POV_VERSION) -IGNORE= can't be build: only one default povray can be chosen -. else +. if ${PORT_OPTIONS:MDEFAULT${ver}} +PORT_OPTIONS+= POVRAY${ver} POV_VERSION= ${ver} -. endif . endif -. if defined(WITH_POVRAY${ver}) +. if ${PORT_OPTIONS:MPOVRAY${ver}} RUN_DEPENDS+= ${POVRAY${ver}_BIN}:${PORTSDIR}/${POVRAY${ver}_PORT} . endif .endfor -.if !defined(POV_VERSION) -IGNORE= can't be build: one default povray must be chosen -.endif - do-install: ${LN} -s ${POVRAY${POV_VERSION}_BIN} ${PREFIX}/bin/povray diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile index 19f2907c331c..600bca4170ee 100644 --- a/graphics/xaos/Makefile +++ b/graphics/xaos/Makefile @@ -20,9 +20,9 @@ USE_XORG= x11 xext GNU_CONFIGURE= yes USE_GMAKE= yes -OPTIONS= PTHREAD "Enable SMP support (experimental)" off \ - GTK2 "GTK+ User Interface (experimental)" off \ - NLS "Native Language Support" on +OPTIONS_DEFINE= GTK2 PTHREAD +GTK2_DESC= GTK+ User Interface (experimental) +PTHREAD_DESC= Enable SMP support (experimental) CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 LDFLAGS+= -L${LOCALBASE}/lib @@ -39,7 +39,7 @@ DESKTOP_ENTRIES= "XaoS" "Fractal zoomer" "" "xaos" "" false .include <bsd.port.options.mk> -.if defined(WITH_PTHREAD) +.if ${PORT_OPTIONS:MPTHREAD} CONFIGURE_ARGS+= --with-pthread=yes CONFIGURE_ENV+= LIBS="${PTHREAD_LIBS}" CFLAGS+= ${PTHREAD_CFLAGS} @@ -47,12 +47,12 @@ CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS+= --with-pthread=no .endif -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONFIGURE_ARGS+= --with-gtk-driver=yes --with-x11-driver=no .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index be16a197b93a..d6212ad892fa 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -23,7 +23,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT?= IRC client for KDE4 .if !defined(PKGNAMESUFFIX) -CONFLICTS= kvirc-qt4-4.* +CONFLICTS_INSTALL= kvirc-qt4-4.* .endif USE_BZIP2= yes @@ -42,14 +42,17 @@ MAKE_JOBS_SAFE= yes MAN1= kvirc.1 MANLANG= "" de fr it -OPTIONS= AUDIOFILE "Support for various audio formats" off \ - DEBUG "Build with debug support" off \ - GSM "u-law to gsm audio converter support" off \ - PERL "Perl scripting support" off \ - PYTHON "Python scripting support" off +OPTIONS_DEFINE= AUDIOFILE GSM PERL PYTHON + +AUDIOFILE_DESC= Support for various audio formats +GSM_DESC= u-law to gsm audio converter support +PERL_DESC= Perl scripting support +PYTHON_DESC= Python scripting support + .if defined(PKGNAMESUFFIX) -OPTIONS+= PHONON "Build with Phonon support" off \ - WEBKIT "Build with QtWebkit support" off +OPTIONS_DEFINE+= PHONON WEBKIT +PHONON_DESC= Build with Phonon support +WEBKIT_DESC= Build with QtWebkit support .endif PLIST_SUB+= VER="${PORTVERSION:R}" @@ -59,12 +62,12 @@ PLIST_SUB+= VER="${PORTVERSION:R}" .if defined(PKGNAMESUFFIX) CMAKE_ARGS+= -DWITHOUT_KDE4=yes PLIST_SUB+= QT="" KDE="@comment " -. if defined(WITH_PHONON) +. if ${PORT_OPTIONS:MPHONON} USE_QT4+= phonon . else CMAKE_ARGS+= -DWITHOUT_PHONON=yes . endif -. if defined(WITH_WEBKIT) +. if ${PORT_OPTIONS:MWEBKIT} USE_QT4+= webkit . else CMAKE_ARGS+= -DWITHOUT_QTWEBKIT=yes @@ -79,20 +82,20 @@ CMAKE_ARGS+= -DWITH_DEBUG=yes -DVERBOSE=yes .endif #audio support -.if defined(WITH_AUDIOFILE) +.if ${PORT_OPTIONS:MAUDIOFILE} LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile .else CMAKE_ARGS+= -DWITHOUT_AUDIOFILE=yes .endif -.if defined(WITH_GSM) +.if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm .else CMAKE_ARGS+= -DWITHOUT_GSM=yes .endif #scripting support -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes PLIST_SUB+= PYTHON="" .else @@ -100,7 +103,7 @@ CMAKE_ARGS+= -DWITHOUT_PYTHON=yes PLIST_SUB+= PYTHON="@comment " .endif -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5_RUN= yes PLIST_SUB+= PERL="" .else @@ -108,7 +111,7 @@ CMAKE_ARGS+= -DWITHOUT_PERL=yes PLIST_SUB+= PERL="@comment " .endif -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} pre-everything:: @${ECHO_CMD} "=====================================================" @${ECHO_CMD} " To enable perl scripting you need to rebuild" diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index 9e2c19b8ea4c..060a0975034a 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -21,9 +21,13 @@ USE_CMAKE= yes USE_QT4= qmake_build moc_build rcc_build uic_build MAKE_JOBS_SAFE= yes -OPTIONS= MONO "Quassel standalone client" on \ - CORE "Quassel core" on \ - CLIENT "Quassel client" on +OPTIONS_MULTI= MODULE +OPTIONS_MULTI_MODULE= MONO CORE CLIENT +OPTIONS_DEFAULT= ${OPTIONS_MULTI_MODULE} + +MONO_DESC= Quassel standalone client +CORE_DESC= Quassel core +CLIENT_DESC= Quassel client CMAKE_ARGS+= -DWANT_MONO=${QUASSEL_MONO} \ -DWANT_CORE=${QUASSEL_CORE} \ @@ -32,21 +36,17 @@ CMAKE_ARGS+= -DWANT_MONO=${QUASSEL_MONO} \ .include <bsd.port.options.mk> -.if defined(WITHOUT_MONO) && defined(WITHOUT_CORE) && defined(WITHOUT_CLIENT) -IGNORE= needs at least one Quassel component. Please, rerun 'make config' -.endif - -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build .endif -.if defined(WITHOUT_MONO) && defined(WITHOUT_CLIENT) +.if !${PORT_OPTIONS:MMONO} && !${PORT_OPTIONS:MCLIENT} PLIST_SUB+= MONO_OR_CLIENT="@comment " .else PLIST_SUB+= MONO_OR_CLIENT="" .endif -.if !defined(WITHOUT_MONO) +.if ${PORT_OPTIONS:MMONO} USE_QT4+= dbus gui network script sql xml webkit QUASSEL_MONO= ON PLIST_SUB+= MONO="" @@ -55,7 +55,7 @@ QUASSEL_MONO= OFF PLIST_SUB+= MONO="@comment " .endif -.if !defined(WITHOUT_CORE) +.if ${PORT_OPTIONS:MCORE} USE_QT4+= network script sql sql-sqlite3_run QUASSEL_CORE= ON PLIST_SUB+= CORE="" @@ -69,7 +69,7 @@ QUASSEL_CORE= OFF PLIST_SUB+= CORE="@comment " .endif -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USE_QT4+= dbus gui network xml webkit QUASSEL_CLIENT= ON PLIST_SUB+= CLIENT="" @@ -79,13 +79,13 @@ PLIST_SUB+= CLIENT="@comment " .endif pre-configure: -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e '/add_subdirectory(i18n)/d' \ ${WRKSRC}/CMakeLists.txt .endif post-install: -.if !defined(WITHOUT_CORE) +.if ${PORT_OPTIONS:MCORE} @${CAT} ${PKGMESSAGE} .endif diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile index 38c2567415c1..63628143b351 100644 --- a/math/qtiplot/Makefile +++ b/math/qtiplot/Makefile @@ -1,6 +1,6 @@ # New ports collection makefile for: qtiplot -# Date created: 9 May 2005 -# Whom: Jie Gao <gaoj@cpsc.ucalgary.ca> +# Date created: 2005-05-09 +# Whom: Jie Gao <gaoj@cpsc.ucalgary.ca> # # $FreeBSD$ # @@ -37,14 +37,17 @@ DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \ "${DATADIR}/qtiplot.png" \ "qtiplot" "" false -OPTIONS= DOCS "Install the QtiPlot Handbook" on \ - PYTHON "Python scripting support" on +OPTIONS_DEFINE= DOCS PYTHON +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} + +DOCS_DESC= Install the QtiPlot Handbook +PYTHON_DESC= Python scripting support STRIP_FILES= bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0 .include <bsd.port.options.mk> -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui @@ -55,12 +58,12 @@ CONFIGURE_ENV+= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PLIST_SUB+= PYTHON="@comment " .endif -.if !defined(WITHOUT_DOCS) +.if ${PORT_OPTIONS:MDOCS} RUN_DEPENDS+= qtiplot-doc>=0:${PORTSDIR}/math/qtiplot-doc USE_QT4+= assistant-adp_run .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build PLIST_SUB+= NLS="" .else @@ -73,7 +76,7 @@ post-extract: @${CP} ${FILESDIR}/build.conf ${WRKSRC} post-patch: -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} @${REINPLACE_CMD} -e \ '/^sys.path.append/s|"\."|"${DATADIR}"|' \ ${WRKSRC}/${PORTNAME}/qtiplotrc.py @@ -95,14 +98,14 @@ post-patch: "/^CONFIG.*release/s|release|debug|" \ ${WRKSRC}/build.conf .endif -.if defined(WITHOUT_NLS) +.if !${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e \ "/INSTALLS.*translations/d" \ ${WRKSRC}/${PORTNAME}/qtiplot.pro .endif do-configure: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} @(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -compress qtiplot.pro) .endif @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} ) @@ -110,7 +113,7 @@ do-configure: post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} ${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} .for s in qtiplotrc.py qtiUtil.py @(cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')") ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${DATADIR}/${s}c diff --git a/math/scilab-toolbox-sivp/Makefile b/math/scilab-toolbox-sivp/Makefile index a27203b9ed9a..17cb1a7b57ed 100644 --- a/math/scilab-toolbox-sivp/Makefile +++ b/math/scilab-toolbox-sivp/Makefile @@ -28,11 +28,13 @@ TOOLBOXDIR= ${PREFIX}/${TOOLBOXDIR_REL} PLIST_SUB= TOOLBOXDIR=${TOOLBOXDIR_REL} TOOLBOX_SUBDIRS= demos etc images macros -OPTIONS= HELP "Build help files (requires scilab with gui support)" on +OPTIONS_DEFINE= HELP +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +HELP_DESC= Build help files (requires scilab with gui support) .include <bsd.port.options.mk> -.if defined(WITHOUT_HELP) +.if !${PORT_OPTIONS:MHELP} SCILAB_ARGS= -nogui PLIST_SUB+= HELP="@comment " EXTRA_PATCHES+= ${FILESDIR}/extrapatch-etc__SIVP.start @@ -49,14 +51,14 @@ pre-everything:: @${ECHO_CMD} post-patch: -.if defined(WITHOUT_HELP) +.if !${PORT_OPTIONS:MHELP} ${REINPLACE_CMD} -e '/tbx_builder_help/d' ${WRKSRC}/builder.sce .endif ${ECHO_CMD} quit >> ${WRKSRC}/builder.sce pre-build: ${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete -.if !defined(WITHOUT_HELP) && !defined(DISPLAY) +.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY) @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ @@ -70,7 +72,7 @@ do-build: ${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce post-build: -.if !defined(WITHOUT_HELP) && !defined(DISPLAY) +.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY) @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile index b1d38a317854..130406ca4d11 100644 --- a/math/scilab-toolbox-swt/Makefile +++ b/math/scilab-toolbox-swt/Makefile @@ -1,6 +1,6 @@ -## New ports collection makefile for: swt -# Date created: 28 March 2006 -# Whom: Max Brazhnikov makc@issp.ac.ru +## New ports collection makefile for: swt +# Date created: 2006-03-28 +# Whom: Max Brazhnikov makc@issp.ac.ru # # $FreeBSD$ # @@ -26,16 +26,19 @@ TOOLBOXDIR= ${PREFIX}/${TOOLBOXDIR_REL} PLIST_SUB= TOOLBOXDIR=${TOOLBOXDIR_REL} TOOLBOX_SUBDIRS= demos etc macros -OPTIONS= SIVP "Enable Image and Video support" off \ - HELP "Build help files (requires scilab with gui support)" on +OPTIONS_DEFINE= HELP SIVP +OPTIONS_DEFAULT= HELP + +HELP_DESC= Build help files (requires scilab with gui support) +SIVP_DESC= Enable Image and Video support .include <bsd.port.options.mk> -.if defined(WITH_SIVP) +.if ${PORT_OPTIONS:MSIVP} RUN_DEPENDS+= ${LOCALBASE}/${CONTRIBDIR}/sivp/loader.sce:${PORTSDIR}/math/scilab-toolbox-sivp .endif -.if defined(WITHOUT_HELP) +.if !${PORT_OPTIONS:MHELP} SCILAB_ARGS= -nogui PLIST_SUB+= HELP="@comment " EXTRA_PATCHES+= ${FILESDIR}/extrapatch-etc__swt.start @@ -47,7 +50,7 @@ TOOLBOX_SUBDIRS+= jar .endif post-patch: -.if defined(WITHOUT_HELP) +.if !${PORT_OPTIONS:MHELP} ${REINPLACE_CMD} -e '/tbx_builder_help/d' ${WRKSRC}/builder.sce .endif ${REINPLACE_CMD} -e "s,SWTDIR+','${TOOLBOXDIR}/demos," \ @@ -56,7 +59,7 @@ post-patch: pre-build: ${FIND} -d ${WRKSRC} \( -name '*.orig' -or -name '*.bak' \) -delete -.if !defined(WITHOUT_HELP) && !defined(DISPLAY) +.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY) @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ @@ -70,7 +73,7 @@ do-build: ${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce post-build: -.if !defined(WITHOUT_HELP) && !defined(DISPLAY) +.if ${PORT_OPTIONS:MHELP} && !defined(DISPLAY) @if [ -f ${WRKDIR}/.Xvfb.pid ]; then \ ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile index 1f6e21966282..b6eee279f036 100644 --- a/math/speedcrunch/Makefile +++ b/math/speedcrunch/Makefile @@ -23,7 +23,9 @@ MAKE_JOBS_SAFE= yes LRELEASE_CMD= ${LOCALBASE}/bin/lrelease-qt4 LRELEASE_ARGS= -compress -silent -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist PLIST_SUB+= NLS="" .else @@ -31,7 +33,7 @@ PLIST_SUB+= NLS="@comment " .endif pre-configure: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} cd ${WRKSRC}/src/i18n && ${LRELEASE_CMD} ${LRELEASE_ARGS} *.ts .else ${REINPLACE_CMD} -e '/speedcrunch_TRANSLATIONS/d' ${WRKSRC}/src/CMakeLists.txt diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile index c4af349582ea..506afbe42d67 100644 --- a/multimedia/minitube/Makefile +++ b/multimedia/minitube/Makefile @@ -27,7 +27,9 @@ LRELEASE= ${LOCALBASE}/bin/lrelease-qt4 STRIP_FILES= bin/minitube -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build PLIST_SUB+= NLS="" .else @@ -36,7 +38,7 @@ PLIST_SUB+= NLS="@comment " pre-configure: ${REINPLACE_CMD} -e 's,$$$$PKGDATADIR,${DATADIR},g' ${QMAKE_PRO} -.if defined(WITHOUT_NLS) +.if !${PORT_OPTIONS:MNLS} ${REINPLACE_CMD} -e '/include(locale\/locale.pri)/d' ${QMAKE_PRO} .endif diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile index 492ffb9e0aa7..de515fad8524 100644 --- a/multimedia/subtitlecomposer-kde4/Makefile +++ b/multimedia/subtitlecomposer-kde4/Makefile @@ -18,30 +18,32 @@ USE_BZIP2= yes USE_CMAKE= yes USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= gui qmake_build moc_build rcc_build uic_build -WANT_GSTREAMER= yes LATEST_LINK= ${PORTNAME}-kde4 -OPTIONS= MPLAYER "Enable MPlayer backend (recommended)" on \ - XINE "Enable Xine backend" off \ - GSTREAMER "Enable GStreamer backend (broken)" off +OPTIONS_DEFINE= GSTREAMER MPLAYER XINE +OPTIONS_DEFAULT= MPLAYER -.include <bsd.port.pre.mk> +MPLAYER_DESC= Enable MPlayer backend (recommended) +XINE_DESC= Enable Xine backend +GSTREAMER_DESC= Enable GStreamer backend (broken) -.if defined(WITH_MPLAYER) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MMPLAYER} RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer .endif -.if defined(WITH_XINE) +.if ${PORT_OPTIONS:MXINE} LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine .else CMAKE_ARGS+= -DWITH_Xine:Bool=Off .endif -.if defined(WITH_GSTREAMER) -USE_GSTREAMER+= yes +.if ${PORT_OPTIONS:MGSTREAMER} +USE_GSTREAMER= yes .else CMAKE_ARGS+= -DWITH_GStreamer:Bool=Off .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index c47d1fd632d4..4b67ae4d28f2 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -30,8 +30,11 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \ MAKE_JOBS_UNSAFE= yes -OPTIONS= ASPELL "Use aspell for spell checking" on \ - ENCHANT "Use Enchant for spell checking" off +OPTIONS_DEFINE= ASPELL ENCHANT +OPTIONS_DEFAULT= ASPELL + +ASPELL_DESC= Use aspell for spell checking +ENCHANT_DESC= Use Enchant for spell checking .include <bsd.port.options.mk> @@ -43,7 +46,7 @@ CONFIGURE_ARGS+= --release --no-separate-debug-info PLIST_SUB+= DEBUG="@comment " .endif -.if defined(WITH_ASPELL) +.if ${PORT_OPTIONS:MASPELL} LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ --with-aspell-lib=${LOCALBASE}/lib @@ -51,7 +54,7 @@ CONFIGURE_ARGS+= --with-aspell-inc=${LOCALBASE}/include \ CONFIGURE_ARGS+= --disable-aspell .endif -.if defined(WITH_ENCHANT) +.if ${PORT_OPTIONS:MENCHANT} LIB_DEPENDS+= enchant.1:${PORTSDIR}/textproc/enchant .else CONFIGURE_ARGS+= --disable-enchant diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 47b03499482f..1b15384e2f08 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster \ ${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \ xdg-open:${PORTSDIR}/devel/xdg-utils -CONFLICTS= hpijs-[0-9]* +CONFLICTS_INSTALL= hpijs-[0-9]* USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= 2.5+ @@ -76,11 +76,14 @@ FILES4FIX= Makefile.in \ ui/setupform.py \ ui4/devmgr5.py -OPTIONS= QT "Graphical User Interface (Qt4)" on \ - FAX "PC Send Fax support" off \ - SNMP "Network/JetDirect support" off \ - SCAN "Scanning support" off \ - XSANE "Install XSane for scanning (requires SCAN)" off +OPTIONS_DEFINE= QT FAX SNMP SCAN XSANE +OPTIONS_DEFAULT= QT + +QT_DESC= Graphical User Interface (Qt4) +FAX_DESC= PC Send Fax support +SNMP_DESC= Network/JetDirect support +SCAN_DESC= Scanning support +XSANE_DESC= Install XSane for scanning (requires SCAN) .include <bsd.port.options.mk> @@ -95,7 +98,7 @@ USB_INCLUDE= ${LOCALBASE}/include USB_INCLUDE= /usr/include .endif -.if !defined(WITHOUT_QT) +.if ${PORT_OPTIONS:MQT} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus CONFIGURE_ARGS+= --enable-qt4 \ @@ -107,7 +110,7 @@ CONFIGURE_ARGS+= --disable-qt4 \ PLIST_SUB+= GUI="@comment " .endif -.if defined(WITH_FAX) +.if ${PORT_OPTIONS:MFAX} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 CONFIGURE_ARGS+= --enable-fax-build PLIST_SUB+= FAX="" @@ -116,7 +119,7 @@ CONFIGURE_ARGS+= --disable-fax-build PLIST_SUB+= FAX="@comment " .endif -.if defined(WITH_SNMP) +.if ${PORT_OPTIONS:MSNMP} USE_OPENSSL= yes LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+= --enable-network-build @@ -128,8 +131,8 @@ CONFIGURE_ENV+= LIBS="-lssp_nonshared" CONFIGURE_ARGS+= --disable-network-build .endif -.if defined(WITH_SCAN) -. if defined(WITH_XSANE) +.if ${PORT_OPTIONS:MSCAN} +. if ${PORT_OPTIONS:MXSANE} RUN_DEPENDS+= xsane:${PORTSDIR}/graphics/xsane . endif LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends @@ -141,7 +144,7 @@ CONFIGURE_ARGS+= --disable-scan-build PLIST_SUB+= SCAN="@comment " .endif -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --enable-doc-build=no .endif diff --git a/print/texvc/Makefile b/print/texvc/Makefile index 5208d91177b7..b42599d107e0 100644 --- a/print/texvc/Makefile +++ b/print/texvc/Makefile @@ -22,11 +22,13 @@ BUILD_WRKSRC= ${WRKSRC}/src PLIST_FILES= bin/texvc -OPTIONS= RASTER "rasterization support" on +OPTIONS_DEFINE= RASTER +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +RASTER_DESC= rasterization support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_RASTER) +.if ${PORT_OPTIONS:MRASTER} USE_GHOSTSCRIPT_RUN= yes RUN_DEPENDS+= latex:${PORTSDIR}/print/teTeX-base \ dvips:${PORTSDIR}/print/dvipsk-tetex \ @@ -36,4 +38,4 @@ RUN_DEPENDS+= latex:${PORTSDIR}/print/teTeX-base \ do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/texvc ${PREFIX}/bin -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/science/kst2/Makefile b/science/kst2/Makefile index 798b51f5bd5e..2af1273bcdc0 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -29,19 +29,21 @@ CMAKE_ARGS+= -Dkst_install_prefix=${PREFIX} MAN1= kst2.1 PLIST_SUB= SHLIB_VER=${PORTVERSION} -OPTIONS= FITS "Support for data in FITS format" off \ - NETCDF "Support for data in NetCDF format" off +OPTIONS_DEFINE= FITS NETCDF + +FITS_DESC= Support for data in FITS format +NETCDF_DESC= Support for data in NetCDF format .include <bsd.port.options.mk> -.if defined(WITH_FITS) +.if ${PORT_OPTIONS:MFITS} LIB_DEPENDS+= cfitsio.0:${PORTSDIR}/astro/cfitsio PLIST_SUB+= FITS="" .else PLIST_SUB+= FITS="@comment " .endif -.if defined(WITH_NETCDF) +.if ${PORT_OPTIONS:MNETCDF} LIB_DEPENDS+= netcdf.4:${PORTSDIR}/science/netcdf PLIST_SUB+= NETCDF="" .else @@ -53,11 +55,11 @@ post-patch: ${WRKSRC}/src/kst/kst2.desktop pre-configure: -.if !defined(WITH_FITS) +.if !${PORT_OPTIONS:MFITS} ${REINPLACE_CMD} -e '/find_package(CFITSIO)/d' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt .endif -.if !defined(WITH_NETCDF) +.if !${PORT_OPTIONS:MNETCDF} ${REINPLACE_CMD} -e '/find_package(Netcdf)/d' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt .endif diff --git a/security/pinentry-curses/Makefile b/security/pinentry-curses/Makefile index 4cac9dfe93a6..165caadb162c 100644 --- a/security/pinentry-curses/Makefile +++ b/security/pinentry-curses/Makefile @@ -9,10 +9,11 @@ PORTNAME= pinentry COMMENT= Curses version of the gnupg password dialog -CONFLICTS= pinentry-[0-9]* +CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-gtk-* \ + pinentry-gtk2-* pinentry-qt-* pinentry-qt4-* PINENTRY_SLAVE= -curses -WITH_NCURSES= yes +PORT_OPTIONS+= NCURSES MASTERDIR= ${.CURDIR}/../pinentry diff --git a/security/pinentry-gtk/Makefile b/security/pinentry-gtk/Makefile index d61db2fc5ba5..85413bf93f7a 100644 --- a/security/pinentry-gtk/Makefile +++ b/security/pinentry-gtk/Makefile @@ -9,10 +9,11 @@ PORTNAME= pinentry COMMENT= GTK version of the gnupg password dialog -CONFLICTS= pinentry-[0-9]* +CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* \ + pinentry-gtk2-* pinentry-qt-* pinentry-qt4-* PINENTRY_SLAVE= -gtk -WITH_GTK= yes +PORT_OPTIONS+= GTK MASTERDIR= ${.CURDIR}/../pinentry diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile index 0f8d108af408..feb62c970e54 100644 --- a/security/pinentry-gtk2/Makefile +++ b/security/pinentry-gtk2/Makefile @@ -9,10 +9,11 @@ PORTNAME= pinentry COMMENT= GTK+ 2.0 version of the GnuPG password dialog -CONFLICTS= pinentry-[0-9]* +CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \ + pinentry-qt-* pinentry-qt4-* PINENTRY_SLAVE= -gtk2 -WITH_GTK2= yes +PORT_OPTIONS+= GTK2 MASTERDIR= ${.CURDIR}/../pinentry diff --git a/security/pinentry-qt/Makefile b/security/pinentry-qt/Makefile index ca0ebc3f0e40..1c25de255c7b 100644 --- a/security/pinentry-qt/Makefile +++ b/security/pinentry-qt/Makefile @@ -9,10 +9,11 @@ PORTNAME= pinentry COMMENT= QT3 version of the gnupg password dialog -CONFLICTS= pinentry-[0-9]* +CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \ + pinentry-gtk2-* pinentry-qt4-* PINENTRY_SLAVE= -qt3 -WITH_QT3= yes +PORT_OPTIONS+= QT3 MASTERDIR= ${.CURDIR}/../pinentry diff --git a/security/pinentry-qt4/Makefile b/security/pinentry-qt4/Makefile index feab34dff12a..a167d65532cd 100644 --- a/security/pinentry-qt4/Makefile +++ b/security/pinentry-qt4/Makefile @@ -9,10 +9,11 @@ PORTNAME= pinentry COMMENT= QT4 version of the gnupg password dialog -CONFLICTS= pinentry-[0-9]* +CONFLICTS_INSTALL= pinentry-[0-9]* pinentry-curses-* pinentry-gtk-* \ + pinentry-gtk2-* pinentry-qt-* PINENTRY_SLAVE= -qt4 -WITH_QT4= yes +PORT_OPTIONS+= QT4 MASTERDIR= ${.CURDIR}/../pinentry diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 9644224558d4..aa23de7b5c3f 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -18,7 +18,7 @@ COMMENT?= A collection of simple PIN or passphrase entry dialogs LIB_DEPENDS= gcrypt.18:${PORTSDIR}/security/libgcrypt \ ksba.19:${PORTSDIR}/security/libksba -CONFLICTS?= pinentry-[a-z]*-[0.9]* +CONFLICTS_INSTALL?= pinentry-[a-z]*-[0.9]* USE_ICONV= yes GNU_CONFIGURE= yes @@ -29,22 +29,22 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .if !defined(PINENTRY_SLAVE) -OPTIONS= NCURSES "Curses frontend" on \ - GTK "Gtk+1 frontend" on \ - GTK2 "Gtk+2 frontend" on \ - QT3 "Qt3 frontend" on \ - QT4 "Qt4 frontend" on +OPTIONS_MULTI= FRONTEND +OPTIONS_MULTI_FRONTEND= NCURSES GTK GTK2 QT3 QT4 +OPTIONS_DEFAULT= ${OPTIONS_MULTI_FRONTEND} + +NCURSES_DESC= Curses frontend +GTK_DESC= Gtk+1 frontend +GTK2_DESC= Gtk+2 frontend +QT3_DESC= Qt3 frontend +QT4_DESC= Qt4 frontend .else PKGNAMESUFFIX= ${PINENTRY_SLAVE} .endif .include <bsd.port.options.mk> -.if !(defined(WITH_NCURSES) || defined(WITH_GTK) || defined(WITH_GTK2) || defined(WITH_QT3) || defined(WITH_QT4)) -IGNORE= requires at least one frontend. Please rerun 'make config' -.endif - -.if defined(WITH_QT3) +.if ${PORT_OPTIONS:MQT3} USE_QT_VER= 3 PLIST_SUB+= WITH_QT3="" MOC3= ${LOCALBASE}/bin/moc @@ -53,12 +53,8 @@ CONFIGURE_ARGS+=--disable-pinentry-qt PLIST_SUB+= WITH_QT3="@comment " .endif -.if defined(WITH_QT4) -#USE_QT_VER= 4 -#QT_COMPONENTS= gui moc_build -.include "${PORTSDIR}/Mk/bsd.qt.mk" -BUILD_DEPENDS+= moc-qt4:${PORTSDIR}/devel/qt4-moc -LIB_DEPENDS+= QtGui.4:${PORTSDIR}/x11-toolkits/qt4-gui +.if ${PORT_OPTIONS:MQT4} +USE_QT4= gui moc_build PLIST_SUB+= WITH_QT4="" MOC4= ${LOCALBASE}/bin/moc-qt4 LDFLAGS+= ${PTHREAD_LIBS} @@ -67,7 +63,7 @@ CONFIGURE_ARGS+=--disable-pinentry-qt4 PLIST_SUB+= WITH_QT4="@comment " .endif -.if defined(WITH_GTK) +.if ${PORT_OPTIONS:MGTK} USE_GNOME+= gtk12 PLIST_SUB+= WITH_GTK="" .else @@ -75,7 +71,7 @@ CONFIGURE_ARGS+=--disable-pinentry-gtk PLIST_SUB+= WITH_GTK="@comment " .endif -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 PLIST_SUB+= WITH_GTK2="" .else @@ -83,7 +79,7 @@ CONFIGURE_ARGS+=--disable-pinentry-gtk2 PLIST_SUB+= WITH_GTK2="@comment " .endif -.if defined(WITH_NCURSES) +.if ${PORT_OPTIONS:MNCURSES} USE_NCURSES= yes PLIST_SUB+= WITH_NCURSES="" .else @@ -94,11 +90,11 @@ PLIST_SUB+= WITH_NCURSES="@comment " pre-configure: ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \ ${WRKSRC}/m4/qt.m4 ${WRKSRC}/configure -.if defined(WITH_QT3) +.if ${PORT_OPTIONS:MQT3} ${REINPLACE_CMD} -e "/^MOC/s,@MOC@,${MOC3}," \ ${WRKSRC}/qt/Makefile.in .endif -.if defined(WITH_QT4) +.if ${PORT_OPTIONS:MQT4} cd ${WRKSRC}/qt4 && \ ${MOC4} pinentrydialog.h > pinentrydialog.moc && \ ${MOC4} qsecurelineedit.h > qsecurelineedit.moc diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile index c1c1900da979..f8837c75b243 100644 --- a/textproc/qstardict/Makefile +++ b/textproc/qstardict/Makefile @@ -21,27 +21,28 @@ USE_DOS2UNIX= qstardict.pri DICPATH= ${LOCALBASE}/share/stardict/dic -OPTIONS= DBUS "Enable D-BUS support" on +OPTIONS_DEFINE= DBUS +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +PLIST_SUB+= NLS="" +.else QMAKE_ARGS+= NO_TRANSLATIONS=1 PLIST_SUB+= NLS="@comment " -.else -PLIST_SUB+= NLS="" .endif -.if defined(WITHOUT_DBUS) -QMAKE_ARGS+= NO_DBUS=1 +.if ${PORT_OPTIONS:MDBUS} +USE_QT4+= dbus .else -LIB_DEPENDS+= QtDBus.4:${PORTSDIR}/devel/dbus-qt4 +QMAKE_ARGS+= NO_DBUS=1 .endif post-patch: @${REINPLACE_CMD} -e "s|/usr|${PREFIX}|g" \ ${WRKSRC}/qstardict.pri -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e "/^INSTALLS/s|docs||g" \ ${WRKSRC}/qstardict.pro .endif @@ -58,4 +59,4 @@ post-configure: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile index 3111fa3f6fa3..9e7fb184a3d0 100644 --- a/textproc/stardict3/Makefile +++ b/textproc/stardict3/Makefile @@ -35,13 +35,14 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} PROJECTHOST= stardict-3 -OPTIONS= GNOME "GNOME support" On +OPTIONS_DEFINE= GNOME +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} -CONFLICTS_RUN= stardict-2.[0-9]* +CONFLICTS_INSTALL= stardict-2.[0-9]* .include <bsd.port.options.mk> -.if !defined(WITHOUT_GNOME) +.if ${PORT_OPTIONS:MGNOME} USE_GNOME+= gnomeprefix gnomedocutils libgnomeui GCONF_SCHEMAS= stardict.schemas INSTALLS_OMF= yes @@ -57,7 +58,7 @@ MAKE_ARGS+= AUTOMAKE="${TRUE}" ACLOCAL="${TRUE}" MAN1= stardict.1 post-patch: -.if defined(WITHOUT_GNOME) +.if !${PORT_OPTIONS:MGNOME} ${REINPLACE_CMD} -e '/DATADIRNAME=lib/s,lib,share,' ${WRKSRC}/dict/m4/intltool.m4 ${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in ${REINPLACE_CMD} -e '/^GNOME_DOC_INIT/d' \ diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile index 37e44e69580f..a553ce1122b1 100644 --- a/x11-fonts/fontmatrix/Makefile +++ b/x11-fonts/fontmatrix/Makefile @@ -22,11 +22,13 @@ INSTALLS_ICONS= yes USE_CMAKE= yes -OPTIONS= FONTFORGE "With FontForge editor" off +OPTIONS_DEFINE= FONTFORGE +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +FONTFORGE_DESC= With FontForge editor -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_FONTFORGE) +.if ${PORT_OPTIONS:MFONTFORGE} RUN_DEPENDS+= ${LOCALBASE}/bin/fontforge:${PORTSDIR}/print/fontforge .endif @@ -41,4 +43,4 @@ pre-configure: ${LOCALBASE}/bin/lupdate-qt4 -noobsolete ../ -ts *.ts && \ ${LOCALBASE}/bin/lrelease-qt4 *.ts -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile index 9d16adf72124..c0736a675884 100644 --- a/x11-toolkits/qwt5/Makefile +++ b/x11-toolkits/qwt5/Makefile @@ -35,7 +35,7 @@ post-install: ${MKDIR} ${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3 ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile index 906e02ae5bbf..922e8721d073 100644 --- a/x11-toolkits/qwt6/Makefile +++ b/x11-toolkits/qwt6/Makefile @@ -32,12 +32,14 @@ PLIST_SUB= INCLUDEDIR=include/${LATEST_LINK} \ STRIP_FILES= lib/libqwt6.so.${PORTVERSION} \ lib/libqwtmathml.so.${PORTVERSION} +.include <bsd.port.options.mk> + do-configure: (cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}) post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} (cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif |