Date: Fri, 10 Apr 2015 14:31:00 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383730 - in head/www/pound: . files Message-ID: <201504101431.t3AEV0g3028896@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Apr 10 14:31:00 2015 New Revision: 383730 URL: https://svnweb.freebsd.org/changeset/ports/383730 Log: - Fix a typo in PCRE_CONFIGURE_ENABLE knob - Remove MSDAV option: this is no longer valid compiler flag in pound, for quite some time - Do not pass -I to CFLAGS, it is already added (correctly) to CPPFLAGS - Move initial CONFIGURE_ARGS after GNU_CONFIGURE where it logically belongs - Move OPTIONS and helper knobs right above .include <bsd.port.options.mk> - Remove ".if ${PORT_OPTIONS:MDOCS}" guard, not needed in post-staging - Slightly beautify files/pound.in and pkg-descr while I'm here PR: 199339 Submitted by: maintainer Modified: head/www/pound/Makefile head/www/pound/files/pound.in head/www/pound/pkg-descr Modified: head/www/pound/Makefile ============================================================================== --- head/www/pound/Makefile Fri Apr 10 13:44:29 2015 (r383729) +++ head/www/pound/Makefile Fri Apr 10 14:31:00 2015 (r383730) @@ -3,7 +3,7 @@ PORTNAME= pound PORTVERSION= 2.7 -PORTREVISION= +PORTREVISION= 1 CATEGORIES= www net MASTER_SITES= http://www.apsis.ch/pound/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -17,32 +17,29 @@ LICENSE_FILE= ${WRKSRC}/GPL.txt USES= tar:tgz GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-tcmalloc --disable-hoard USE_OPENSSL= yes USE_RC_SUBR= ${PORTNAME} SUB_LIST= NAME=${PORTNAME} -OPTIONS_DEFINE= DOCS MSDAV PCRE -OPTIONS_DEFAULT=PCRE -MSDAV_DESC= Microsoft WebDAV extension support - -PCRE_CONFIGUE_ENABLE= pcreposix -MSDAV_CONFIGURE_ENABLE= msdav -CONFIGURE_ARGS= --disable-tcmalloc --disable-hoard - PLIST_FILES= sbin/pound \ sbin/poundctl \ man/man8/pound.8.gz \ man/man8/poundctl.8.gz PORTDOCS= README FAQ CHANGELOG +OPTIONS_DEFINE= DOCS PCRE +OPTIONS_DEFAULT=PCRE + +PCRE_CONFIGURE_ENABLE= pcreposix + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -CFLAGS+= -I${LOCALBASE}/include -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif do-install: @@ -50,9 +47,7 @@ do-install: ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/pound.8 ${WRKSRC}/poundctl.8 \ ${STAGEDIR}${MANPREFIX}/man/man8 -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/www/pound/files/pound.in ============================================================================== --- head/www/pound/files/pound.in Fri Apr 10 13:44:29 2015 (r383729) +++ head/www/pound/files/pound.in Fri Apr 10 14:31:00 2015 (r383730) @@ -10,7 +10,7 @@ # Add the following line to /etc/rc.conf to enable `%%NAME%%': # -#%%NAME%%_enable="YES" +# %%NAME%%_enable="YES" # # and be sure to configure %%PREFIX%%/etc/%%NAME%%.conf Modified: head/www/pound/pkg-descr ============================================================================== --- head/www/pound/pkg-descr Fri Apr 10 13:44:29 2015 (r383729) +++ head/www/pound/pkg-descr Fri Apr 10 14:31:00 2015 (r383730) @@ -1,7 +1,7 @@ The Pound program is a reverse proxy, load balancer and HTTPS front-end for Web server(s). Pound was developed to enable distributing load among several Web-servers, and to allow for a convenient SSL wrapper for those Web servers -that do not offer it natively. Pound is distributed under the GPL - no +that do not offer it natively. Pound is distributed under the GPL -- no warranty, it's free to use, copy and give away. WWW: http://www.apsis.ch/pound/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504101431.t3AEV0g3028896>