diff options
38 files changed, 276 insertions, 190 deletions
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile index 64ba3919bada..4322b5bf324f 100644 --- a/archivers/dpkg/Makefile +++ b/archivers/dpkg/Makefile @@ -38,7 +38,9 @@ CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \ --disable-compiler-warnings CONFIGURE_ENV+= PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}" -.if !defined(WITHOUT_NLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} MANLANG= "" de fr hu ja pl sv USE_GETTEXT= yes PLIST_SUB+= NLS="" diff --git a/archivers/dpkg/Makefile.man b/archivers/dpkg/Makefile.man index 72aa5ca86f3a..97647a0ed701 100644 --- a/archivers/dpkg/Makefile.man +++ b/archivers/dpkg/Makefile.man @@ -73,7 +73,7 @@ MAN8_EN= dpkg-divert.8 \ start-stop-daemon.8 \ update-alternatives.8 -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} MAN1_DE= dpkg-architecture.1 \ dpkg-buildpackage.1 \ dpkg-checkbuilddeps.1 \ diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 543d80d800e1..35921ca97a34 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -38,12 +38,14 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl CONFIGURE_ARGS+=--with-gtk-version=gtk2 -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif post-install: diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile index 878b59924d3b..f0ccd5422946 100644 --- a/deskutils/treeline/Makefile +++ b/deskutils/treeline/Makefile @@ -7,7 +7,7 @@ PORTNAME= treeline PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/:treeline \ http://treeline.bellz.org/plugins/:plugins \ @@ -24,11 +24,6 @@ LICENSE= GPLv2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network -OPTIONS= ASPELL "install with aspell support" off \ - ISPELL "install with ispell support" off \ - PYXML "use pythons py-xml instead of textproc/expat2" on \ - HTTPLOAD "install httpLoad plugin" off - WRKSRC= ${WRKDIR}/TreeLine USE_QT4= # empty USE_PYTHON= 2.5+ @@ -38,21 +33,32 @@ DESKTOP_ENTRIES= "TreeLine" "Structured information storage program" \ "${DATADIR}/icons/tree/treeline.png" "treeline" \ "Utility;" false +OPTIONS_DEFINE= HTTPLOAD PYXML +OPTIONS_SINGLE= SPELLER +OPTIONS_SINGLE_SPELLER= ASPELL ISPELL + +ASPELL_DESC= Install with aspell support +HTTPLOAD_DESC= Install httpLoad plugin +ISPELL_DESC= Install with ispell support +PYXML_DESC= Use pythons py-xml instead of textproc/expat2 + +OPTIONS_DEFAULT= ASPELL PYXML + .include <bsd.port.options.mk> -.if defined(WITH_ASPELL) +.if ${PORT_OPTIONS:MASPELL} BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell .endif -.if defined(WITH_ISPELL) +.if ${PORT_OPTIONS:MISPELL} BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .endif -.if defined(WITHOUT_PYXML) +.if !${PORT_OPTIONS:MPYXML} LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 .endif -.if defined(WITH_HTTPLOAD) +.if ${PORT_OPTIONS:MHTTPLOAD} DISTFILES+= httpload2.py:plugins PLIST_SUB+= HTTPLOAD="" .else @@ -62,14 +68,14 @@ PLIST_SUB+= HTTPLOAD="@comment " do-install: @cd ${WRKSRC} && ${PYTHON_CMD} install.py \ -p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -x -.if defined(WITH_HTTPLOAD) +.if ${PORT_OPTIONS:MHTTPLOAD} @${INSTALL_DATA} -d ${PREFIX}/lib/${PORTNAME}/plugins/ @${INSTALL_DATA} ${DISTDIR}/httpload2.py ${PREFIX}/lib/${PORTNAME}/plugins/ .endif post-install: ${RM} ${DOCSDIR}/INSTALL ${DOCSDIR}/LICENSE -.if defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} ${RM} ${DOCSDIR}/* ${RMDIR} ${DOCSDIR} .endif diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index 8ff426f6d96c..24ffa14bfde7 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -26,14 +26,18 @@ MAKE_JOBS_SAFE= yes CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+= --without-documentation -.else +OPTIONS_DEFINE= DEBUG + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --with-documentation=${DOCSDIR} PORTDOCS= * +.else +CONFIGURE_ARGS+= --without-documentation .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile index a206a2cc93cd..4c2a281f4676 100644 --- a/finance/homebank/Makefile +++ b/finance/homebank/Makefile @@ -17,8 +17,6 @@ COMMENT= Manage your personal accounts at home LICENSE= GPLv2 LICENSE_FILE_GPLv2=${WRKSRC}/COPYING -OPTIONS= OFX "Enable libOFX support" on - USE_GNOME= desktopfileutils gnomehier gtk20 USE_GETTEXT= yes USE_GMAKE= yes @@ -28,20 +26,24 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= OFX +OFX_DESC= Enable libOFX support +OPTIONS_DEFAULT=OFX -.if defined(WITHOUT_OFX) -CONFIGURE_ARGS+=--without-ofx -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MOFX} LIB_DEPENDS+= ofx.5:${PORTSDIR}/finance/libofx CONFIGURE_ARGS+=--with-ofx +.else +CONFIGURE_ARGS+=--without-ofx .endif post-extract: @${CHMOD} ${BINMODE} ${WRKSRC}/install-sh post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in AUTHORS ChangeLog NEWS README ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} @@ -50,4 +52,4 @@ post-install: @-update-desktop-database @-update-mime-database ${PREFIX}/share/mime -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile index a892c5360113..5ba395049aa3 100644 --- a/graphics/mirage/Makefile +++ b/graphics/mirage/Makefile @@ -37,7 +37,7 @@ post-patch: 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in CHANGELOG README TODO TRANSLATORS ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile index 13c3b0345bd6..e43573c2aa06 100644 --- a/mail/claws-mail-address_keeper/Makefile +++ b/mail/claws-mail-address_keeper/Makefile @@ -28,12 +28,14 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile index f74eef20ceae..aa71d408212b 100644 --- a/mail/claws-mail-attach_warner/Makefile +++ b/mail/claws-mail-attach_warner/Makefile @@ -32,12 +32,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-iconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile index f8ac983f4c43..c847986f9abc 100644 --- a/mail/claws-mail-bsfilter/Makefile +++ b/mail/claws-mail-bsfilter/Makefile @@ -29,12 +29,14 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile index 0db07d4bfe0a..1ed73401fe52 100644 --- a/mail/claws-mail-clamd/Makefile +++ b/mail/claws-mail-clamd/Makefile @@ -29,12 +29,14 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif post-install: diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile index 8b335d90c4be..3016bf4ff461 100644 --- a/mail/claws-mail-fancy/Makefile +++ b/mail/claws-mail-fancy/Makefile @@ -35,12 +35,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile index 0d9fd8b44d84..6bede469c74d 100644 --- a/mail/claws-mail-gdata/Makefile +++ b/mail/claws-mail-gdata/Makefile @@ -32,12 +32,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile index 2d11de019d46..d94e792fb935 100644 --- a/mail/claws-mail-gtkhtml2_viewer/Makefile +++ b/mail/claws-mail-gtkhtml2_viewer/Makefile @@ -33,12 +33,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile index 37a0c92035fe..5199984a0cc0 100644 --- a/mail/claws-mail-notification/Makefile +++ b/mail/claws-mail-notification/Makefile @@ -32,12 +32,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile index 43ca5bbb6516..55132f97f2e3 100644 --- a/mail/claws-mail-python/Makefile +++ b/mail/claws-mail-python/Makefile @@ -30,12 +30,14 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile index 718e808bdc2f..64e714eb620e 100644 --- a/mail/claws-mail-rssyl/Makefile +++ b/mail/claws-mail-rssyl/Makefile @@ -32,12 +32,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile index af4e499534f6..843405f66d2d 100644 --- a/mail/claws-mail-spamreport/Makefile +++ b/mail/claws-mail-spamreport/Makefile @@ -33,12 +33,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile index ebf0cfd49b42..704959ec0fa7 100644 --- a/mail/claws-mail-tnef/Makefile +++ b/mail/claws-mail-tnef/Makefile @@ -32,12 +32,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile index 290d0e7ea5ed..5d1699b3c76b 100644 --- a/mail/claws-mail-vcalendar/Makefile +++ b/mail/claws-mail-vcalendar/Makefile @@ -34,12 +34,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .include <bsd.port.mk> diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 7aadbe20d925..2a1574d06e9c 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -51,23 +51,25 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= BOGOFILTER "Enable bogofilter plugin" off \ - COMPFACE "Enable X-Face support" on \ - DEBUG "Enable debug support" off \ - DILLO "Enable Dillo HTML viewer plugin" off \ - ENCHANT "Enable spell checking support" on \ - GPGME "Enable PGP/GnuPG/SMIME plugins" off \ - IPV6 "Enable IPv6 support" on \ - JPILOT "Enable JPilot plugin" off \ - LDAP "Enable LDAP support" off \ - MANUAL "Build and install manual files" on \ - SPAMASSASSIN "Enable SpamAssassin plugin" off \ - STARTUP "Enable startup notification support" on \ - THEMES "Install additional themes" on +OPTIONS_DEFINE= BOGOFILTER COMPFACE DEBUG DILLO ENCHANT GPGME IPV6 JPILOT LDAP \ + MANUAL SPAMASSASSIN STARTUP THEMES + +BOGOFILTER_DESC= Enable bogofilter plugin +COMPFACE_DESC= Enable X-Face support +DILLO_DESC= Enable Dillo HTML viewer plugin +ENCHANT_DESC= Enable spell checking support +GPGME_DESC= Enable PGP/GnuPG/SMIME plugins +JPILOT_DESC= Enable JPilot plugin +MANUAL_DESC= Build and install manual files +SPAMASSASSIN_DESC= Enable SpamAssassin plugin +STARTUP_DESC= Enable startup notification support +THEMES_DESC= Install additional themes + +OPTIONS_DEFAULT= COMPFACE ENCHANT IPV6 MANUAL STARTUP THEMES .include <bsd.port.options.mk> -.if defined(WITH_BOGOFILTER) +.if ${PORT_OPTIONS:MBOGOFILTER} RUN_DEPENDS+= bogofilter:${PORTSDIR}/mail/bogofilter CONFIGURE_ARGS+= --enable-bogofilter-plugin PLIST_SUB+= BOGO_PLUG="" @@ -76,21 +78,21 @@ CONFIGURE_ARGS+= --disable-bogofilter-plugin PLIST_SUB+= BOGO_PLUG="@comment " .endif -.if defined(WITH_COMPFACE) +.if ${PORT_OPTIONS:MCOMPFACE} LIB_DEPENDS+= compface.1:${PORTSDIR}/mail/faces CONFIGURE_ARGS+= --enable-compface .else CONFIGURE_ARGS+= --disable-compface .endif -.if defined(WITH_ENCHANT) +.if ${PORT_OPTIONS:MENCHANT} LIB_DEPENDS+= enchant:${PORTSDIR}/textproc/enchant CONFIGURE_ARGS+= --enable-enchant .else CONFIGURE_ARGS+= --disable-enchant .endif -.if defined(WITH_JPILOT) +.if ${PORT_OPTIONS:MJPILOT} LIB_DEPENDS+= pisock:${PORTSDIR}/palm/pilot-link RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot CONFIGURE_ARGS+= --enable-jpilot @@ -98,14 +100,14 @@ CONFIGURE_ARGS+= --enable-jpilot CONFIGURE_ARGS+= --disable-jpilot .endif -.if defined(WITH_LDAP) +.if ${PORT_OPTIONS:MLDAP} USE_OPENLDAP= yes CONFIGURE_ARGS+= --enable-ldap .else CONFIGURE_ARGS+= --disable-ldap .endif -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils CONFIGURE_ARGS+= --enable-manual --with-manualdir=${DOCSDIR}/manual PLIST_SUB+= MANUAL="" @@ -114,7 +116,7 @@ CONFIGURE_ARGS+= --disable-manual PLIST_SUB+= MANUAL="@comment " .endif -.if defined(WITH_SPAMASSASSIN) +.if ${PORT_OPTIONS:MSPAMASSASSIN} RUN_DEPENDS+= spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin CONFIGURE_ARGS+= --enable-spamassassin-plugin PLIST_SUB+= SA_PLUG="" @@ -123,7 +125,7 @@ CONFIGURE_ARGS+= --disable-spamassassin-plugin PLIST_SUB+= SA_PLUG="@comment " .endif -.if defined(WITH_GPGME) +.if ${PORT_OPTIONS:MGPGME} PLIST_SUB+= GPGME="" CONFIGURE_ARGS+= --enable-pgpmime-plugin --enable-pgpcore-plugin \ --enable-pgpinline-plugin --enable-smime-plugin @@ -136,11 +138,11 @@ CONFIGURE_ARGS+= --disable-pgpmime-plugin --disable-pgpcore-plugin \ --disable-pgpinline-plugin --disable-smime-plugin .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-maintainer-mode --enable-crash-dialog .endif -.if defined(WITH_DILLO) +.if ${PORT_OPTIONS:MDILLO} PLIST_SUB+= DILLO="" RUN_DEPENDS+= dillo:${PORTSDIR}/www/dillo .else @@ -148,20 +150,20 @@ PLIST_SUB+= DILLO="@comment " CONFIGURE_ARGS+= --disable-dillo-viewer-plugin .endif -.if !defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif -.if !defined(WITHOUT_STARTUP) +.if ${PORT_OPTIONS:MSTARTUP} LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CONFIGURE_ARGS+= --enable-startup-notification .else CONFIGURE_ARGS+= --disable-startup-notification .endif -.if !defined(WITHOUT_THEMES) +.if ${PORT_OPTIONS:MTHEMES} RUN_DEPENDS+= ${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${PORTSDIR}/x11-themes/claws-mail-themes .endif @@ -178,7 +180,7 @@ post-patch: ${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in NEWS RELEASE_NOTES README TODO @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} diff --git a/mail/clawsker/Makefile b/mail/clawsker/Makefile index 0cd6b2d4686d..aa3f84a380ed 100644 --- a/mail/clawsker/Makefile +++ b/mail/clawsker/Makefile @@ -24,16 +24,18 @@ USE_PERL5= 5.8.0+ MAN1= clawsker.1 -.if defined(WITHOUT_NLS) -EXTRA_PATCHES= ${FILESDIR}/extra-Makefile-without_nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +EXTRA_PATCHES= ${FILESDIR}/extra-Makefile-without_nls +PLIST_SUB+= NLS="@comment " .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index 8eb0fd201b83..ab9f9c6e5a91 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -29,21 +29,29 @@ MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -OPTIONS= GNUTLS "Enable gnuTLS support" off \ - IPV6 "Enable ipv6 support." on +OPTIONS_DEFINE= IPV6 +OPTIONS_SINGLE= CRYPTO +OPTIONS_SINGLE_CRYPTO= GNUTLS OPENSSL +GNUTLS_DESC= Enable GNUTLS support +OPENSSL_DESC= Enable OpenSSL support +OPTIONS_DEFAULT= IPV6 OPENSSL -.if defined(WITH_GNUTLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --without-openssl --with-gnutls -.else +.endif + +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+= --without-gnutls .endif -.if defined(WITHOUT_IPV6) -CONFIGURE_ARGS+= --disable-ipv6 -.else +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 .endif AUTOTOOLSFILES= aclocal.m4 diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index 26e508bec339..3a0a401fcc96 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -41,9 +41,6 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 \ x264:${PORTSDIR}/multimedia/x264 \ xmms:${PORTSDIR}/multimedia/xmms -OPTIONS= DOXYGEN "Build Doxygen documentation" off \ - FREI0R "Enable frei0r support" off - WRKSRC= ${WRKDIR}/${DISTNAME:L} USE_BZIP2= yes @@ -71,16 +68,20 @@ DOC_FILES= AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \ PORT_VERBS= lives LiVES _encoder.py midistart midistop smogrify sendOSC +OPTIONS_DEFINE= DOXYGEN FREI0R +DOXYGEN_DESC= Build Doxygen documentation +FREI0R_DESC= Enable frei0r support + .include <bsd.port.options.mk> -.if !defined(NOPORTDOCS) && defined(WITH_DOXYGEN) +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen PORTDOCS= html .else CONFIGURE_ARGS+=--disable-doxygen .endif -.if defined(WITH_FREI0R) +.if ${PORT_OPTIONS:MFREI0R} BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r RUN_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r PLIST_SUB+= FREI0R="" @@ -89,12 +90,12 @@ CONFIGURE_ENV+= ac_cv_header_frei0r_h=no PLIST_SUB+= FREI0R="@comment " .endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif post-patch: @@ -129,7 +130,7 @@ pre-build: ${MAKEFILE} update-po post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile index 9a7e186caa0a..4df737e50007 100644 --- a/multimedia/smtube/Makefile +++ b/multimedia/smtube/Makefile @@ -21,6 +21,8 @@ USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build \ corelib gui network xml INSTALLS_ICONS= yes +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e 's|qmake|${QMAKE}|g' \ -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \ @@ -28,7 +30,7 @@ post-patch: -e 's|$$(PREFIX)/share/smtube|${DATADIR}|g' \ ${WRKSRC}/Makefile -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|$$(PREFIX)/share/doc/smtube|${DOCSDIR}|' \ ${WRKSRC}/Makefile PORTDOCS= * diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 5e7fcf1f5d94..686f2ef22a24 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -33,7 +33,9 @@ MAN1= yaz-asncomp.1 yaz-client.1 yaz-config.1 yaz-iconv.1 \ MAN7= bib1-attr.7 yaz-log.7 yaz.7 MAN8= yaz-ztest.8 -.if defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if !${PORT_OPTIONS:MDOCS} EXTRA_PATCHES+= ${FILESDIR}/extrapatch-doc__Makefile.in .endif diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile index 1e94e4db4234..374efbf0184e 100644 --- a/polish/ekg2/Makefile +++ b/polish/ekg2/Makefile @@ -25,16 +25,6 @@ USE_GNOME= gnomehack pkgconfig USE_ICONV= yes MAKE_JOBS_SAFE= yes -OPTIONS= ASPELL "Enable spell checking support" on \ - GPG "Enable gpg plugin" off \ - GSM "Enable gsm audio plugin" off \ - GTK2 "Enable gtk plugin" off \ - PERL "Enable perl plugin" off \ - PYTHON "Enable python plugin" off \ - SQLITE "Enable sqlite plugin" off \ - UNICODE "Enable unicode (experimental)" off \ - XOSD "Enable xosd plugin" off - CONFIGURE_ARGS+= --enable-shared \ --disable-static \ --enable-dynamic \ @@ -50,9 +40,23 @@ CONFIGURE_ARGS+= --enable-shared \ LDFLAGS+= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS} CFLAGS+= -I${LOCALBASE}/include +OPTIONS_DEFINE= ASPELL GPG GSM GTK2 PERL PYTHON SQLITE UNICODE XOSD + +ASPELL_DESC= Enable spell checking support +GPG_DESC= Enable gpg plugin +GSM_DESC= Enable gsm audio plugin +GTK2_DESC= Enable gtk plugin +PERL_DESC= Enable perl plugin +PYTHON_DESC= Enable python plugin +SQLITE_DESC= Enable sqlite plugin +UNICODE_DESC= Enable unicode (experimental) +XOSD_DESC= Enable xosd plugin + +OPTIONS_DEFAULT=ASPELL + .include <bsd.port.options.mk> -.if defined(WITH_ASPELL) +.if ${PORT_OPTIONS:MASPELL} LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell RUN_DEPENDS+= ${LOCALBASE}/share/aspell/pl.rws:${PORTSDIR}/polish/aspell CONFIGURE_ARGS+= --with-aspell @@ -60,7 +64,7 @@ CONFIGURE_ARGS+= --with-aspell CONFIGURE_ARGS+= --without-aspell .endif -.if defined(WITH_GPG) +.if ${PORT_OPTIONS:MGPG} LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme \ gpg-error:${PORTSDIR}/security/libgpg-error RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg @@ -71,7 +75,7 @@ CONFIGURE_ARGS+= --without-gpg PLIST_SUB+= GPG_PLUGIN="@comment " .endif -.if defined(WITH_GSM) +.if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm CONFIGURE_ARGS+= --with-libgsm PLIST_SUB+= GSM_PLUGIN="" @@ -80,7 +84,7 @@ CONFIGURE_ARGS+= --without-libgsm PLIST_SUB+= GSM_PLUGIN="@comment " .endif -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 CONFIGURE_ARGS+= --with-gtk PLIST_SUB+= GTK2_PLUGIN="" @@ -89,16 +93,16 @@ CONFIGURE_ARGS+= --without-gtk PLIST_SUB+= GTK2_PLUGIN="@comment " .endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes CONFIGURE_ARGS+= --with-perl PLIST_SUB+= PERL_PLUGIN="" @@ -107,7 +111,7 @@ CONFIGURE_ARGS+= --without-perl PLIST_SUB+= PERL_PLUGIN="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes CONFIGURE_ARGS+= --with-python PLIST_SUB+= PYTHON_PLUGIN="" @@ -116,7 +120,7 @@ CONFIGURE_ARGS+= --without-python PLIST_SUB+= PYTHON_PLUGIN="@comment " .endif -.if defined(WITH_SQLITE) +.if ${PORT_OPTIONS:MSQLITE} LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-sqlite3 PLIST_SUB+= SQLITE_PLUGIN="" @@ -125,11 +129,11 @@ CONFIGURE_ARGS+= --without-sqlite3 PLIST_SUB+= SQLITE_PLUGIN="@comment " .endif -.if defined(WITH_UNICODE) +.if ${PORT_OPTIONS:MUNICODE} CONFIGURE_ARGS+= --enable-unicode .endif -.if defined(WITH_XOSD) +.if ${PORT_OPTIONS:MXOSD} LIB_DEPENDS+= xosd:${PORTSDIR}/misc/xosd CONFIGURE_ARGS+= --with-libxosd PLIST_SUB+= XOSD_PLUGIN="" @@ -139,12 +143,12 @@ PLIST_SUB+= XOSD_PLUGIN="@comment " .endif post-patch: -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \ ${WRKSRC}/contrib/python/notify-bubble.py .endif -.if defined(WITH_UNICODE) +.if ${PORT_OPTIONS:MUNICODE} @${REINPLACE_CMD} -e 's|ncursesw/||' ${WRKSRC}/configure \ ${WRKSRC}/plugins/ncurses/ecurses.h .endif diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index 8888a4d2f09c..98e674d981c7 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -52,11 +52,12 @@ USE_QT4= dbus gui network script scripttools webkit xml phonon \ WANT_GNOME= yes INSTALLS_ICONS= yes -OPTIONS= GG_EMOTS "Install GG-compatible emoticons" off +OPTIONS_DEFINE= GG_EMOTS +GG_EMOTS_DESC= Install GG-compatible emoticons .include <bsd.port.options.mk> -.if defined(WITH_GG_EMOTS) +.if ${PORT_OPTIONS:MGG_EMOTS} PLIST_SUB+= GG_EMOTS="" DISTFILES+= ${GG6_EMOTS_DISTFILE}:additions \ ${GG7_EMOTS_DISTFILE}:additions @@ -72,7 +73,7 @@ post-patch: @${FIND} ${WRKSRC} -exec ${GREP} -q "#!/bin/bash" {} \; \ -exec ${REINPLACE_CMD} -e 's|#!/bin/bash|#!/usr/bin/env bash|g' {} \; -.if defined(WITH_GG_EMOTS) +.if ${PORT_OPTIONS:MGG_EMOTS} @cd ${WRKSRC}/varia/themes/emoticons && \ ${TAR} -zxf ${_DISTDIR}/${GG6_EMOTS_DISTFILE} && \ ${MV} kompatybilne_z_GG6 gg6_compatible && \ diff --git a/polish/libgadu/Makefile b/polish/libgadu/Makefile index e77a71469932..dfc8d8952c44 100644 --- a/polish/libgadu/Makefile +++ b/polish/libgadu/Makefile @@ -25,17 +25,19 @@ CONFIGURE_ARGS= --enable-shared --disable-static --with-pthread \ USE_LDCONFIG= yes -OPTIONS= OPENSSL "Build with OpenSSL support" on - PLIST_FILES= include/libgadu.h \ lib/libgadu.la \ lib/libgadu.so \ lib/libgadu.so.3 \ libdata/pkgconfig/libgadu.pc +OPTIONS_DEFINE= OPENSSL +OPENSSL_DESC= Build with OpenSSL support +OPTIONS_DEFAULT=OPENSSL + .include <bsd.port.pre.mk> -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} .include "${PORTSDIR}/Mk/bsd.openssl.mk" .else CONFIGURE_ARGS+= --without-openssl @@ -46,7 +48,7 @@ post-patch: pre-install: # OpenSSL from base system lacks .pc file for pkgconfig -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} @${REINPLACE_CMD} -e 's|openssl| |g' ${WRKSRC}/pkgconfig/libgadu.pc .endif diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile index 7701eaa2e942..2c4ef4c5cc2d 100644 --- a/polish/qnapi/Makefile +++ b/polish/qnapi/Makefile @@ -29,6 +29,8 @@ MANCOMPRESSED= yes PORTDOCS= ChangeLog changelog.gz README README.pl LICENSE \ LICENSE.pl COPYRIGHT +.include <bsd.port.options.mk> + post-patch: @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' \ doc/qnapi.desktop doc/qnapi-download.desktop @@ -39,7 +41,7 @@ pre-build: @cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} ${QMAKEFLAGS} ${QMAKE_ARGS} post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index a959fc0dcec6..41375972f36c 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -29,8 +29,10 @@ MAN1= gsmartcontrol.1 CONFIGURE_ARGS= --disable-libglade +.include <bsd.port.options.mk> + post-patch: -.if defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in .endif diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile index 7a28272b56a2..08be10146651 100644 --- a/textproc/coccigrep/Makefile +++ b/textproc/coccigrep/Makefile @@ -23,13 +23,15 @@ MANCOMPRESSED= no MAN1= coccigrep.1 +.include <bsd.port.options.mk> + post-install: ${INSTALL_MAN} ${WRKSRC}/coccigrep.1 ${MANPREFIX}/man/man1 ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/editors/cocci-grep.el ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/editors/cocci-grep.vim ${DATADIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.rst ${DOCSDIR} diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile index 82e5c7e6c914..b1563f1fbf14 100644 --- a/textproc/meld/Makefile +++ b/textproc/meld/Makefile @@ -24,14 +24,17 @@ MAKE_ARGS= prefix=${PREFIX} INSTALLS_ICONS= yes INSTALLS_OMF= yes -OPTIONS= PYGNOMEDESKTOP "Code syntax hilighting (many dependencies)" off +OPTIONS_DEFINE= PYGNOMEDESKTOP +PYGNOMEDESKTOP_DESC= Code syntax hilighting (many dependencies) -.if defined(WITHOUT_NLS) -EXTRA_PATCHES= ${FILESDIR}/extra-Makefile-without_nls -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +EXTRA_PATCHES= ${FILESDIR}/extra-Makefile-without_nls +PLIST_SUB+= NLS="@comment " .endif post-patch: @@ -48,9 +51,7 @@ post-patch: s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file} .endfor -.include <bsd.port.options.mk> - -.if defined(WITH_PYGNOMEDESKTOP) +.if ${PORT_OPTIONS:MPYGNOMEDESKTOP} USE_GNOME+= pygnomedesktop .endif diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile index e1da6a1ed715..6f4794e6158b 100644 --- a/www/netsurf/Makefile +++ b/www/netsurf/Makefile @@ -48,6 +48,8 @@ CSS_DISTNAME= libcss-0.1.2-src NSBMP_DISTNAME= libnsbmp-0.0.3-src NSGIF_DISTNAME= libnsgif-0.0.3-src +.include <bsd.port.options.mk> + post-patch: @${REINPLACE_CMD} -e \ 's| -O2 | |' ${WRKSRC}/Makefile.defaults @@ -85,7 +87,7 @@ do-install: @${FIND} ${DATADIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP} @${FIND} ${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx @${FIND} ${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} diff --git a/x11-fonts/freefont-ttf/Makefile b/x11-fonts/freefont-ttf/Makefile index 88900bcae0ef..bddb3433f062 100644 --- a/x11-fonts/freefont-ttf/Makefile +++ b/x11-fonts/freefont-ttf/Makefile @@ -22,12 +22,14 @@ LICENSE= GPLv3 WRKSRC= ${WRKDIR}/freefont-${PORTVERSION} INSTALLDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} +.include <bsd.port.options.mk> + do-build: cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontscale cd ${WRKSRC} && ${LOCALBASE}/bin/mkfontdir do-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR} diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile index d1b1ea68a76a..da00eb314a48 100644 --- a/x11-toolkits/c++-gtk-utils/Makefile +++ b/x11-toolkits/c++-gtk-utils/Makefile @@ -27,7 +27,11 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFIGURE_ARGS+=--docdir=${DOCSDIR} -.if defined(WITH_DEBUG) +OPTIONS_DEFINE= DEBUG + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile index 5a2009660923..5ab76d12e463 100644 --- a/x11-toolkits/termit/Makefile +++ b/x11-toolkits/termit/Makefile @@ -27,19 +27,23 @@ MAN1= ${PORTNAME}.1 TERMIT_ETC= ${PREFIX}/etc/xdg/${PORTNAME} -.if defined(WITH_DEBUG) +OPTIONS_DEFINE= DEBUG + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDEBUG} CMAKE_ARGS+= -DDEBUG:BOOL=YES .endif -.if defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} +PLIST_SUB+= NLS="" +.else CMAKE_ARGS+= -DENABLE_NLS:BOOL=NO PLIST_SUB+= NLS="@comment " -.else -PLIST_SUB+= NLS="" .endif post-patch: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} 's|../COPYING||' ${WRKSRC}/doc/CMakeLists.txt .else @${REINPLACE_CMD} '/TERMIT_DOCS/s|^|#|' ${WRKSRC}/doc/CMakeLists.txt diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile index d1ef1f14a6bc..44e733131c9c 100644 --- a/x11/xnee/Makefile +++ b/x11/xnee/Makefile @@ -15,9 +15,6 @@ COMMENT= X events recorder and player LICENSE= GPLv3 -OPTIONS= GNEE "Build the GUI frontend" off \ - PNEE "Build the Gnome Panel frontend" off - USE_XORG= xtst USE_GNOME= gnomehack USE_GMAKE= yes @@ -29,9 +26,13 @@ CONFIGURE_ARGS= --enable-cli --disable-doc --disable-xinput2 MAN1= cnee.1 xnee.1 INFO= xnee +OPTIONS_DEFINE= GNEE PNEE +GNEE_DESC= Build the GUI frontend +PNEE_DESC= Build the Gnome Panel frontend + .include <bsd.port.options.mk> -.if defined(WITH_GNEE) +.if ${PORT_OPTIONS:MGNEE} USE_GNOME+= gtk20 libgnomeui MAN1+= gnee.1 PLIST_SUB+= GNEE="" @@ -42,7 +43,7 @@ CONFIGURE_ARGS+=--disable-gui PLIST_SUB+= GNEE="@comment " .endif -.if defined(WITH_PNEE) +.if ${PORT_OPTIONS:MPNEE} USE_GNOME+= gnomepanel MAN1+= pnee.1 PLIST_SUB+= PNEE="" |