4 files changed, 34 insertions, 26 deletions

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 9b7119cde2ae..9e901196bcfb 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	2.14
+PORTVERSION=	2.16
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -15,11 +15,13 @@ COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
+USE_RC_SUBR=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+DISTCCD_PIDFILE=/var/run/distccd.pid
 
 OPTIONS=	GNOME "Build GUI monitor based on GNOME" Off \
 		GTK "Build GUI monitor based on GTK" Off
@@ -46,6 +48,9 @@ DOC_FILES=	AUTHORS INSTALL NEWS README \
 		doc/protocol-2.txt doc/reporting-bugs.txt
 
 pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%RC_SUBR%%|${RC_SUBR}|; \
+		s|%%DISTCCD_PIDFILE%%|${DISTCCD_PIDFILE}|' \
+		${FILESDIR}/distccd.sh.sample >${WRKDIR}/distccd.sh
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
 		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
@@ -56,12 +61,12 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
-	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/distccd.sh.sample \
-		${PREFIX}/etc/rc.d/distccd.sh.sample
+	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/distccd.sh \
+		${PREFIX}/etc/rc.d/distccd.sh
 
 post-install: install-doc install-man
-	@${TOUCH} /var/run/distccd.pid
-	@${CHOWN} distcc:distcc /var/run/distccd.pid
+	@${TOUCH} ${DISTCCD_PIDFILE}
+	@${CHOWN} distcc:distcc ${DISTCCD_PIDFILE}
 	@${CAT} ${PKGMESSAGE}
 
 install-doc:
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index b23541ce442f..b486f5ea2f20 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,2 +1,2 @@
-MD5 (distcc-2.14.tar.bz2) = 612ee81b3e04fc6000dfbc4078ec9d8b
-SIZE (distcc-2.14.tar.bz2) = 340510
+MD5 (distcc-2.16.tar.bz2) = c28aae996fb4646db27204d9cd6a78dc
+SIZE (distcc-2.16.tar.bz2) = 336681
diff --git a/devel/distcc/files/distccd.sh.sample b/devel/distcc/files/distccd.sh.sample
index 48774c588b14..e3cc9ef635f8 100644
--- a/devel/distcc/files/distccd.sh.sample
+++ b/devel/distcc/files/distccd.sh.sample
@@ -3,23 +3,26 @@
 # $FreeBSD$
 #
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+# PROVIDE: distccd
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD shutdown
 
-case "$1" in
-start)
-	[ -x ${PREFIX}/sbin/distccd ] && \
-		${PREFIX}/sbin/distccd -P /var/run/distccd.pid \
-		--user distcc --daemon && echo -n ' distcc'
-	;;
-stop)
-	kill -TERM `cat /var/run/distccd.pid` && echo -n ' distcc'
-	;;
-*)
-	echo "Usage: `basename $0` { start | stop }" >&2
-	;;
-esac
+#
+# Add the following lines to /etc/rc.conf to enable distccd:
+#
+# distccd_enable="YES"
+#
+
+distccd_enable="NO"
+distccd_flags="--user distcc --daemon -P %%DISTCCD_PIDFILE%%"
+
+. %%RC_SUBR%%
+
+name=distccd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=%%DISTCCD_PIDFILE%%
 
-exit 0
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/devel/distcc/pkg-plist b/devel/distcc/pkg-plist
index 70e92e95bfce..c8561953dffd 100644
--- a/devel/distcc/pkg-plist
+++ b/devel/distcc/pkg-plist
@@ -3,7 +3,7 @@ bin/distcc
 bin/distccmon-text
 %%WITH_GNOME%%bin/distccmon-gnome
 sbin/distccd
-etc/rc.d/distccd.sh.sample
+etc/rc.d/distccd.sh
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS