Date: Fri, 5 Oct 2012 15:02:44 +0000 (UTC) From: Beat Gaetzi <beat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305303 - in head: databases/rrdtool12 devel/kcachegrind mail/swaks www/fluxcms www/linkchecker x11-wm/fluxbox Message-ID: <201210051502.q95F2iL1090007@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Fri Oct 5 15:02:43 2012 New Revision: 305303 URL: http://svn.freebsd.org/changeset/ports/305303 Log: - Convert to optionsng - Trim Makefile header Modified: head/databases/rrdtool12/Makefile head/devel/kcachegrind/Makefile head/mail/swaks/Makefile head/www/fluxcms/Makefile head/www/linkchecker/Makefile head/x11-wm/fluxbox/Makefile Modified: head/databases/rrdtool12/Makefile ============================================================================== --- head/databases/rrdtool12/Makefile Fri Oct 5 14:52:51 2012 (r305302) +++ head/databases/rrdtool12/Makefile Fri Oct 5 15:02:43 2012 (r305303) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rrdtool12 -# Date created: 2 September 2008 -# Whom: Jeremy Chadwick <koitsu@FreeBSD.org> -# +# Created by: Jeremy Chadwick <koitsu@FreeBSD.org> # $FreeBSD$ -# PORTNAME= rrdtool PORTVERSION= 1.2.30 @@ -30,13 +26,12 @@ WANT_PERL= yes CONFIGURE_ARGS= --disable-tcl -OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \ - RUBY_MODULE "Build RUBY bindings" off \ - PERL_MODULE "Build PERL module" on +OPTIONS_DEFINE= PYTHON RUBY PERL DOCS EXAMPLES +OPTIONS_DEFAULT= PERL .include <bsd.port.pre.mk> -.if defined(WITH_PYTHON_MODULE) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes INSTALLS_EGGINFO=yes PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info @@ -48,7 +43,7 @@ CONFIGURE_ARGS+= --disable-python PLIST_SUB+= WITH_PYTHON="@comment " .endif -.if defined(WITH_RUBY_MODULE) +.if ${PORT_OPTIONS:MRUBY} USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" PLIST_SUB+= WITH_RUBY="" @@ -58,7 +53,7 @@ CONFIGURE_ARGS+= --disable-ruby PLIST_SUB+= WITH_RUBY="@comment " .endif -.if !defined(WITHOUT_PERL_MODULE) +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl --enable-perl-site-install PLIST_SUB+= WITH_PERL="" @@ -78,24 +73,24 @@ MAN1= bin_dec_hex.1 cdeftutorial.1 rpnt rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \ rrdxport.1 rrdlastupdate.1 -.if !defined(WITHOUT_PERL_MODULE) +.if ${PORT_OPTIONS:MPERL} MAN3= RRDp.3 RRDs.3 MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .endif post-extract: -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's/install-idocDATA install-ihtmlDATA//g' \ -e 's/^ cd .* rrdtool.html index.html/ #/' \ ${WRKSRC}/doc/Makefile.in .endif -.if defined(NOPORTEXAMPLES) +.if empty(PORT_OPTIONS:MEXAMPLES) ${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \ ${WRKSRC}/Makefile.in .endif post-install: -.if !defined(BATCH) && !defined(NOPORTEXAMPLES) +.if !defined(BATCH) && empty(PORT_OPTIONS:MEXAMPLES) @${ECHO_MSG} "" @${ECHO_MSG} "############################################################################" @${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code #" Modified: head/devel/kcachegrind/Makefile ============================================================================== --- head/devel/kcachegrind/Makefile Fri Oct 5 14:52:51 2012 (r305302) +++ head/devel/kcachegrind/Makefile Fri Oct 5 15:02:43 2012 (r305303) @@ -1,9 +1,5 @@ -# New ports collection makefile for: KCachegrind -# Date created: Jun 3 2004 -# Whom: Simon Barner <barner@gmx.de> -# +# Created by: Simon Barner <barner@gmx.de> # $FreeBSD$ -# PORTNAME= kcachegrind PORTVERSION= 0.7.0 @@ -25,17 +21,19 @@ USE_QT4= moc_build qmake_build rcc_build INSTALLS_ICONS= yes USE_GETTEXT= yes -OPTIONS= DOT "Use GraphViz/dot to render call graphs" on \ - VALGRIND "Install devel/valgrind" off +OPTIONS_DEFINE= DOT VALGRIND +OPTIONS_DEFAULT= DOT +DOT_DESC= Use GraphViz/dot to render call graphs +VALGRIND_DESC= Install devel/valgrind -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined (WITH_DOT) +.if ${PORT_OPTIONS:MDOT} RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz .endif -.if defined (WITH_VALGRIND) +.if ${PORT_OPTIONS:MVALGRIND} RUN_DEPENDS+= valgrind:${PORTSDIR}/devel/valgrind .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/swaks/Makefile ============================================================================== --- head/mail/swaks/Makefile Fri Oct 5 14:52:51 2012 (r305302) +++ head/mail/swaks/Makefile Fri Oct 5 15:02:43 2012 (r305303) @@ -1,9 +1,5 @@ -# New ports collection makefile for: swaks -# Date created: 29 Sep 2004 -# Whom: Oliver Eikemeier -# +# Created by: Oliver Eikemeier # $FreeBSD$ -# PORTNAME= swaks PORTVERSION= 20120320.0 @@ -15,23 +11,24 @@ COMMENT= Swiss Army Knife SMTP transacti PLIST_FILES= bin/${PORTNAME} -OPTIONS= PERL_NET_DNS "Add MX lookup support" off \ - PERL_NET_SSLEAY "Add TLS support" off \ - PERL_AUTHEN_NTLM "Add support for AUTH NTLM" off +OPTIONS_DEFINE= PERL_NET_DNS PERL_NET_SSLEAY PERL_AUTHEN_NTLM +PERL_NET_DNS_DESC= Add MX lookup support +PERL_NET_SSLEAY_DESC= Add TLS support +PERL_AUTHEN_NTLM_DESC= Add support for AUTH NTLM USE_PERL5_RUN= yes .include <bsd.port.pre.mk> -.if defined(WITH_PERL_NET_DNS) +.if ${PORT_OPTIONS:MPERL_NET_DNS} RUN_DEPENDS+= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS .endif -.if defined(WITH_PERL_NET_SSLEAY) +.if ${PORT_OPTIONS:MPERL_NET_SSLEAY} RUN_DEPENDS+= p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay .endif -.if defined(WITH_PERL_AUTHEN_NTLM) +.if ${PORT_OPTIONS:MPERL_AUTHEN_NTLM} RUN_DEPENDS+= p5-Authen-NTLM>=0:${PORTSDIR}/security/p5-Authen-NTLM .endif Modified: head/www/fluxcms/Makefile ============================================================================== --- head/www/fluxcms/Makefile Fri Oct 5 14:52:51 2012 (r305302) +++ head/www/fluxcms/Makefile Fri Oct 5 15:02:43 2012 (r305303) @@ -1,9 +1,4 @@ -# New ports collection makefile for: fluxcms -# Date created: 31 December 2005 -# Whom: beat -# # $FreeBSD$ -# PORTNAME= fluxcms PORTVERSION= 1.6.0 @@ -25,7 +20,7 @@ PLIST_SUB= INSTALLDIR=${FLUXCMSDIR} WWWO SUB_FILES= pkg-deinstall pkg-message SUB_LIST= INSTALLDIR=${INSTALLDIR} -OPTIONS= TIDY "Configure with tidy support" off +OPTIONS_DEFINE= TIDY USE_PHP= dom xml simplexml iconv mysql xsl session pcre gd @@ -36,7 +31,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .include <bsd.port.pre.mk> -.if defined(WITH_TIDY) +.if ${PORT_OPTIONS:MTIDY} USE_PHP+= tidy .endif Modified: head/www/linkchecker/Makefile ============================================================================== --- head/www/linkchecker/Makefile Fri Oct 5 14:52:51 2012 (r305302) +++ head/www/linkchecker/Makefile Fri Oct 5 15:02:43 2012 (r305303) @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: linkchecker -# Date created: Oct 17, 2003 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= linkchecker PORTVERSION= 6.6 @@ -18,7 +13,7 @@ COMMENT= Check HTML documents for broken RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:${PORTSDIR}/www/py-cssutils \ ${PYTHON_PKGNAMEPREFIX}utidy>=0.2:${PORTSDIR}/www/py-utidy -OPTIONS= GUI "Install GUI frontend dependencies" off +OPTIONS_DEFINE= GUI NLS LICENSE= GPLv2 @@ -33,14 +28,14 @@ MAN5= linkcheckerrc.5 .include <bsd.port.options.mk> -.if defined(WITH_GUI) +.if ${PORT_OPTIONS:MGUI} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}qt4-help>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-help \ ${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=${QSCI2_VERSION}:${PORTSDIR}/devel/py-qt4-qscintilla2 .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} MANLANG= "" de USE_GETTEXT= yes PLIST_SUB+= NLS="" @@ -49,7 +44,7 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} @cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/nls-patch-setup.py .else @${RM} ${WRKSRC}/po/*.po Modified: head/x11-wm/fluxbox/Makefile ============================================================================== --- head/x11-wm/fluxbox/Makefile Fri Oct 5 14:52:51 2012 (r305302) +++ head/x11-wm/fluxbox/Makefile Fri Oct 5 15:02:43 2012 (r305303) @@ -1,9 +1,5 @@ -# New ports collection makefile for: fluxbox -# Date created: 29 November 2001 -# Whom: spn -# +# Created by: spn # $FreeBSD$ -# PORTNAME= fluxbox PORTVERSION= 1.3.2 @@ -29,25 +25,22 @@ MAN5= fluxbox-apps.5 fluxbox-keys.5 flu fluxbox-style.5 DOCSVERSION= 20060629 -OPTIONS= DOCHTML "Install html documentation" off \ - DOCPDF "Install pdf documentation" off \ - DEBUG "Enable debugging support" off \ - GNOME "Enable GNOME support" off \ - IMLIB2 "Enable imlib2 support" off \ - XINERAMA "Enable xinerama support" off \ - XRENDER "Enable xrender support" on \ - NLS "Native language support" on \ - SLIT "Enable slit feature" on \ - REMEMBER "Enable remember feature" on \ - TOOLBAR "Enable toolbar feature" on +OPTIONS_DEFINE= DOCS DOCHTML PDF DEBUG GNOME IMLIB2 XINERAMA \ + XRENDER NLS SLIT REMEMBER TOOLBAR +OPTIONS_DEFAULT= XRENDER SLIT REMEMBER TOOLBAR +DOCHTML_DESC= Install html documentation +XRENDER_DESC= Enable xrender support +SLIT_DESC= Enable slit feature +REMEMBER_DESC= Enable remember feature +TOOLBAR_DESC= Enable toolbar feature .include <bsd.port.options.mk> -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif -.if defined(WITH_DOCHTML) +.if ${PORT_OPTIONS:MDOCHTML} # http://fluxbox.org/docbook/en/tarballs/ MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:html \ http://people.freebsd.org/~mezz/distfiles/:html @@ -58,7 +51,7 @@ PLIST_SUB+= DOCHTML:="" PLIST_SUB+= DOCHTML:="@comment " .endif -.if defined(WITH_DOCPDF) +.if ${PORT_OPTIONS:MPDF} # http://fluxbox.org/docbook/en/pdf/ MASTER_SITES+= ${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \ http://people.freebsd.org/~mezz/distfiles/:pdf @@ -68,19 +61,19 @@ PLIST_SUB+= DOCPDF:="" PLIST_SUB+= DOCPDF:="@comment " .endif -.if !defined(WITHOUT_IMLIB2) +.if ${PORT_OPTIONS:MIMLIB2} USE_EFL+= imlib2 CONFIGURE_ARGS+= --enable-imlib2 .else CONFIGURE_ARGS+= --disable-imlib2 .endif -.if defined(WITH_XINERAMA) || defined(PACKAGE_BUILDING) +.if ${PORT_OPTIONS:MXINERAMA} || defined(PACKAGE_BUILDING) USE_XORG+= xinerama CONFIGURE_ARGS+= --enable-xinerama .endif -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} USE_ICONV= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv" CPPFLAGS+= -I${LOCALBASE}/include @@ -93,25 +86,25 @@ CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS:="@comment " .endif -.if !defined(WITHOUT_REMEMBER) +.if ${PORT_OPTIONS:MREMEMBER} CONFIGURE_ARGS+= --enable-remember .else CONFIGURE_ARGS+= --disable-remember .endif -.if !defined(WITHOUT_SLIT) +.if ${PORT_OPTIONS:MSLIT} CONFIGURE_ARGS+= --enable-slit .else CONFIGURE_ARGS+= --disable-slit .endif -.if !defined(WITHOUT_TOOLBAR) +.if ${PORT_OPTIONS:MTOOLBAR} CONFIGURE_ARGS+= --enable-toolbar .else CONFIGURE_ARGS+= --disable-toolbar .endif -.if !defined(WITHOUT_XRENDER) +.if ${PORT_OPTIONS:MXRENDER} USE_XORG+= xrender CONFIGURE_ARGS+= --enable-xrender .else @@ -131,24 +124,24 @@ post-patch: ${WRKSRC}/util/fluxbox-generate_menu.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/util/fbsetbg -.if defined(WITHOUT_NLS) +.if empty(PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e 's|HAVE_ICONV=yes|HAVE_ICONV=no|g' \ ${WRKSRC}/configure .endif post-install: -.ifndef (NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.if defined(WITH_DOCPDF) +.if ${PORT_OPTIONS:MPDF} @${MKDIR} ${DOCSDIR}/pdf @${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \ ${DOCSDIR}/pdf/ .endif -.if defined(WITH_DOCHTML) +.if ${PORT_OPTIONS:MDOCHTML} @${MKDIR} ${DOCSDIR}/html @${INSTALL_DATA} ${WRKDIR}/html/*.css ${DOCSDIR}/html/ @${INSTALL_DATA} ${WRKDIR}/html/*.html ${DOCSDIR}/html/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210051502.q95F2iL1090007>