diff options
-rw-r--r-- | devel/pear-PHPUnit2/Makefile | 5 | ||||
-rw-r--r-- | devel/py-testoob/Makefile | 10 | ||||
-rw-r--r-- | devel/qsa/Makefile | 6 | ||||
-rw-r--r-- | devel/sdl_sge/Makefile | 35 | ||||
-rw-r--r-- | devel/sml_tk/Makefile | 27 | ||||
-rw-r--r-- | devel/stlport/Makefile | 20 | ||||
-rw-r--r-- | devel/tclthread/Makefile | 8 | ||||
-rw-r--r-- | devel/zziplib/Makefile | 4 | ||||
-rw-r--r-- | dns/tinystats/Makefile | 10 | ||||
-rw-r--r-- | editors/kile/Makefile | 10 | ||||
-rw-r--r-- | editors/mp/Makefile | 30 | ||||
-rw-r--r-- | editors/ted/Makefile | 6 | ||||
-rw-r--r-- | editors/the/Makefile | 16 | ||||
-rw-r--r-- | emulators/advancemame/Makefile | 10 | ||||
-rw-r--r-- | emulators/advancemenu/Makefile | 10 | ||||
-rw-r--r-- | emulators/advancemess/Makefile | 8 | ||||
-rw-r--r-- | emulators/generator-cbiere/Makefile | 12 | ||||
-rw-r--r-- | emulators/generator/Makefile | 12 | ||||
-rw-r--r-- | emulators/spim/Makefile | 15 | ||||
-rw-r--r-- | ftp/hsftp/Makefile | 9 | ||||
-rw-r--r-- | ftp/wzdftpd/Makefile | 47 |
21 files changed, 157 insertions, 153 deletions
diff --git a/devel/pear-PHPUnit2/Makefile b/devel/pear-PHPUnit2/Makefile index 30567092e386..ec08dba63dc1 100644 --- a/devel/pear-PHPUnit2/Makefile +++ b/devel/pear-PHPUnit2/Makefile @@ -28,7 +28,8 @@ PEAR_AUTOINSTALL= yes LATEST_LINK= pear-PHPUnit2 -OPTIONS= PEAR_LOG "PEAR::Log support" off +OPTIONS_DEFINE= PEAR_LOG +PEAR_LOG_DESC= PEAR::Log support USE_PHP= dom pcre @@ -37,7 +38,7 @@ IGNORE_WITH_PHP=4 .include <bsd.port.pre.mk> -.if defined(WITH_PEAR_LOG) +.if ${PORT_OPTIONS:MPEAR_LOG} RUN_DEPENDS+= ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log .endif diff --git a/devel/py-testoob/Makefile b/devel/py-testoob/Makefile index 2a9b6b05471b..86767968af36 100644 --- a/devel/py-testoob/Makefile +++ b/devel/py-testoob/Makefile @@ -15,8 +15,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= Testoob is an advanced unit testing framework for PyUnit -OPTIONS= TWISTED "enable running in threads" off \ - HTML "enable HTML output" off +OPTIONS_DEFINE= TWISTED HTML +TWISTED_DESC= enable running in threads +HTML_DESC= enable HTML output + # bypass infrastructure bug (taken from www/py-django) OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options @@ -29,11 +31,11 @@ PYDISTUTILS_NOEGGINFO= yes .include <bsd.port.pre.mk> -.if defined(WITH_TWISTED) +.if ${PORT_OPTIONS:MTWISTED} USE_TWISTED= yes .endif -.if defined(WITH_HTML) +.if ${PORT_OPTIONS:MHTML} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Ft/Xml/__init__.py:${PORTSDIR}/textproc/py-4suite-xml .endif diff --git a/devel/qsa/Makefile b/devel/qsa/Makefile index f7fd4fb7bf05..bc2d09648df2 100644 --- a/devel/qsa/Makefile +++ b/devel/qsa/Makefile @@ -34,11 +34,13 @@ ALL_TARGET= sub-src SUB_FILES= pkg-message -OPTIONS= IDE "Enable the QSA Workbench (embedded scripting IDE)" on +OPTIONS_DEFINE= IDE +OPTIONS_DEFAULT= IDE +IDE_DESC= Enable the QSA Workbench (embedded scripting IDE) .include <bsd.port.options.mk> -.if defined(WITHOUT_IDE) +.if empty(PORT_OPTIONS:MIDE) CONFIGURE_ARGS+=-no-ide .endif diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile index f7d29f68e2ab..5243a15a29bd 100644 --- a/devel/sdl_sge/Makefile +++ b/devel/sdl_sge/Makefile @@ -19,38 +19,29 @@ COMMENT= A graphic library for the Simple DirectMedia Layer (SDL) LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual -OPTIONS= SDL_IMAGE "Enable support for SDL_image" On \ - FREETYPE "Enable FreeType support" On \ - DOCS "Install documentation" On \ - EXAMPLES "Install examples" On +OPTIONS_DEFINE= SDL FREETYPE DOCS EXAMPLES +OPTIONS_DEFAULT= SDL FREETYPE +SDL_dESC= Enable support for SDL_image USE_SDL= sdl USE_GMAKE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_FREETYPE) -MAKE_ARGS+= USE_FT=n -.else +.if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 MAKE_ARGS+= USE_FT=y +.else +MAKE_ARGS+= USE_FT=n .endif -.if defined(WITHOUT_SDL_IMAGE) -MAKE_ARGS+= USE_IMG=n -.else +.if ${PORT_OPTIONS:MSDL} USE_SDL+= image MAKE_ARGS+= USE_IMG=y -.endif - -.if !defined(WITH_DOCS) -NOPORTDOCS= yes -.endif - -.if !defined(WITH_EXAMPLES) -NOPORTEXAMPLES= yes +.else +MAKE_ARGS+= USE_IMG=n .endif post-patch: @@ -60,13 +51,13 @@ post-patch: s|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/sml_tk/Makefile b/devel/sml_tk/Makefile index e25cf1c01a9a..1aaa520b15fe 100644 --- a/devel/sml_tk/Makefile +++ b/devel/sml_tk/Makefile @@ -18,25 +18,28 @@ COMMENT= Typed and abstract Standard ML interface to Tcl/Tk USE_TK_WRAPPER= yes WRKSRC= ${WRKDIR}/${PORTNAME} -OPTIONS= SMLNJDEVEL "Build with and stabilize for SML/NJ." on \ - POLYML "Build and save state for Poly/ML" on +OPTIONS_DEFINE= SMLNJDEVEL POLYML +OPTIONS_DEFAULT= SMLNJDEVEL POLYML + +SMLNJDEVEL_DESC= Build with and stabilize for SML/NJ +POLYML_DESC= Build and save state for Poly/ML ALL_TARGET= smltk SUB_FILES= sml_tk.1 MAN1= sml_tk.1 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SMLNJDEVEL) +.if ${PORT_OPTIONS:MSMLNJDEVEL} BUILD_DEPENDS+= smlnj-devel>=65:${PORTSDIR}/lang/sml-nj-devel .endif -.if defined(WITH_POLYML) +.if ${PORT_OPTIONS:MPOLYML} BUILD_DEPENDS+= poly:${PORTSDIR}/lang/polyml .endif MAKE_ENV+= WRKSRC=${WRKSRC} WISH=${WISH} -.if defined(WITH_SMLNJDEVEL) +.if ${PORT_OPTIONS:MSMLNJDEVEL} MAKE_ENV+= STABILIZE=yes SMLNJDEVEL=yes PLIST_SUB+= STABLE="" SMLNJBIN="" .else @@ -44,7 +47,7 @@ MAKE_ENV+= STABILIZE=no SMLNJDEVEL=no PLIST_SUB+= STABLE="@comment " SMLNJBIN="@comment " .endif -.if defined(WITH_POLYML) +.if ${PORT_OPTIONS:MPOLYML} MAKE_ENV+= POLYML=yes PLIST_SUB+= POLYSTATE="" .else @@ -66,7 +69,7 @@ post-extract: @${CHMOD} 0644 ${WRKSRC}/lib/images/info.gif post-build: -.if defined(WITH_SMLNJDEVEL) +.if ${PORT_OPTIONS:MSMLNJDEVEL} SMLNJ_DEVEL=yes heap2exec \ ${WRKSRC}/bin/sml_tk.heap.x86-bsd ${WRKSRC}/bin/sml_tk .endif @@ -91,7 +94,7 @@ do-install: done) @${LN} -s ${PREFIX}/lib/${PORTNAME}/smltk.cm \ ${PREFIX}/lib/${PORTNAME}/sml_tk.cm -.if defined(WITH_SMLNJDEVEL) +.if ${PORT_OPTIONS:MSMLNJDEVEL} @${INSTALL_PROGRAM} ${WRKSRC}/bin/sml_tk ${PREFIX}/bin @${MKDIR} ${PREFIX}/lib/${PORTNAME}/.cm @${MKDIR} ${PREFIX}/lib/${PORTNAME}/.cm/x86-unix @@ -100,11 +103,11 @@ do-install: @${LN} -s ${PREFIX}/lib/${PORTNAME}/.cm/x86-unix/sources.cm \ ${PREFIX}/lib/${PORTNAME}/.cm/x86-unix/sml_tk.cm .endif -.if defined(WITH_POLYML) +.if ${PORT_OPTIONS:MPOLYML} @${INSTALL_DATA} ${WRKSRC}/bin/sml_tk.poly \ ${PREFIX}/lib/${PORTNAME}/sml_tk.poly .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${INSTALL_MAN} ${WRKSRC}/doc/manual.html ${DOCSDIR}/manual.html @${MKDIR} ${DOCSDIR}/images @@ -114,4 +117,4 @@ do-install: .endif @${INSTALL_MAN} ${WRKDIR}/sml_tk.1 ${MANPREFIX}/man/man1/sml_tk.1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile index bed36442cbf6..ba0b60c7b606 100644 --- a/devel/stlport/Makefile +++ b/devel/stlport/Makefile @@ -34,26 +34,28 @@ CONFIGURE_ARGS= --with-lib-motif=${COMPILER} USE_LDCONFIG= yes PORTDOCS= * -OPTIONS= SHORT_STRING_OPTIM "Enable short string optimization." on \ - PTR_SPECIALIZATIONS "Use pointer types specializations." off \ - TEMPLATE_EXPRESSION "Use template expressions for string." off \ - BOOST_SUPPORT "Use Boost type traits." off +OPTIONS_DEFINE= SHORT_STRING_OPTIM PTR_SPECIALIZATIONS TEMPLATE_EXPRESSION BOOST DOCS +OPTIONS_DEFAULT= SHORT_STRING_OPTIM +SHORT_STRING_OPTIM_DESC= Enable short string optimization +PTR_SPECIALIZATIONS_DESC= Use pointer types specializations +TEMPLATE_EXPRESSION_DESC= Use template expressions for string +BOOST_DESC= Use Boost type traits .include <bsd.port.pre.mk> -.if defined(WITHOUT_SHORT_STRING_OPTIM) +.if empty(PORT_OPTIONS:MSHORT_STRING_OPTIM) EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-no-short-string-optim-user_config.h.diff .endif -.if defined(WITH_PTR_SPECIALIZATIONS) +.if ${PORT_OPTIONS:MPTR_SPECIALIZATIONS} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ptr_spec-user_config.h.diff .endif -.if defined(WITH_TEMPLATE_EXPRESSION) +.if ${PORT_OPTIONS:MTEMPLATE_EXPRESSION} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-templ-expr-user_config.h.diff .endif -.if defined(WITH_BOOST_SUPPORT) +.if ${PORT_OPTIONS:MBOOST} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-boost-support-user_config.h.diff MAKE_ENV+= STLP_BUILD_BOOST_PATH=${LOCALBASE}/include BUILD_DEPENDS+= ${LOCALBASE}/include/boost/config/stdlib/stlport.hpp:${PORTSDIR}/devel/boost-libs @@ -81,7 +83,7 @@ do-install: (cd ${PATCH_WRKSRC}/lib; ${TAR} cf - *) | (cd ${PREFIX}/lib; ${TAR} xf -) ${CHOWN} -h ${BINOWN}:${BINGRP} ${PREFIX}/lib/libstlport* ${FIND} ${PREFIX}/include/stlport -name \*.orig -delete -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PATCH_WRKSRC}/doc/* ${DOCSDIR} .endif diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile index 39318ddbea17..a3b3c040be70 100644 --- a/devel/tclthread/Makefile +++ b/devel/tclthread/Makefile @@ -34,13 +34,15 @@ MANN= thread.n tpool.n tsv.n ttrace.n INSTALL_TARGET+= install-doc .endif -OPTIONS= GDBM "include GDBM support" on +OPTIONS_DEFINE= GDBM DOCS +OPTIONS_DEFAULT= GDBM +GDBM_DESC= include GDBM support .include <bsd.port.pre.mk> CONFIGURE_ARGS+= --with-tcl="${TCL_LIBDIR}" -.if defined(WITH_GDBM) +.if ${PORT_OPTIONS:MGDBM} LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm CONFIGURE_ARGS+= --with-gdbm CONFIGURE_ENV+= gincdir="${LOCALBASE}/include" glibdir="${LOCALBASE}/lib" @@ -51,7 +53,7 @@ post-patch: ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/html .for FILE in ChangeLog README license.terms ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile index 8548725bf80c..6539d3aab142 100644 --- a/devel/zziplib/Makefile +++ b/devel/zziplib/Makefile @@ -18,7 +18,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -OPTIONS= SDL "Enable SDL support" off +OPTIONS_DEFINE= SDL USE_BZIP2= yes USE_GNOME= gnomehack pkgconfig @@ -58,7 +58,7 @@ PORTSCOUT= limit:^0\. .include <bsd.port.options.mk> -.if defined(WITH_SDL) +.if ${PORT_OPTIONS:MSDL} USE_SDL= sdl CONFIGURE_ARGS+=--enable-sdl PLIST_SUB+= SDL="" diff --git a/dns/tinystats/Makefile b/dns/tinystats/Makefile index b85ec1289e99..e9387168aeea 100644 --- a/dns/tinystats/Makefile +++ b/dns/tinystats/Makefile @@ -16,7 +16,7 @@ COMMENT= DJB's tinydns statistics generator WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= -OPTIONS= IPV6 "Enable IPv6 support" off +OPTIONS_DEFINE= IPV6 DOCS PLIST_FILES= bin/tinystats \ %%EXAMPLESDIR%%/tinydns.log.run.sample \ @@ -27,9 +27,9 @@ PLIST_FILES= bin/tinystats \ PLIST_DIRS= %%EXAMPLESDIR%% PORTDOCS= README LICENSE THANKS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} MAKE_ARGS+= -DWITH_IPV6 .endif @@ -38,9 +38,9 @@ do-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/tinydns.sh.sample ${WRKSRC}/tinydns.log.run.sample \ ${WRKSRC}/update_slave.sh.sample ${WRKSRC}/start_slave.sh.sample ${WRKSRC}/Makefile.sample ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/LICENSE ${WRKSRC}/THANKS ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/kile/Makefile b/editors/kile/Makefile index 5c4368a76f75..c0f61dc01380 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -25,16 +25,18 @@ USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -OPTIONS= KPDF "Use KPDF and KDVI for viewing" on +OPTIONS_DEFINE= KPDF +OPTIONS_DEFAULT= KPDF +KPDF_DESC= Use KPDF and KDVI for viewing post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's| syntax||g' ${WRKSRC}/src/kile/Makefile.in -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_KPDF) +.if ${PORT_OPTIONS:MKPDF} RUN_DEPENDS+= kpdf:${PORTSDIR}/graphics/kdegraphics3 .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/mp/Makefile b/editors/mp/Makefile index 58a1bc5dd7c0..6ae402948c63 100644 --- a/editors/mp/Makefile +++ b/editors/mp/Makefile @@ -16,10 +16,10 @@ COMMENT= A programming text editor LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS= NLS "Native language support" on \ - GTK2 "Build with GTK2 support" off \ - QT4 "Build with QT4 support" off \ - PCRE "Build with PCRE support" on +OPTIONS_DEFINE= NLS GUI PCRE DOCS +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= GTK2 QT4 +OPTIONS_DEFAULT= PCRE WANT_GNOME= yes USE_NCURSES= yes @@ -34,25 +34,21 @@ DATADIR= ${PREFIX}/share/mp-5 .include <bsd.port.options.mk> -.if defined(WITH_GTK2) && defined(WITH_QT4) -IGNORE= GTK2 and QT4 GUIs are mutually exclusive. Please rerun 'make config' and disable one of these -.endif - -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --without-gettext -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --without-gettext +PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 .else CONFIGURE_ARGS+= --without-gtk .endif -.if defined(WITH_QT4) +.if ${PORT_OPTIONS:MQT4} USE_QT4= corelib gui moc_build QT_NONSTANDARD= yes CONFIGURE_ENV+= CPP="${CXX}" CCLINK="${CXX}" @@ -60,7 +56,7 @@ CONFIGURE_ENV+= CPP="${CXX}" CCLINK="${CXX}" CONFIGURE_ARGS+= --without-qt4 .endif -.if !defined(WITHOUT_PCRE) +.if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= pcre.1:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-pcre .endif @@ -87,14 +83,14 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/mp_*.mpsl ${DATADIR} @${MKDIR} ${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/lang/*.mpsl ${DATADIR}/lang -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} .for lang in de es it nl ru sv @${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \ ${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo .endfor .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in AUTHORS README RELEASE_NOTES mp_templates.sample doc/*.* ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} diff --git a/editors/ted/Makefile b/editors/ted/Makefile index 2b98000d60cf..e18d16f441e2 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= pcre.1:${PORTSDIR}/devel/pcre \ paper.2:${PORTSDIR}/print/libpaper RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -OPTIONS= GTK "Use Gtk+ user intarface" off +OPTIONS_DEFINE= GTK2 DOCS WRKSRC= ${WRKDIR}/Ted-${PORTVERSION} @@ -49,7 +49,7 @@ INDDIR= ${DATADIR}/dfa .include <bsd.port.options.mk> -.if defined(WITH_GTK) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONFIGURE_ARGS+=--with-GTK .else @@ -81,7 +81,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/afm/*.afm ${AFMDIR} @${MKDIR} ${INDDIR} ${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/dfa/*.dfa ${INDDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/tedPackage/Ted/TedDocument-en_US.rtf ${DOCSDIR} .endif diff --git a/editors/the/Makefile b/editors/the/Makefile index 90a06be8a715..234c654a5192 100644 --- a/editors/the/Makefile +++ b/editors/the/Makefile @@ -27,8 +27,10 @@ ALL_TARGET= all html MAN1= the.1 -OPTIONS= XAW3D "Enable Xaw3D" off \ - XCURSES "Build XCurses (X11) version" off +OPTIONS_DEFINE= XAW3D XCURSES REXX_REGINA DOCS +XAW3D_DESC= Enable Xaw3D +XCURSES_DESC= Build XCurses (X11) version +REXX_REGINA_DESC= Enable Rexx interpreter .include <bsd.port.pre.mk> @@ -36,12 +38,12 @@ OPTIONS= XAW3D "Enable Xaw3D" off \ BROKEN= Does not configure on powerpc .endif -.if defined(WITH_XAW3D) +.if ${PORT_OPTIONS:MXAW3D} CONFIGURE_ARGS+=--with-xaw3d LIB_DEPENDS+= Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d .endif -.if defined(WITH_XCURSES) +.if ${PORT_OPTIONS:MXCURSES} CONFIGURE_ARGS+=--with-xcurses \ --with-cursesincdir=${LOCALBASE}/include \ --with-curseslibdir=${LOCALBASE}/lib @@ -52,7 +54,7 @@ PLIST_SUB= XCURSES="" NCURSES="@comment " PLIST_SUB= XCURSES="@comment " NCURSES="" .endif -.if defined(WITH_REXX_REGINA) +.if ${PORT_OPTIONS:MREXX_REGINA} BUILD_DEPENDS+= regina:${PORTSDIR}/lang/rexx-regina RUN_DEPENDS+= regina:${PORTSDIR}/lang/rexx-regina CONFIGURE_ARGS+= --with-rexx=regina @@ -63,12 +65,12 @@ CONFIGURE_ARGS+= --with-rexx=rexximc .endif post-install: -.if defined(WITH_XCURSES) +.if ${PORT_OPTIONS:MXCURSES} @${LN} -sf xthe ${PREFIX}/bin/the .else @${LN} -sf nthe ${PREFIX}/bin/the .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${PREFIX}/share/doc/THE ${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/THE .endif diff --git a/emulators/advancemame/Makefile b/emulators/advancemame/Makefile index 7e6e0164b5de..214cad405c22 100644 --- a/emulators/advancemame/Makefile +++ b/emulators/advancemame/Makefile @@ -23,8 +23,8 @@ GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -idirafter ${LOCALBASE}/include -OPTIONS= FREETYPE "Enable FreeType2 support" off \ - SLANG "Enable sLang support (for video driver)" off +OPTIONS_DEFINE= FREETYPE SLANG DOCS +SLANG_DESC= Enable sLang support (for video driver) MAN1= advdev.1 advj.1 advk.1 advm.1 advmame.1 advs.1 @@ -37,13 +37,13 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm BROKEN= Does not compile on powerpc .endif -.if defined(WITH_FREETYPE) +.if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 .else CONFIGURE_ARGS+=--disable-freetype .endif -.if defined(WITH_SLANG) +.if ${PORT_OPTIONS:MSLANG} LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2 .else CONFIGURE_ARGS+=--disable-slang @@ -52,7 +52,7 @@ CONFIGURE_ARGS+=--disable-slang post-patch: @${REINPLACE_CMD} -Ee 's|^(pkg.*)/advance|\1/${PORTNAME}|' \ ${WRKSRC}/advance/advance.mak -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/pkgdocdir/d' ${WRKSRC}/advance/advance.mak .endif diff --git a/emulators/advancemenu/Makefile b/emulators/advancemenu/Makefile index e49737656292..6c86df379023 100644 --- a/emulators/advancemenu/Makefile +++ b/emulators/advancemenu/Makefile @@ -23,8 +23,8 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= FREETYPE "Enable FreeType2 support" off \ - SLANG "Enable sLang support (for video driver)" off +OPTIONS_DEFINE= FREETYPE SLANG DOCS +SLANG_DESC= Enable sLang support (for video driver) MAN1= advmenu.1 @@ -34,13 +34,13 @@ MAN1= advmenu.1 BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif -.if defined(WITH_FREETYPE) +.if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 .else CONFIGURE_ARGS+=--disable-freetype .endif -.if defined(WITH_SLANG) +.if ${PORT_OPTIONS:MSLANG} LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2 .else CONFIGURE_ARGS+=--disable-slang @@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--disable-slang post-patch: @${REINPLACE_CMD} -Ee 's|^(pkg.*)/advance|\1/${PORTNAME}|; /pkgdir/d' \ ${WRKSRC}/advance/advance.mak -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '/pkgdocdir/d' ${WRKSRC}/advance/advance.mak .endif diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile index 92205cb8b5d0..e96adb741aea 100644 --- a/emulators/advancemess/Makefile +++ b/emulators/advancemess/Makefile @@ -23,8 +23,8 @@ GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -idirafter ${LOCALBASE}/include -OPTIONS= FREETYPE "Enable FreeType2 support" off \ - SLANG "Enable sLang support (for video driver)" off +OPTIONS_DEFINE= FREETYPE SLANG +SLANG_DESC= Enable sLang support (for video driver) MAN1= advmess.1 @@ -34,13 +34,13 @@ MAN1= advmess.1 BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif -.if defined(WITH_FREETYPE) +.if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 .else CONFIGURE_ARGS+=--disable-freetype .endif -.if defined(WITH_SLANG) +.if ${PORT_OPTIONS:MSLANG} LIB_DEPENDS+= slang.2:${PORTSDIR}/devel/libslang2 .else CONFIGURE_ARGS+=--disable-slang diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile index 6ff45127a3b4..4fffcc2a4315 100644 --- a/emulators/generator-cbiere/Makefile +++ b/emulators/generator-cbiere/Makefile @@ -25,9 +25,9 @@ USE_GMAKE= yes USE_GNOME= gtk12 MAKE_JOBS_UNSAFE= yes -OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - RAZE "Use RAZE z80 emulation (only for i386)" on \ - SDL_AUDIO "Use SDL for audio" off +OPTIONS_DEFINE= OPTIMIZED_CFLAGS RAZE SDL +RAZE_DESC= Use RAZE z80 emulation (only for i386) +SDL_DESC= Use SDL for audio GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-transform-name=s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/ @@ -41,18 +41,18 @@ LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} .include <bsd.port.pre.mk> -.if defined(WITHOUT_OPTIMIZED_CFLAGS) +.if empty(PORT_OPTIONS:MOPTIIMIZED_CFLAGS) CONFIGURE_ARGS+= --without-gcc .endif -.if !defined(WITHOUT_RAZE) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm CONFIGURE_ARGS+=--with-raze .else CONFIGURE_ARGS+=--with-cmz80 .endif -.if defined(WITH_SDL_AUDIO) +.if ${PORT_OPTIONS:MSDL} CONFIGURE_ARGS+=--with-sdl-audio .endif diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile index 28b3de210c98..d9afe2e18028 100644 --- a/emulators/generator/Makefile +++ b/emulators/generator/Makefile @@ -29,28 +29,28 @@ MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" MAKE_JOBS_UNSAFE= yes -OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - RAZE "Use RAZE z80 emulation (only for i386)" on \ - SDL_AUDIO "Use SDL for audio" off +OPTIONS_DEFINE= OPTIMIZED_CFLAGS RAZE SDL +RAZE_DESC= Use RAZE z80 emulation (only for i386) +SDL_DESC= Use SDL for audio PLIST_FILES= bin/${PORTNAME}-gtk .include <bsd.port.pre.mk> -.if !defined(WITHOUT_OPTIMIZED_CFLAGS) +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CONFIGURE_ARGS+=--with-gcc=3 .else CONFIGURE_ARGS+=--without-gcc .endif -.if !defined(WITHOUT_RAZE) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MRAZE} && ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm CONFIGURE_ARGS+=--with-raze .else CONFIGURE_ARGS+=--with-cmz80 .endif -.if defined(WITH_SDL_AUDIO) +.if ${PORT_OPTIONS:MSDL} CONFIGURE_ARGS+=--with-sdl-audio .endif diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index dcccb1bb99ac..d1e2aad796d5 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -14,7 +14,8 @@ MASTER_SITES= http://pages.cs.wisc.edu/~larus/SPIM/ MAINTAINER= ports@FreeBSD.org COMMENT= MIPS32 Simulator -OPTIONS= GUI "Graphical user interface" on +OPTIONS_DEFINE= GUI DOCS +OPTIONS_DEFAULT= GUI BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME} @@ -26,9 +27,9 @@ PORTDOCS= cycle.ps.gz spim.ps.gz SPIM.html PLIST_FILES= bin/spim %%DATADIR%%/exceptions.s PLIST_DIRS= %%DATADIR%% -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_GUI) +.if ${PORT_OPTIONS:MGUI} USE_XORG= x11 xaw BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake PLIST_FILES+= bin/xspim @@ -36,7 +37,7 @@ MAN1+= xspim.1 .endif post-build: -.if !defined(WITHOUT_GUI) +.if ${PORT_OPTIONS:MGUI} @(cd ${WRKSRC}/xspim && ${XMKMF} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}) .endif @@ -46,11 +47,11 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/Documentation/spim.man ${MANPREFIX}/man/man1/spim.1 ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/CPU/exceptions.s ${DATADIR}/exceptions.s -.if !defined(WITHOUT_GUI) +.if ${PORT_OPTIONS:MGUI} ${INSTALL_PROGRAM} ${WRKSRC}/xspim/xspim ${PREFIX}/bin/xspim ${INSTALL_MAN} ${WRKSRC}/Documentation/xspim.man ${MANPREFIX}/man/man1/xspim.1 .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/spim.ps ${DOCSDIR} @@ -58,4 +59,4 @@ do-install: ${GZIP_CMD} ${DOCSDIR}/cycle.ps ${DOCSDIR}/spim.ps .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile index 7134ae78df24..c3a0fb6bb3cb 100644 --- a/ftp/hsftp/Makefile +++ b/ftp/hsftp/Makefile @@ -21,11 +21,12 @@ MAKEFILE= makefile MAN1= hsftp.1 PLIST_FILES= bin/hsftp -OPTIONS= OPENSSH "Build with OpenSSH support" off +OPTIONS_DEFINE= OPENSSH +OPENSSH_DESC= Build with OpenSSH support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_OPENSSH) +.if ${PORT_OPTIONS:MOPENSSH} RUN_DEPENDS+= ssh:${PORTSDIR}/security/openssh CONFIGURE_ARGS+= --with-openssh .endif @@ -37,4 +38,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hsftp ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/hsftp.1 ${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 09078f894680..2ef0aa33ff90 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -25,15 +25,15 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= UTF8 "Enable UTF8 support" off \ - TCL "Enable TCL support" off \ - SSL "Enable OpenSSL support" off \ - GNUTLS "Enable gnutls support" on \ - IPV6 "Enable IPv6 support" on \ - PERL "Enable PERL support" off \ - MYSQL "Enable MYSQL backend" off \ - AVAHI "Enable Zeroconf support using Avahi" on \ - HOWL "Enable Zeroconf support using Howl" off +OPTIONS_DEFINE= UTF8 TCL OPENSSL GNUTLS IPV6 PERL MYSQL ZEROCONF +OPTIONS_SINGLE= ZEROCONF +OPTIONS_SINGLE_ZEROCONF= AVAHI HOWL +OPTIONS_DEFAULT= GNUTLS IPV6 ZEROCONF AVAHI + +UTF8_DESC= Enable UTF8 support +ZEROCONF_DESC= Enable Zeroconf support +HOWL_DESC= Enable Zeroconf support using Howl +AVAHI_DESC= Enable Zeroconf support using Avahi MAN1= siteconfig.1 \ siteuptime.1 \ @@ -41,15 +41,15 @@ MAN1= siteconfig.1 \ wzd-config.1 MAN8= wzdftpd.8 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_UTF8) +.if ${PORT_OPTIONS:MUTF8} USE_ICONV= yes .else CONFIGURE_ARGS+= --disable-utf8 .endif -.if defined(WITH_TCL) +.if ${PORT_OPTIONS:MTCL} LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 CONFIGURE_ARGS+= --with-tcl='${PREFIX}/lib/tcl8.4' PLIST_SUB+= TCL="" @@ -58,24 +58,23 @@ CONFIGURE_ARGS+= --without-tcl PLIST_SUB+= TCL="@comment " .endif -.if defined(WITH_SSL) -#USE_OPENSSL= yes -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +.if ${PORT_OPTIONS:MOPENSSL} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= --disable-gnutls .endif -.if !defined(WITH_IPV6) +.if !${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif -.if !defined(WITH_PERL) +.if !${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+= --disable-perl PLIST_SUB+= PERL="@comment " .else @@ -83,7 +82,7 @@ USE_PERL5= yes PLIST_SUB+= PERL="" .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes PLIST_SUB+= MYSQL="" .else @@ -91,19 +90,19 @@ CONFIGURE_ARGS+= --disable-mysql PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_AVAHI) || defined(WITH_HOWL) +.if ${PORT_OPTIONS:MZEROCONF} PLIST_SUB+= ZEROCONF="" .else PLIST_SUB+= ZEROCONF="@comment " .endif -.if defined(WITH_AVAHI) && !defined(WITH_HOWL) +.if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus \ avahi-core.7:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --with-zeroconf --enable-avahi .endif -.if defined(WITH_HOWL) && !defined(WITH_AVAHI) +.if ${PORT_OPTIONS:MHOWL} CFLAGS+= -I${LOCALBASE}/include/howl LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl CONFIGURE_ARGS+= --with-zeroconf --enable-howl @@ -116,11 +115,11 @@ post-patch: @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|" ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |