Date: Tue, 5 Jul 2005 17:17:25 +0900 (JST) From: Shinsuke Matsui <smatsui@karashi.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: anders@FreeBSD.org Subject: ports/82998: [PATCH] www/pound: update to 1.9 Message-ID: <200507050817.j658H3Bd024999@localhost.my.domain> Resent-Message-ID: <200507050820.j658KNIa034887@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82998 >Category: ports >Synopsis: [PATCH] www/pound: update to 1.9 >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 Jul 05 08:20:23 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Shinsuke Matsui >Release: FreeBSD 4.11-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD localhost.my.domain 4.11-RELEASE-p11 FreeBSD 4.11-RELEASE-p11 #1: Thu Jun 30 12:01:33 JST 2005 >Description: - Update to 1.9 - Add some OPTIONS - Install docs - Use rcNG startup script Added file(s): - files/pound.sh.in - pkg-message Removed file(s): - files/pound.sh Port maintainer (anders@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- pound-1.9.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/pound/Makefile /usr/ports/local/www/pound/Makefile --- /usr/ports/www/pound/Makefile Mon Jun 6 11:47:19 2005 +++ /usr/ports/local/www/pound/Makefile Sun Jul 3 13:32:47 2005 @@ -6,7 +6,7 @@ # PORTNAME= pound -PORTVERSION= 1.8.5 +PORTVERSION= 1.9 CATEGORIES= www net MASTER_SITES= http://www.apsis.ch/pound/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -18,16 +18,40 @@ GNU_CONFIGURE= yes USE_OPENSSL= yes +USE_RC_SUBR= ${PORTNAME}.sh + +SUB_LIST+= NAME=${PORTNAME} CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -MAKE_ARGS+= F_CONF=${PREFIX}/etc/pound.cfg +MAKE_ARGS+= F_CONF=${PREFIX}/etc/${PORTNAME}.cfg MAN8= pound.8 +OPTIONS+= DAEMON "Running as a daemon" on \ + LOG "With Syslog support" on \ + MSDAV "With the Microsoft WebDAV extensions support" off + +.include <bsd.port.pre.mk> + +.if !defined(WITH_DAEMON) +CONFIGURE_ARGS+= --disable-daemon +.endif + +.if !defined(WITH_LOG) +CONFIGURE_ARGS+= --without-log +.endif + +.if defined(WITH_MSDAV) +CONFIGURE_ARGS+= --enable-msdav +.endif + post-install: - @${ECHO} "===> Installing ${PREFIX}/etc/rc.d/pound.sh" - @${ECHO} "===> startup file as ${PREFIX}/etc/rc.d/pound.sh.sample" - @${INSTALL_SCRIPT} -m 751 ${FILESDIR}/pound.sh \ - ${PREFIX}/etc/rc.d/pound.sh.sample -.include <bsd.port.mk> +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/FAQ ${DOCSDIR} +.endif + @${CAT} ${PKGMESSAGE} + +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/www/pound/distinfo /usr/ports/local/www/pound/distinfo --- /usr/ports/www/pound/distinfo Mon Jun 6 11:47:19 2005 +++ /usr/ports/local/www/pound/distinfo Tue Jun 28 13:46:21 2005 @@ -1,2 +1,2 @@ -MD5 (Pound-1.8.5.tgz) = 508ef4411ae4bf292c17c966746935d5 -SIZE (Pound-1.8.5.tgz) = 142055 +MD5 (Pound-1.9.tgz) = f1ec64357e0a53ed8050847517209525 +SIZE (Pound-1.9.tgz) = 143284 diff -ruN --exclude=CVS /usr/ports/www/pound/files/pound.sh /usr/ports/local/www/pound/files/pound.sh --- /usr/ports/www/pound/files/pound.sh Wed Jul 23 07:49:41 2003 +++ /usr/ports/local/www/pound/files/pound.sh Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in - start) - if [ -x ${PREFIX}/sbin/pound ]; then - ${PREFIX}/sbin/pound & - echo -n ' pound' - fi - ;; - stop) - killall pound - echo -n ' pound' - ;; - *) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac diff -ruN --exclude=CVS /usr/ports/www/pound/files/pound.sh.in /usr/ports/local/www/pound/files/pound.sh.in --- /usr/ports/www/pound/files/pound.sh.in Thu Jan 1 09:00:00 1970 +++ /usr/ports/local/www/pound/files/pound.sh.in Sat Jul 2 16:22:13 2005 @@ -0,0 +1,30 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: %%NAME%% +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: FreeBSD shutdown + +# Add the following line to /etc/rc.conf to enable `%%NAME%%': +# +#%%NAME%%_enable="YES" +# +# and be sure to configure %%PREFIX%%/etc/%%NAME%%.conf + +. "%%RC_SUBR%%" + +name="%%NAME%%" +rcvar=`set_rcvar` + +command="%%PREFIX%%/sbin/$name" +pidfile="/var/run/$name.pid" +required_files="%%PREFIX%%/etc/$name.cfg" + +# read configuration and set defaults +load_rc_config $name +: ${%%NAME%%_enable="NO"} + +run_rc_command "$1" diff -ruN --exclude=CVS /usr/ports/www/pound/pkg-message /usr/ports/local/www/pound/pkg-message --- /usr/ports/www/pound/pkg-message Thu Jan 1 09:00:00 1970 +++ /usr/ports/local/www/pound/pkg-message Sun Jul 3 13:33:37 2005 @@ -0,0 +1,6 @@ +****************************************************** + +To run pound from startup, add 'pound_enable="YES"' +in your /etc/rc.conf. + +****************************************************** diff -ruN --exclude=CVS /usr/ports/www/pound/pkg-plist /usr/ports/local/www/pound/pkg-plist --- /usr/ports/www/pound/pkg-plist Wed Jul 23 07:49:41 2003 +++ /usr/ports/local/www/pound/pkg-plist Sat Jul 2 16:07:30 2005 @@ -1,2 +1,4 @@ -etc/rc.d/pound.sh.sample sbin/pound +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%@dirrm %%DOCSDIR%% --- pound-1.9.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?200507050817.j658H3Bd024999>