Date: Sat, 6 Oct 2012 21:17:22 +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: r305404 - in head: net-p2p/libtorrent net-p2p/rtorrent sysutils/testdisk www/fnord Message-ID: <201210062117.q96LHMDB042792@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Oct 6 21:17:22 2012 New Revision: 305404 URL: http://svn.freebsd.org/changeset/ports/305404 Log: - Convert to new option framework - Trim headers Approved by: flz (irc) Modified: head/net-p2p/libtorrent/Makefile head/net-p2p/rtorrent/Makefile head/sysutils/testdisk/Makefile head/www/fnord/Makefile Modified: head/net-p2p/libtorrent/Makefile ============================================================================== --- head/net-p2p/libtorrent/Makefile Sat Oct 6 21:05:12 2012 (r305403) +++ head/net-p2p/libtorrent/Makefile Sat Oct 6 21:17:22 2012 (r305404) @@ -1,9 +1,4 @@ -# New ports collection makefile for: libtorrent -# Date created: Jan 07 2005 -# Whom: Florent Thoumie <flz@xbsd.org> -# # $FreeBSD$ -# PORTNAME?= libtorrent PORTVERSION?= 0.13.2 @@ -22,13 +17,16 @@ CONFLICTS?= libtorrent-devel-[0-9]* \ rblibtorrent-devel-[0-9]* USE_AUTOTOOLS= libtool -USE_GNOME= pkgconfig gnomehack +USE_GNOME= gnomehack +USE_PKGCONFIG= build USE_OPENSSL= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -OPTIONS= KQUEUE "Use kqueue(2) support" on \ - IPV6 "Enable IPv6 support" off +OPTIONS_DEFINE= KQUEUE IPV6 +OPTIONS_DEFAULT= KQUEUE +KQUEUE_DESC= Use kqueue(2) support +IPV6_DESC= Enable IPv6 support .include <bsd.port.pre.mk> @@ -44,10 +42,11 @@ CONFIGURE_ARGS+= --disable-debug --with- post-patch: @${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/configure -.if !defined(WITHOUT_KQUEUE) +.if ${PORT_OPTIONS:MKQUEUE} CONFIGURE_ARGS+= --with-kqueue .endif +.if ${PORT_OPTIONS:MIPV6} .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif Modified: head/net-p2p/rtorrent/Makefile ============================================================================== --- head/net-p2p/rtorrent/Makefile Sat Oct 6 21:05:12 2012 (r305403) +++ head/net-p2p/rtorrent/Makefile Sat Oct 6 21:17:22 2012 (r305404) @@ -1,9 +1,4 @@ -# New ports collection makefile for: rtorrent -# Date created: Mar 03 2005 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME?= rtorrent PORTVERSION?= 0.9.2 @@ -32,8 +27,9 @@ SUB_FILES= pkg-message PORTDOCS= README -OPTIONS= XMLRPC "Compile with xmlrpc-c support" on \ - IPV6 "Enable IPv6 support" on +OPTIONS_DEFINE= XMLRPC IPV6 DOCS +OPTIONS_DEFAULT= XMLRPC IPV6 +XMLRPC_DESC= Compile with xmlrpc-c support .include <bsd.port.pre.mk> @@ -41,14 +37,14 @@ OPTIONS= XMLRPC "Compile with xmlrpc-c s BROKEN= Does not configure on arm .endif -.if !defined(WITHOUT_XMLRPC) +.if ${PORT_OPTIONS:MXMLRPC} CONFIGURE_ARGS+= --with-xmlrpc-c LIB_DEPENDS+= xmlrpc.3:${PORTSDIR}/net/xmlrpc-c-devel .else CONFIGURE_ARGS+= --with-xmlrpc-c=no .endif -.if defined(WITH_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif @@ -58,7 +54,7 @@ post-patch: post-install: ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${EXAMPLESDIR}/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/ .endif Modified: head/sysutils/testdisk/Makefile ============================================================================== --- head/sysutils/testdisk/Makefile Sat Oct 6 21:05:12 2012 (r305403) +++ head/sysutils/testdisk/Makefile Sat Oct 6 21:17:22 2012 (r305404) @@ -1,9 +1,4 @@ -# New ports collection makefile for: testdisk -# Date created: Feb 28 2004 -# Whom: Florent Thoumie <flz@xbsd.org> -# # $FreeBSD$ -# PORTNAME= testdisk PORTVERSION= 6.13 @@ -27,10 +22,14 @@ MAN8= fidentify.8 testdisk.8 photorec.8 PLIST_FILES= bin/fidentify bin/testdisk bin/photorec PORTDOCS= * -OPTIONS= ICONV "Use iconv extensions" on \ - NTFS3G "Use fusefs-ntfs extensions" off \ - NTFSPROGS "Use ntfsprogs extensions" off \ - PROGSREISERFS "Use reiserfs extensions" off +OPTIONS_DEFINE= ICONV PROGSREISERFS NTFS DOCS +OPTIONS_DEFAULT= ICONV +OPTIONS_SINGLE= NTFS +OPTIONS_SINGLE_NTFS= NTFS3G NTFSPROGS +NTFS_DESC= Support NTFS +NTFS3G_DESC= Use fusefs-ntfs extensions +NTFSPROGS_DESC= Use ntfsprogs extensions +PROGSREISERFS_DESC= Use reiserfs extensions # E2FSPROGS "Use ext2fs extensions" off \ .include <bsd.port.pre.mk> @@ -39,8 +38,8 @@ OPTIONS= ICONV "Use iconv extensions" on #DISTFILES+= ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX} #.endif -.if !defined(WITHOUT_ICONV) -LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv +.if ${PORT_OPTIONS:MICONV} +LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv .else CONFIGURE_ARGS+=--without-iconv .endif @@ -53,29 +52,26 @@ CONFIGURE_ARGS+=--without-iconv #CONFIGURE_ARGS+=--without-ext2fs #.endif -.if defined(WITH_NTFS3G) +.if ${PORT_OPTIONS:MNTFS3G} LIB_DEPENDS+= ntfs-3g:${PORTSDIR}/sysutils/fusefs-ntfs .else CONFIGURE_ARGS+=--without-ntfs3g .endif -.if defined(WITH_NTFSPROGS) -.if defined(WITH_NTFS3G) -IGNORE= WITH_NTFSPROGS does not work if WITH_NTFS3G is defined -.endif -LIB_DEPENDS+= ntfs.10:${PORTSDIR}/sysutils/ntfsprogs +.if ${PORT_OPTIONS:MNTFSPROGS} +LIB_DEPENDS+= ntfs:${PORTSDIR}/sysutils/ntfsprogs .else CONFIGURE_ARGS+=--without-ntfs .endif -.if defined(WITH_PROGSREISERFS) +.if ${PORT_OPTIONS:MPROGSREISERFS} LIB_DEPENDS+= reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs .else CONFIGURE_ARGS+=--without-reiserfs .endif post-patch: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e '/doc\/testdisk\/html/d' ${WRKSRC}/Makefile.in .else Modified: head/www/fnord/Makefile ============================================================================== --- head/www/fnord/Makefile Sat Oct 6 21:05:12 2012 (r305403) +++ head/www/fnord/Makefile Sat Oct 6 21:17:22 2012 (r305404) @@ -1,9 +1,4 @@ -# New ports collection makefile for: fnord -# Date created: May 23 2005 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= fnord PORTVERSION= 1.10 @@ -23,24 +18,26 @@ PLIST_FILES= bin/fnord \ SUB_FILES= pkg-message fnord.inetd -OPTIONS= DAEMONTOOLS "Use DJB's daemontools" off \ - TCPSERVER "Use DJB's tcpserver" off \ - CGI "Enable CGI support" on \ - DIR_LIST "Enable directory listing" on \ - SYSTEM_SYMLINK_DEREF "Enable system symlink (needs DIR_LIST)" off \ - OLD_STYLE_REDIRECT "Enable old style redirection" off +OPTIONS_DEFINE= DAEMONTOOLS TCPSERVER CGI DIR_LIST SYSTEM_SYMLINK_DEREF OLD_STYLE_REDIRECT +OPTIONS_DEFAULT= CGI DIR_LIST +DAEMONTOOLS_DESC= Use DJB's daemontools +TCPSERVER_DESC= Use DJB's tcpserver +CGI_DESC= Enable CGI support +DIR_LIST_DESC= Enable directory listing +SYSTEM_SYMLINK_DEREF_DESC= Enable system symlink (needs DIR_LIST) +OLD_STYLE_REDIRECT_DESC= "Enable old style redirection -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_DAEMONTOOLS) +.if ${PORT_OPTIONS:MDAEMONTOOLS} RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools .endif -.if defined(WITH_TCPSERVER) +.if ${PORT_OPTIONS:MTCPSERVER} RUN_DEPENDS= tcpserver:${PORTSDIR}/sysutils/ucspi-tcp .endif -.if !defined(WITHOUT_CGI) +.if ${PORT_OPTIONS:MCGI} SED_SCRIPT+= -e "s|^// \(\#define CGI\).*|\1|" .endif @@ -55,14 +52,14 @@ SED_SCRIPT+= -e "s|^// \(\#define CGI\). # e.g.: is foo a symlink to /etc/passwd than the client gets a href to # http://<vhost>/etc/passwd */ -.if defined(WITH_SYSTEM_SYMLINK_DEREF) -.if defined(WITHOUT_DIR_LIST) +.if ${PORT_OPTIONS:MSYSTEM_SYMLINK_DEREF} +.if ${PORT_OPTIONS:MDIR_LIST} IGNORE= SYSTEM_SYMLINK_DEREF has no effect if DIR_LIST is not enabled .endif SED_SCRIPT+= -e "s|^/\* \(\#define SYSTEM_SYMLINK_DEREF\).*|\1|" .endif -.if !defined(WITHOUT_DIR_LIST) +.if ${PORT_OPTIONS:MDIR_LIST} SED_SCRIPT+= -e "s|^/\* \(\#define DIR_LIST\).*|\1|" .endif @@ -71,7 +68,7 @@ SED_SCRIPT+= -e "s|^/\* \(\#define DIR_L # $REDIRECT_URI is set, fnord will issue a redirect to $REDIRECT_URI. # Only if those fail will a 404 error be returned. */ -.if defined(WITH_OLD_STYLE_REDIRECT) +.if ${PORT_OPTIONS:MOLD_STYLE_REDIRECT} SED_SCRIPT+= -e "s|^/\* \(\#define OLD_STYLE_REDIRECT\).*|\1|" .endif @@ -91,4 +88,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210062117.q96LHMDB042792>