From owner-svn-ports-head@FreeBSD.ORG Sun Jan 6 21:33:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 80A5C348; Sun, 6 Jan 2013 21:33:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 642031911; Sun, 6 Jan 2013 21:33:22 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06LXMvS061837; Sun, 6 Jan 2013 21:33:22 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06LXLHN061832; Sun, 6 Jan 2013 21:33:21 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201301062133.r06LXLHN061832@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 6 Jan 2013 21:33:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310017 - in head: audio/mpdscribble databases/soci irc/libircclient textproc/discount X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jan 2013 21:33:22 -0000 Author: bapt Date: Sun Jan 6 21:33:21 2013 New Revision: 310017 URL: http://svnweb.freebsd.org/changeset/ports/310017 Log: Convert jlaffayes's ports to new options framework Approved by: jlaffaye Modified: head/audio/mpdscribble/Makefile head/databases/soci/Makefile head/irc/libircclient/Makefile head/textproc/discount/Makefile Modified: head/audio/mpdscribble/Makefile ============================================================================== --- head/audio/mpdscribble/Makefile Sun Jan 6 21:24:28 2013 (r310016) +++ head/audio/mpdscribble/Makefile Sun Jan 6 21:33:21 2013 (r310017) @@ -1,9 +1,5 @@ -# New ports collection makefile for: mpdscribble -# Date created: July 13 2006 -# Whom: Stepan Zastupov [RedChrom] -# +# Created by: Stepan Zastupov [RedChrom] # $FreeBSD$ -# PORTNAME= mpdscribble PORTVERSION= 0.22 @@ -24,11 +20,12 @@ USE_RC_SUBR= mpdscribble MAN1= mpdscribble.1 -OPTIONS= SOUP "Use libsoup instead of libcurl" off +OPTIONS_DEFINE= SOUP DOCS +SOUP_DESC= Use libsoup instead of libcurl -.include +.include -.if defined(WITH_SOUP) +.if ${PORT_OPTIONS:MSOUP} LIB_DEPENDS+= soup-2.4.1:${PORTSDIR}/devel/libsoup CONFIGURE_ARGS+= --with-http-client=soup .else @@ -43,11 +40,11 @@ do-install: .if !exists(${PREFIX}/etc/mpdscribble.conf) @(cd ${PREFIX}/etc && ${CP} mpdscribble.conf.sample mpdscribble.conf) .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in AUTHORS NEWS README ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif -.include +.include Modified: head/databases/soci/Makefile ============================================================================== --- head/databases/soci/Makefile Sun Jan 6 21:24:28 2013 (r310016) +++ head/databases/soci/Makefile Sun Jan 6 21:33:21 2013 (r310017) @@ -1,9 +1,5 @@ -# New ports collection makefile for: soci -# Date created: 2010-09-13 -# Whom: Julien Laffaye -# +# Created by: Julien Laffaye # $FreeBSD$ -# PORTNAME= soci PORTVERSION= 3.0.0 @@ -28,12 +24,12 @@ ALL_TARGET= build_libs SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= MYSQL "Build MySQL driver" on \ - PGSQL "Build PostgreSQL driver" on +OPTIONS_DEFINE= MYSQL PGSQL +OPTIONS_DEFAULT= MYSQL PGSQL -.include +.include -.ifdef (WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes PLIST_SUB+= MYSQL="" CONFIGURE_ARGS+=--mysql-include=${LOCALBASE}/include/mysql \ @@ -42,7 +38,7 @@ CONFIGURE_ARGS+=--mysql-include=${LOCALB PLIST_SUB+= MYSQL="@comment " .endif -.ifdef (WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes PLIST_SUB+= PGSQL="" CONFIGURE_ARGS+=--postgresql-include=${LOCALBASE}/include \ @@ -58,4 +54,4 @@ post-patch: post-install: @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/irc/libircclient/Makefile ============================================================================== --- head/irc/libircclient/Makefile Sun Jan 6 21:24:28 2013 (r310016) +++ head/irc/libircclient/Makefile Sun Jan 6 21:33:21 2013 (r310017) @@ -1,9 +1,5 @@ -# New ports collection makefile for: libircclient -# Date created: 2008-11-20 -# Whom: Julien Laffaye -# +# Created by: Julien Laffaye # $FreeBSD$ -# PORTNAME= libircclient PORTVERSION= 1.6 @@ -13,18 +9,20 @@ MASTER_SITES= SF MAINTAINER= jlaffaye@FreeBSD.org COMMENT= An IRC library to create IRC clients -OPTIONS= SSL "Build with SSL Support" on \ - IPV6 "Build with IPv6 Support" on +OPTIONS_DEFINE= OPENSSL IPV6 DOCS EXAMPLES +OPTIONS_DEFAULT= OPENSSL BUILD_WRKSRC= ${WRKSRC}/src GNU_CONFIGURE= yes -.if !defined(WITHOUT_SSL) +.include + +.if ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+= --enable-openssl USE_OPENSSL= yes .endif -.if !defined(WITHOUT_IPV6) +.if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif @@ -37,11 +35,11 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/src/libircclient.a ${PREFIX}/lib post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" @(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR}) .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} "installing additional examples to ${EXAMPLESDIR}" @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) .endif Modified: head/textproc/discount/Makefile ============================================================================== --- head/textproc/discount/Makefile Sun Jan 6 21:24:28 2013 (r310016) +++ head/textproc/discount/Makefile Sun Jan 6 21:33:21 2013 (r310017) @@ -1,9 +1,5 @@ -# New ports collection makefile for: discount -# Date created: 2009-04-22 -# Whom: Julien Laffaye -# +# Created by: Julien Laffaye # $FreeBSD$ -# PORTNAME= discount PORTVERSION= 2.1.1.3 @@ -47,21 +43,25 @@ PLIST_FILES= bin/markdown \ lib/libmarkdown.a \ include/mkdio.h -OPTIONS= EXTRA "Enable all extra features" on \ - TAB8 "Use a tabstop of 8 (default is 4)" on \ - SAMPLES "Install sample programs" off -.include +OPTIONS_DEFINE= EXTRA TAB8 SAMPLES +OPTIONS_DEFAULT= EXTRA TAB8 -.ifdef (WITH_EXTRA) +EXTRA_DESC= Enable all extra features +TAB8_DESC= Use a tabstop of 8 (default is 4) +SAMPLES_DESC= Install sample programs + +.include + +.if ${PORT_OPTIONS:MEXTRA} CONFIGURE_ARGS+=--enable-dl-tag \ --enable-all-features .endif -.ifdef (WITH_TAB8) +.if ${PORT_OPTIONS:MTAB8} CONFIGURE_ARGS+=--with-tabstops=8 .endif -.ifdef (WITH_SAMPLES) +.if ${PORT_OPTIONS:MSAMPLES} INSTALL_TARGET+=install.samples PLIST_FILES+= bin/makepage \ bin/mkd2html \ @@ -72,4 +72,4 @@ MAN1+= makepage.1 \ .endif -.include +.include