Date: Tue, 2 Feb 2010 16:23:50 +0100 (CET) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: anders@FreeBSD.org Subject: ports/143484: [PATCH] www/pound: update to 2.5 Message-ID: <20100202152350.32DAA57CDB@mail.vx.sk> Resent-Message-ID: <201002021530.o12FU2ua019630@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143484 >Category: ports >Synopsis: [PATCH] www/pound: update to 2.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Feb 02 15:30:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.0-RELEASE-p2 amd64 >Organization: >Environment: System: FreeBSD core.vx.sk 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #14: Fri Jan 8 15:39:49 CET >Description: - Update to 2.5 - Update port structure to match with bsd.port.mk - Remove deprecated configure flags - Disable checks for hoard and tcmalloc - Make pcre on by default - Make libthr off by default (use pthread instead) - Move pkg-plist to Makefile - Add patch to honor ${CC} - Make portlint happy Added file(s): - files/patch-Makefile.in Removed file(s): - pkg-plist Port maintainer (anders@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- pound-2.5.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/pound/Makefile,v retrieving revision 1.22 diff -u -r1.22 Makefile --- Makefile 16 Oct 2009 18:55:10 -0000 1.22 +++ Makefile 2 Feb 2010 15:20:33 -0000 @@ -6,7 +6,7 @@ # PORTNAME= pound -PORTVERSION= 2.4.5 +PORTVERSION= 2.5 CATEGORIES= www net MASTER_SITES= http://www.apsis.ch/pound/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -22,50 +22,35 @@ SUB_LIST= NAME=${PORTNAME} -POUND_CFLAGS= ${CFLAGS} -POUND_LDFLAGS= ${LDFLAGS} -MAKE_ARGS+= F_CONF=${PREFIX}/etc/pound.cfg - MAN8= pound.8 poundctl.8 -OPTIONS= DAEMON "Running as a daemon" on \ - LIBTHR "Link against libthr for threading" on \ - LOG "With Syslog support" on \ +OPTIONS= LIBTHR "Link against libthr for threading" off \ MSDAV "With the Microsoft WebDAV extensions support" off \ - PCRE "Build with libpcre support" off - -.include <bsd.port.pre.mk> + PCRE "Build with libpcre support" on +CONFIGURE_ARGS= --disable--tcmalloc --disable-hoard +PLIST_FILES= sbin/pound sbin/poundctl PORTDOCS= README FAQ CHANGELOG -.if defined(WITHOUT_DAEMON) -CONFIGURE_ARGS+= --disable-daemon -.endif +.include <bsd.port.pre.mk> -.if defined(WITHOUT_LOG) -CONFIGURE_ARGS+= --disable-log +.if defined(WITH_LIBTHR) +PTHREAD_LIBS= -lthr .endif .if defined(WITH_MSDAV) CONFIGURE_ARGS+= --enable-msdav .endif -.if defined(WITH_PCRE) +.if !defined(WITHOUT_PCRE) LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POUND_CFLAGS+= "-I${LOCALBASE}/include" -POUND_LDFLAGS+= "-L${LOCALBASE}/lib" +CFLAGS+= "-I${LOCALBASE}/include" +CPPFLAGS+= "-I${LOCALBASE}/include" +LDFLAGS+= "-L${LOCALBASE}/lib" +.else +CONFIGURE_ARGS+= --disable-pcreposix .endif -.if !defined(WITHOUT_LIBTHR) -PTHREAD_LIBS= -lthr -.endif - -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - CFLAGS="${POUND_CFLAGS}" \ - CPPFLAGS="${POUND_CFLAGS}" \ - LDFLAGS="${POUND_LDFLAGS}" - post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/pound/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo 16 Oct 2009 18:55:10 -0000 1.20 +++ distinfo 2 Feb 2010 15:20:33 -0000 @@ -1,3 +1,3 @@ -MD5 (Pound-2.4.5.tgz) = 4c4613e857ee14c06c61ab09e28ae503 -SHA256 (Pound-2.4.5.tgz) = f7d595e08bbb7733434d154f7ced289a38214966734680b9e61de10307c528d9 -SIZE (Pound-2.4.5.tgz) = 170486 +MD5 (Pound-2.5.tgz) = 8a39f5902094619afcda7d12d9d8342c +SHA256 (Pound-2.5.tgz) = 11dfa7b469636d43aec803455894b30821ba7f6641c1cfd45df53059d3ac4c95 +SIZE (Pound-2.5.tgz) = 172084 Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- pkg-plist 18 Mar 2008 21:12:37 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -sbin/pound -sbin/poundctl Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Makefile.in 2 Feb 2010 15:20:33 -0000 @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2010-02-02 13:08:09.689620453 +0100 ++++ Makefile.in 2010-02-02 13:08:15.287921870 +0100 +@@ -63,7 +63,7 @@ + $(OBJS): pound.h config.h + + svc.o: svc.c dh512.h dh1024.h +- gcc ${CFLAGS} -c -o svc.o svc.c ++ ${CC} ${CFLAGS} -c -o svc.o svc.c + + install: all + @INSTALL@ -d ${DESTDIR}@sbindir@ --- pound-2.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100202152350.32DAA57CDB>