From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 15 03:30:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07F2816A4CE for ; Thu, 15 Jul 2004 03:30:28 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE4BB43D1D for ; Thu, 15 Jul 2004 03:30:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6F3URQw075934 for ; Thu, 15 Jul 2004 03:30:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6F3UNIw075904; Thu, 15 Jul 2004 03:30:23 GMT (envelope-from gnats) Resent-Date: Thu, 15 Jul 2004 03:30:23 GMT Resent-Message-Id: <200407150330.i6F3UNIw075904@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Michael Johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 550A116A4CE for ; Thu, 15 Jul 2004 03:26:26 +0000 (GMT) Received: from imf17aec.mail.bellsouth.net (imf17aec.mail.bellsouth.net [205.152.59.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEED843D2D for ; Thu, 15 Jul 2004 03:26:25 +0000 (GMT) (envelope-from ahze@ahze.net) Received: from ahze.net ([68.209.163.3]) by imf17aec.mail.bellsouth.net (InterMail vM.5.01.06.08 201-253-122-130-108-20031117) with ESMTP id <20040715032624.PYFC1742.imf17aec.mail.bellsouth.net@ahze.net>; Wed, 14 Jul 2004 23:26:24 -0400 Received: (from root@localhost) by ahze.net (8.12.11/8.12.11/Submit) id i6F3QOJN025865; Wed, 14 Jul 2004 23:26:24 -0400 (EDT) (envelope-from ahze) Message-Id: <200407150326.i6F3QOJN025865@ahze.net> Date: Wed, 14 Jul 2004 23:26:24 -0400 (EDT) From: Michael Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: dom@helenmarks.co.uk Subject: ports/69081: [PATCH] devel/distcc-gtk: update to 2.16 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2004 03:30:28 -0000 >Number: 69081 >Category: ports >Synopsis: [PATCH] devel/distcc-gtk: update to 2.16 >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: Thu Jul 15 03:30:19 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Michael Johnson >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #56: Tue Jul 13 10:04:47 EDT 2004 >Description: - Update to 2.16 - rcNG'ify startup script I get the following error if db/ports/distcc/options does not exist and I choose either the gtk gnome option, I thought it was my error at first but it does this with 2.14 also. make: don't know how to make /usr/ports/devel/distcc/work/.build_done.distcc-2.16._usr_local. Stop *** Error code 2 Stop in /usr/ports/devel/distcc. Port maintainer (dom@helenmarks.co.uk) is cc'd. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- distcc-gtk-2.16.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/distcc/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- Makefile 26 May 2004 20:46:29 -0000 1.41 +++ Makefile 15 Jul 2004 03:24:37 -0000 @@ -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 @@ 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/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 @@ @${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: Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/distcc/distinfo,v retrieving revision 1.29 diff -u -r1.29 distinfo --- distinfo 26 May 2004 20:46:29 -0000 1.29 +++ distinfo 15 Jul 2004 02:09:52 -0000 @@ -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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/distcc/pkg-plist,v retrieving revision 1.13 diff -u -r1.13 pkg-plist --- pkg-plist 19 Dec 2003 11:53:22 -0000 1.13 +++ pkg-plist 15 Jul 2004 02:39:49 -0000 @@ -3,7 +3,7 @@ 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 Index: files/distccd.sh.sample =================================================================== RCS file: /home/ncvs/ports/devel/distcc/files/distccd.sh.sample,v retrieving revision 1.1 diff -u -r1.1 distccd.sh.sample --- files/distccd.sh.sample 10 Aug 2003 03:49:48 -0000 1.1 +++ files/distccd.sh.sample 15 Jul 2004 02:51:38 -0000 @@ -1,25 +1,28 @@ #!/bin/sh # -# $FreeBSD: ports/devel/distcc/files/distccd.sh.sample,v 1.1 2003/08/10 03:49:48 leeym Exp $ +# $FreeBSD: ports/net/minisapserver/files/sapserver.sh,v 1.1 2004/05/25 09:17:51 krion Exp $ # -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -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 +# PROVIDE: distccd +# REQUIRE: NETWORKING +# KEYWORD: FreeBSD shutdown -exit 0 +# +# 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%% + +load_rc_config ${name} +run_rc_command "$1" --- distcc-gtk-2.16.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: