ぽっぺん日記@karashi.org

_ 今日のできごと

朝から直行でお客さん訪問2件。

作業に時間がかかったり、電車で読書していて乗り過ごしたり(ぉ なんだりで、会社に辿り着いたのが17時近くになってしまった。

_ www/pound(2)

otsuneさんにアドバイスを頂いたので(いつもありがとうございます)、書き直してみた。

USE_RC_SUBRのおかげで、Makefileが昨日書いたものより、すっきりした感じがする。

diff -uNr www/pound/Makefile local/www/pound/Makefile
--- www/pound/Makefile	Tue Jun 28 13:13:00 2005
+++ local/www/pound/Makefile	Sat Jul  2 19:39:22 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,39 @@
 
 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
+
+.include <bsd.port.post.mk>
diff -uNr www/pound/distinfo local/www/pound/distinfo
--- www/pound/distinfo	Sun May 29 08:41:44 2005
+++ 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 -uNr www/pound/files/pound.sh local/www/pound/files/pound.sh
--- www/pound/files/pound.sh	Wed Jul 23 07:49:41 2003
+++ 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 -uNr www/pound/files/pound.sh.in local/www/pound/files/pound.sh.in
--- www/pound/files/pound.sh.in	Thu Jan  1 09:00:00 1970
+++ 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 -uNr www/pound/pkg-plist local/www/pound/pkg-plist
--- www/pound/pkg-plist	Wed Jul 23 07:49:41 2003
+++ 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%%