Date: Thu, 4 Oct 2012 10:00:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305247 - in head: net-p2p/bitflu net-p2p/vuze net/beanstalkd net/fsplib net/gq net/rwhoisd net/ssvnc Message-ID: <201210041000.q94A0c2X023446@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Oct 4 10:00:38 2012 New Revision: 305247 URL: http://svn.freebsd.org/changeset/ports/305247 Log: Convert to new options framework Modified: head/net-p2p/bitflu/Makefile head/net-p2p/vuze/Makefile head/net/beanstalkd/distinfo head/net/fsplib/Makefile head/net/gq/Makefile head/net/rwhoisd/Makefile head/net/ssvnc/Makefile Modified: head/net-p2p/bitflu/Makefile ============================================================================== --- head/net-p2p/bitflu/Makefile Thu Oct 4 10:00:00 2012 (r305246) +++ head/net-p2p/bitflu/Makefile Thu Oct 4 10:00:38 2012 (r305247) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bitflu -# Date created: 28 January 2007 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME= bitflu PORTVERSION= 1.35 @@ -30,11 +26,12 @@ PLIST_SUB= PLUGINSDIR=${PLUGINSDIR} PORTDOCS= ChangeLog.txt README.txt README_IPv6.txt -OPTIONS= IPV6 "Enable functionality over IPv6 transport" on +OPTIONS_DEFINE= IPV6 EXAMPLES DOCS +OPTIONS_DEFAULT= IPV6 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} RUN_DEPENDS+= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 .endif @@ -50,15 +47,15 @@ do-install: ${PREFIX}/bin/${PORTNAME} ${MKDIR} ${PREFIX}/${PLUGINSDIR} ${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/*.pm ${PREFIX}/${PLUGINSDIR}/ -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${INSTALL} -d ${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.config.example \ ${EXAMPLESDIR}/${PORTNAME}.config .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-p2p/vuze/Makefile ============================================================================== --- head/net-p2p/vuze/Makefile Thu Oct 4 10:00:00 2012 (r305246) +++ head/net-p2p/vuze/Makefile Thu Oct 4 10:00:38 2012 (r305247) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Azureus -# Date created: October 6, 2004 -# Whom: Jeremy Faulkner <gldisater@gldis.ca> -# +# Created by: Jeremy Faulkner <gldisater@gldis.ca> # $FreeBSD$ -# PORTNAME= vuze PORTVERSION= 4.7.1.2 @@ -39,7 +35,9 @@ NO_WRKSUBDIR= yes JARFILE= ${PORTNAME}.jar -OPTIONS= SWTDEVEL "Use SWT Development port" on +OPTIONS_DEFINE= SWTDEVEL +OPTIONS_DEFAULT= SWTDEVEL +SWTDEVEL_DESC= Use SWT Development port # build classpath from BUILD_DEPENDS MAKE_ENV= LANG=C @@ -65,9 +63,9 @@ DESKTOP_ENTRIES= "Vuze" \ INSTALLS_ICONS= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SWTDEVEL) +.if ${PORT_OPTIONS:MDEVEL} SWT= swt-devel BUILD_DEPENDS+= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel RUN_DEPENDS+= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel @@ -107,4 +105,4 @@ do-install: post-install: @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/beanstalkd/distinfo ============================================================================== --- head/net/beanstalkd/distinfo Thu Oct 4 10:00:00 2012 (r305246) +++ head/net/beanstalkd/distinfo Thu Oct 4 10:00:38 2012 (r305247) @@ -1,2 +1,2 @@ -SHA256 (beanstalkd-1.6.tar.gz) = f39aa9de0692272b0249134cdf4f0e0c42da7755bad600403ac90e34bac235af -SIZE (beanstalkd-1.6.tar.gz) = 59880 +SHA256 (beanstalkd-1.7.tar.gz) = 1d851677096d3cee4ee5710ee6cf1cebe8f2b5d9fa05792561ab55b534cbdaf8 +SIZE (beanstalkd-1.7.tar.gz) = 59829 Modified: head/net/fsplib/Makefile ============================================================================== --- head/net/fsplib/Makefile Thu Oct 4 10:00:00 2012 (r305246) +++ head/net/fsplib/Makefile Thu Oct 4 10:00:38 2012 (r305247) @@ -1,7 +1,3 @@ -# New ports collection makefile for: fsplib -# Date created: 15 Jan 2005 -# Whom: X -# # $FreeBSD$ PORTNAME= fsplib @@ -19,11 +15,12 @@ SCONS_ARGS= prefix=${PREFIX} PLIST_FILES= include/fsplib.h lib/libfsplib.a -OPTIONS= SHARED "Install shared library (EXPERIMENTAL)" OFF +OPTIONS_DEFINE= SHARED +SHARED_DESC= Install shared library (EXPERIMENTAL) .include <bsd.port.options.mk> -.if defined(WITH_SHARED) +.if ${PORT_OPTIONS:MSHARED} SCONS_ARGS+= enable-shared=1 PLIST_FILES+= lib/libfsplib.so.0.0.0 .endif Modified: head/net/gq/Makefile ============================================================================== --- head/net/gq/Makefile Thu Oct 4 10:00:00 2012 (r305246) +++ head/net/gq/Makefile Thu Oct 4 10:00:38 2012 (r305247) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gq -# Date Created: 8 Jun 2000 -# Whom: Roman Shterenzon <roman@xpert.com> -# +# Created by: Roman Shterenzon <roman@xpert.com> # $FreeBSD$ -# PORTNAME= gq PORTVERSION= 1.3.4 @@ -17,8 +13,10 @@ COMMENT= GTK-based LDAP client LIB_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnome-keyring -OPTIONS= DND "Enable Drag and drop support in browse mode" On \ - CACHE "Support the OpenLDAP experimental client cache" On +OPTIONS_DEFINE= DND CACHE +OPTIONS_DEFAULT= DND CACHE +DND_DESC= Enable Drag and drop support in browse mode +CACHE_DESC= Support the OpenLDAP experimental client cache USE_GNOME= libglade2 gnomedocutils USE_OPENSSL= yes @@ -31,14 +29,14 @@ CONFIGURE_ARGS= --with-ldap-prefix=${LOC CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_DND) +.if ${PORT_OPTIONS:MDND} CONFIGURE_ARGS+= --enable-browser-dnd .endif -.if !defined(WITHOUT_CACHE) +.if ${PORT_OPTIONS:MCACHE} CONFIGURE_ARGS+= --enable-cache .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/rwhoisd/Makefile ============================================================================== --- head/net/rwhoisd/Makefile Thu Oct 4 10:00:00 2012 (r305246) +++ head/net/rwhoisd/Makefile Thu Oct 4 10:00:38 2012 (r305247) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rwhoisd -# Date created: May 9th 1997 -# Whom: James FitzGibbon <jfitz@FreeBSD.org> -# +# Created by: James FitzGibbon <jfitz@FreeBSD.org> # $FreeBSD$ -# PORTNAME= rwhoisd PORTVERSION= 1.5.9.6 @@ -19,8 +15,10 @@ COMMENT= The Internic referral whois ser LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -OPTIONS= IPV6 "Enable IPV6 support" On \ - LARGEFILE "Enable largefile support (> 2Gb)" Off +OPTIONS_DEFINE= IPV6 LARGEFILE DOCS +OPTIONS_DEFAULT= IPV6 +IPV6_DESC= Enable IPV6 support +LARGEFILE_DESC= Enable largefile support (> 2Gb) HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} @@ -36,13 +34,13 @@ MAN8= rwhois_indexer.8 rwhoisd.8 PORTDOCS= INSTALL.html TODO UPGRADE operations_guide.html \ operations_guide.txt rfc2167.txt security.html security.txt -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_IPV6) +.if empty(PORT_OPTIONS:MIPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(WITH_LARGEFILE) +.if ${PORT_OPTIONS:MLARGEFILE} CONFIGURE_ARGS+= --enable-largefile .endif @@ -60,11 +58,11 @@ post-install: @${CHOWN} -R nobody /var/log/rwhoisd /var/run/rwhoisd ${INSTALL_MAN} ${WRKSRC}/doc/rwhois_indexer.8 ${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/doc/rwhoisd.8 ${PREFIX}/man/man8 -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} . for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} . endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net/ssvnc/Makefile ============================================================================== --- head/net/ssvnc/Makefile Thu Oct 4 10:00:00 2012 (r305246) +++ head/net/ssvnc/Makefile Thu Oct 4 10:00:38 2012 (r305247) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ssvnc -# Date created: 2007-04-22 -# Whom: alepulver -# +# Created by: Alejandro Pulver <alepulver@FreeBSD.org> # $FreeBSD$ -# PORTNAME= ssvnc PORTVERSION= 1.0.29 @@ -22,7 +18,8 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel \ xterm:${PORTSDIR}/x11/xterm -OPTIONS= ULTRAFTP "UltraVNC File Transfer support (Java required)" off +OPTIONS_DEFINE= ULTRAFTP DOCS +ULTRAFTP_DESC= UltraVNC File Transfer support (Java required) USE_XORG= xi xmu xt xaw ice xpm xext sm USE_TK_WRAPPER= yes @@ -33,14 +30,14 @@ MAN1= ssvnc-gui.1 ssvncviewer.1 .include <bsd.port.options.mk> -.if defined(WITH_ULTRAFTP) +.if ${PORT_OPTIONS:MULTRAFTP} USE_JAVA= yes PLIST_SUB+= ULTRAFTP="" .else PLIST_SUB+= ULTRAFTP="@comment " .endif -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} MAKE_ARGS+= DOCS="" .endif @@ -49,7 +46,7 @@ post-patch: @${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1 @${REINPLACE_CMD} -e 's|/usr/local/bin|${LOCALBASE}/bin|' \ -e 's|^CC =|CC ?=|' ${WRKSRC}/vncstorepw/Makefile -.if !defined(WITH_ULTRAFTP) +.if ${PORT_OPTIONS:MULTRAFTP} @${REINPLACE_CMD} -e "s|sh -c 'type javac'|:|" \ -e "s|sh -c 'type jar'|:|" \ -e 's|cd $$(JSRC);|: |' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210041000.q94A0c2X023446>