From owner-svn-ports-head@FreeBSD.ORG Mon Dec 15 16:08:16 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9AA3F81; Mon, 15 Dec 2014 16:08:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5543A6; Mon, 15 Dec 2014 16:08:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBFG8FTj058877; Mon, 15 Dec 2014 16:08:15 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBFG8FPS058875; Mon, 15 Dec 2014 16:08:15 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201412151608.sBFG8FPS058875@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Mon, 15 Dec 2014 16:08:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374752 - in head/www/neon29: . files 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.18-1 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, 15 Dec 2014 16:08:16 -0000 Author: ohauer Date: Mon Dec 15 16:08:14 2014 New Revision: 374752 URL: https://svnweb.freebsd.org/changeset/ports/374752 QAT: https://qat.redports.org/buildarchive/r374752/ Log: - use new CONFIG syntax - add LICENSE - do not install man pages a second time - use REINPLACE_CMD instead dedicated patch - remove obsolete CONFLICT line - cleanup pkg-plist - bump PORTREVISION Approved by: lev (implicit) Deleted: head/www/neon29/files/ Modified: head/www/neon29/Makefile head/www/neon29/pkg-plist Modified: head/www/neon29/Makefile ============================================================================== --- head/www/neon29/Makefile Mon Dec 15 15:26:53 2014 (r374751) +++ head/www/neon29/Makefile Mon Dec 15 16:08:14 2014 (r374752) @@ -3,7 +3,7 @@ PORTNAME= neon29 PORTVERSION= 0.29.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= http://www.webdav.org/neon/ DISTNAME= neon-${PORTVERSION} @@ -11,8 +11,13 @@ DISTNAME= neon-${PORTVERSION} MAINTAINER= lev@FreeBSD.org COMMENT= HTTP and WebDAV client library for Unix systems -CONFLICTS= neon2[^9]-[0-9]* +LICENSE= GPLv2 +USES= pathfix libtool +USE_LDCONFIG= yes +GNU_CONFIGURE= yes + +OPTIONS_SUB= yes OPTIONS_DEFINE= CA_BUNDLE DOCS GSSAPI NLS OPENSSL PROXY OPTIONS_DEFAULT= CA_BUNDLE EXPAT GSSAPI NLS OPENSSL OPTIONS_SINGLE= XML @@ -23,63 +28,37 @@ LIBXML_DESC= libxml2 XML parser support PROXY_DESC= libproxy support XML_DESC= XML parser library -USE_LDCONFIG= yes - -USES= pathfix libtool -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared \ - --with-libs=${LOCALBASE}:${PREFIX} - CA_BUNDLE_CONFIGURE_ON= --with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +EXPAT_CONFIGURE_WITH= expat +EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 +GSSAPI_CONFIGURE_WITH= gssapi +LIBXML_CONFIGURE_WITH= libxml2 +LIBXML_USE= GNOME=libxml2 +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +OPENSSL_CONFIGURE_WITH= ssl +OPENSSL_USE= OPENSSL=yes +PROXY_CONFIGURE_WITH= libproxy +PROXY_LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy .include +CONFIGURE_ARGS+=--enable-shared \ + --with-libs=${LOCALBASE}:${PREFIX} + .if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL} WARNING+= "OpenSSL need for CA bundle support" WARNING+= "Enable the OPENSSL option or disable the CA_BUNDLE option" .endif -.if ${PORT_OPTIONS:MEXPAT} -CONFIGURE_ARGS+=--with-expat -LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 -.endif - -.if ${PORT_OPTIONS:MLIBXML} -CONFIGURE_ARGS+=--with-libxml2 -USE_GNOME+= libxml2 -.endif - -.if ${PORT_OPTIONS:MOPENSSL} -CONFIGURE_ARGS+=--with-ssl -USE_OPENSSL= yes -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ! ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--without-gssapi -.endif - -.if ${PORT_OPTIONS:MPROXY} -CONFIGURE_ARGS+=--with-libproxy -LIB_DEPENDS+= libproxy.so:${PORTSDIR}/net/libproxy -.else -CONFIGURE_ARGS+=--without-libproxy -.endif - PLIST_SUB+= PORTVERSION=${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/neon +post-patch: + ${REINPLACE_CMD} -e 's|-@NEON_VERSION@$$||' ${WRKSRC}/Makefile.in + post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libneon.so.27.* .include Modified: head/www/neon29/pkg-plist ============================================================================== --- head/www/neon29/pkg-plist Mon Dec 15 15:26:53 2014 (r374751) +++ head/www/neon29/pkg-plist Mon Dec 15 16:08:14 2014 (r374752) @@ -178,6 +178,3 @@ man/man3/neon.3.gz %%NLS%%share/locale/ru/LC_MESSAGES/neon.mo %%NLS%%share/locale/tr/LC_MESSAGES/neon.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo -@dirrm include/neon -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%%