Index: head/databases/rrdtool12/Makefile =================================================================== --- head/databases/rrdtool12/Makefile (revision 305302) +++ head/databases/rrdtool12/Makefile (revision 305303) @@ -1,105 +1,100 @@ -# New ports collection makefile for: rrdtool12 -# Date created: 2 September 2008 -# Whom: Jeremy Chadwick -# +# Created by: Jeremy Chadwick # $FreeBSD$ -# PORTNAME= rrdtool PORTVERSION= 1.2.30 PORTREVISION= 2 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ MAINTAINER= beat@FreeBSD.org COMMENT= Round Robin Database Tools v1.2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ png15:${PORTSDIR}/graphics/png LATEST_LINK= ${PORTNAME}12 CONFLICTS= rrdtool-1.0* rrdtool-1.3* USE_AUTOTOOLS= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes 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 -.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 .include "${PORTSDIR}/Mk/bsd.python.mk" PLIST_SUB+= WITH_PYTHON="" CONFIGURE_ARGS+= --enable-python .else 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="" CONFIGURE_ARGS+= --enable-ruby .else 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="" .else CONFIGURE_ARGS+= --disable-perl PLIST_SUB+= WITH_PERL="@comment " .endif CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2 LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-ffast-math} MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \ rrdbuild.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 \ rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \ rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \ 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 #" @${ECHO_MSG} "############################################################################" .endif .include Index: head/devel/kcachegrind/Makefile =================================================================== --- head/devel/kcachegrind/Makefile (revision 305302) +++ head/devel/kcachegrind/Makefile (revision 305303) @@ -1,41 +1,39 @@ -# New ports collection makefile for: KCachegrind -# Date created: Jun 3 2004 -# Whom: Simon Barner -# +# Created by: Simon Barner # $FreeBSD$ -# PORTNAME= kcachegrind PORTVERSION= 0.7.0 PORTREVISION= 2 CATEGORIES= devel kde MASTER_SITES= http://kcachegrind.sourceforge.net/ MAINTAINER= beat@FreeBSD.org COMMENT= Profiling Visualization Tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= i386 amd64 USE_CMAKE= yes USE_KDE4= automoc4 kdehier kdelibs USE_QT4= moc_build qmake_build rcc_build uic_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 +.include -.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 +.include Index: head/mail/swaks/Makefile =================================================================== --- head/mail/swaks/Makefile (revision 305302) +++ head/mail/swaks/Makefile (revision 305303) @@ -1,46 +1,43 @@ -# New ports collection makefile for: swaks -# Date created: 29 Sep 2004 -# Whom: Oliver Eikemeier -# +# Created by: Oliver Eikemeier # $FreeBSD$ -# PORTNAME= swaks PORTVERSION= 20120320.0 CATEGORIES= mail MASTER_SITES= http://jetmore.org/john/code/swaks/ MAINTAINER= beat@FreeBSD.org COMMENT= Swiss Army Knife SMTP transaction tester 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 -.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 do-build: @${SED} -e '1s|/usr/bin/perl|${PERL}|' \ ${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.pl do-install: @${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME} @${CAT} ${PKGMESSAGE} .include Index: head/www/fluxcms/Makefile =================================================================== --- head/www/fluxcms/Makefile (revision 305302) +++ head/www/fluxcms/Makefile (revision 305303) @@ -1,54 +1,49 @@ -# New ports collection makefile for: fluxcms -# Date created: 31 December 2005 -# Whom: beat -# # $FreeBSD$ -# PORTNAME= fluxcms PORTVERSION= 1.6.0 PORTREVISION= 7 CATEGORIES= www MASTER_SITES= http://bitflux.org/download/ \ http://www.chruetertee.ch/files/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-snapshot-20090308 EXTRACT_SUFX= .tgz MAINTAINER= beat@FreeBSD.org COMMENT= An extensible and flexible CMS based on PHP 5 and XML/XSLT NO_BUILD= yes FLUXCMSDIR= www/fluxcms INSTALLDIR= ${PREFIX}/${FLUXCMSDIR} PLIST_SUB= INSTALLDIR=${FLUXCMSDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} 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 IGNORE_WITH_PHP= 4 DEFAULT_PHP_VER= 5 PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .include -.if defined(WITH_TIDY) +.if ${PORT_OPTIONS:MTIDY} USE_PHP+= tidy .endif post-patch: @${RM} ${WRKSRC}/install/dist/conf/config.xml.orig do-install: @${MKDIR} ${INSTALLDIR} @${CP} -R ${WRKSRC}/* ${INSTALLDIR} @${CHOWN} ${WWWOWN}:${WWWGRP} ${INSTALLDIR} post-install: @${CAT} ${PKGMESSAGE} .include Index: head/www/linkchecker/Makefile =================================================================== --- head/www/linkchecker/Makefile (revision 305302) +++ head/www/linkchecker/Makefile (revision 305303) @@ -1,58 +1,53 @@ -# ex:ts=8 -# Ports collection makefile for: linkchecker -# Date created: Oct 17, 2003 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= linkchecker PORTVERSION= 6.6 CATEGORIES= www python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ DISTNAME= LinkChecker-${PORTVERSION} MAINTAINER= beat@FreeBSD.org COMMENT= Check HTML documents for broken links 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 USE_BZIP2= yes USE_PYTHON= 2.5+ USE_PYDISTUTILS= yes INSTALLS_EGGINFO= yes PYDISTUTILS_EGGINFO= LinkChecker-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info MAN1= linkchecker.1 MAN5= linkcheckerrc.5 .include -.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="" .else 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 .endif .include Index: head/x11-wm/fluxbox/Makefile =================================================================== --- head/x11-wm/fluxbox/Makefile (revision 305302) +++ head/x11-wm/fluxbox/Makefile (revision 305303) @@ -1,157 +1,150 @@ -# New ports collection makefile for: fluxbox -# Date created: 29 November 2001 -# Whom: spn -# +# Created by: spn # $FreeBSD$ -# PORTNAME= fluxbox PORTVERSION= 1.3.2 CATEGORIES= x11-wm MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= beat@FreeBSD.org COMMENT= A small and fast window manager based on BlackBox RUN_DEPENDS= xmessage:${PORTSDIR}/x11/xmessage USE_XORG= xextproto xft xpm xrandr USE_GMAKE= yes WANT_GNOME= yes GNU_CONFIGURE= yes DOCS= AUTHORS COPYING ChangeLog NEWS README TODO MAN1= fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox.1 \ startfluxbox.1 fluxbox-remote.1 MAN5= fluxbox-apps.5 fluxbox-keys.5 fluxbox-menu.5 \ 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 -.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 DISTFILES+= fb-doc-mfhtml-${DOCSVERSION}.tgz:html EXTRACT_ONLY+= fb-doc-mfhtml-${DOCSVERSION}.tgz PLIST_SUB+= DOCHTML:="" .else 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 DISTFILES+= fluxbook-${DOCSVERSION}.pdf:pdf PLIST_SUB+= DOCPDF:="" .else 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 CONFIGURE_ARGS+= --enable-nls PLIST_SUB+= NLS:="" .else CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" CPPFLAGS+= -I${LOCALBASE}/include 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 CONFIGURE_ARGS+= --disable-xrender .endif .include .if ${HAVE_GNOME:Mlibgnome}!="" || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-gnome .else CONFIGURE_ARGS+= --disable-gnome .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${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/ .endif .include