From owner-svn-ports-head@FreeBSD.ORG Mon May 6 06:54:20 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 C53A56AE; Mon, 6 May 2013 06:54:20 +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 A822C38D; Mon, 6 May 2013 06:54:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r466sK3J062321; Mon, 6 May 2013 06:54:20 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r466sJjI062315; Mon, 6 May 2013 06:54:19 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201305060654.r466sJjI062315@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 6 May 2013 06:54:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317472 - in head/www: arora cadaver dillo-i18n gallery neon29 sitecopy 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: Mon, 06 May 2013 06:54:20 -0000 Author: bapt Date: Mon May 6 06:54:19 2013 New Revision: 317472 URL: http://svnweb.freebsd.org/changeset/ports/317472 Log: Finish converting www from WITHOUT_NLS to PORT_OPTIONS:MNLS Modified: head/www/arora/Makefile head/www/cadaver/Makefile head/www/dillo-i18n/Makefile head/www/gallery/Makefile head/www/neon29/Makefile head/www/sitecopy/Makefile Modified: head/www/arora/Makefile ============================================================================== --- head/www/arora/Makefile Mon May 6 06:52:59 2013 (r317471) +++ head/www/arora/Makefile Mon May 6 06:54:19 2013 (r317472) @@ -1,7 +1,4 @@ -# New ports collection makefile for: arora -# Date created: 08 Aug 2008 -# Whom: Andy Fawcett -# +# Created by: Andy Fawcett # $FreeBSD$ PORTNAME= arora @@ -23,13 +20,13 @@ MAKE_JOBS_SAFE= yes MAN1= arora.1 arora-cacheinfo.1 arora-placesimport.1 htmlToXBel.1 -.include +.include .if ${ARCH} == ia64 BROKEN= core dump on application startup .endif -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} PLIST_SUB+= NLS="@comment " .else USE_QT4+= linguist_build @@ -37,7 +34,7 @@ PLIST_SUB+= NLS="" .endif do-configure: -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e "/INSTALLS/s|translations||" \ ${WRKSRC}/src/src.pro @${REINPLACE_CMD} -e "s|target_predeps||" \ @@ -67,4 +64,4 @@ post-install: ${WRKSRC}/tools/placesimport/data/arora-placesimport.1 \ ${PREFIX}/man/man1 -.include +.include Modified: head/www/cadaver/Makefile ============================================================================== --- head/www/cadaver/Makefile Mon May 6 06:52:59 2013 (r317471) +++ head/www/cadaver/Makefile Mon May 6 06:54:19 2013 (r317472) @@ -1,9 +1,5 @@ -# New ports collection makefile for: cadaver -# Date created: 13 January 2000 -# Whom: Alex Povolotsky -# +# Created by: Alex Povolotsky # $FreeBSD$ -# PORTNAME= cadaver PORTVERSION= 0.23.3 @@ -50,7 +46,9 @@ post-install: # .endif -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES= gettext iconv CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} Modified: head/www/dillo-i18n/Makefile ============================================================================== --- head/www/dillo-i18n/Makefile Mon May 6 06:52:59 2013 (r317471) +++ head/www/dillo-i18n/Makefile Mon May 6 06:54:19 2013 (r317472) @@ -42,7 +42,9 @@ CONFIGURE_ARGS= --enable-cookies --enabl CONFLICTS= dillo-[0-9].[0-9].[0-9]* -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB= NLS="" CONFIGURE_ARGS+= --enable-nls Modified: head/www/gallery/Makefile ============================================================================== --- head/www/gallery/Makefile Mon May 6 06:52:59 2013 (r317471) +++ head/www/gallery/Makefile Mon May 6 06:54:19 2013 (r317472) @@ -14,12 +14,14 @@ COMMENT= Slick web based photo album wri RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm \ jhead:${PORTSDIR}/graphics/jhead \ - unzip:${PORTSDIR}/archivers/unzip + ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip USE_PHP= pcre session WANT_PHP_WEB= yes -.if !defined(WITHOUT_NLS) +.include + +.if ${PORT_OPTIONS:MNLS} USE_PHP+= gettext USES+= gettext @@ -98,7 +100,7 @@ do-install: -o -print | ${CPIO} ${CPIOARGS} ${WWWOWN}:${WWWGRP} ${WWWDIR} post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @ ${INSTALL} -d ${DOCSDIR} @ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif Modified: head/www/neon29/Makefile ============================================================================== --- head/www/neon29/Makefile Mon May 6 06:52:59 2013 (r317471) +++ head/www/neon29/Makefile Mon May 6 06:54:19 2013 (r317472) @@ -1,9 +1,5 @@ -# New ports collection makefile for: neon -# Date created: 13 October 2000 -# Whom: Mikhail Teterin -# +# Created by: Mikhail Teterin # $FreeBSD$ -# PORTNAME= neon29 PORTVERSION= 0.29.6 @@ -17,56 +13,53 @@ COMMENT= An HTTP and WebDAV client libra CONFLICTS= neon2[6|8]-[0-9]* -OPTIONS= EXPAT "Build with expat-based XML parser" on \ - XML "Build with libxml-based XML parser" off \ - OPENSSL "Build with SSL support" on \ - NLS "Build with NLS support" on \ - GSSAPI "Build with GSSAPI support" on \ - PROXY "Build with libproxy support" off +OPTIONS_DEFINE= OPENSSL NLS GSSAPI PROXY DOCS +OPTIONS_DEFAULT= EXPAT OPENSSL NLS GSSAPI +OPTIONS_SINGLE= XML +OPTIONS_SINGLE_XML= EXPAT LIBXML +XML_DESC= XML parser library +LIBXML_DESC= libxml2 XML parser support +PROXY_DESC= libproxy support USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USE_GNOME= gnomehack ltverhack +USES= pathfix +USE_GNOME= ltverhack GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared \ --with-libs=${LOCALBASE}:${PREFIX} -.include "bsd.port.options.mk" +.include -.if defined(WITH_EXPAT) && defined(WITH_XML) -BROKEN=expat and libxml is not compatible -.endif - -# expat is default unless WITH_XML is choosen -.if !defined(WITHOUT_EXPAT) && !defined(WITH_XML) +.if ${PORT_OPTIONS:MEXPAT} CONFIGURE_ARGS+=--with-expat LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 .endif -.if defined(WITH_XML) +.if ${PORT_OPTIONS:MLIBXML} CONFIGURE_ARGS+=--with-libxml2 LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 .endif -.if !defined(WITHOUT_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+=--with-ssl USE_OPENSSL= yes .endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif -.if defined(WITHOUT_GSSAPI) +.if ! ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--without-gssapi .endif -.if defined(WITH_PROXY) +.if ${PORT_OPTIONS:MPROXY} CONFIGURE_ARGS+=--with-libproxy LIB_DEPENDS+= proxy.1:${PORTSDIR}/net/libproxy .else @@ -149,16 +142,10 @@ MLINKS= ne_add_request_header.3 ne_print PLIST_SUB+= PORTVERSION=${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/neon -pre-everything:: -.if defined(WITH_EXPAT) && defined(WITH_XML) - @${ECHO_CMD} "please choose between expat and libxml2 not both" - @${FALSE} -.endif - post-install: ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3 -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} (cd ${WRKSRC} ; ${MAKE} install-html) .endif Modified: head/www/sitecopy/Makefile ============================================================================== --- head/www/sitecopy/Makefile Mon May 6 06:52:59 2013 (r317471) +++ head/www/sitecopy/Makefile Mon May 6 06:54:19 2013 (r317472) @@ -1,9 +1,5 @@ -# New ports collection makefile for: sitecopy -# Date created: 15 January 1999 -# Whom: nik -# +# Created by: nik # $FreeBSD$ -# PORTNAME= sitecopy PORTVERSION= 0.16.6 @@ -26,13 +22,15 @@ CONFIGURE_ARGS= --with-neon --with-libxm USE_GNOME= libxml2 USE_GMAKE= yes -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else +.include + +.if ${PORT_OPTIONS:MNLS} LIBS+= -lintl USES+= gettext PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .ifndef WITHOUT_SSL