From owner-freebsd-ports Fri Jun 28 2:10:22 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F2EA37B406 for ; Fri, 28 Jun 2002 02:10:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8256243E09 for ; Fri, 28 Jun 2002 02:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5S9A1JU080893 for ; Fri, 28 Jun 2002 02:10:01 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5S9A1Oh080892; Fri, 28 Jun 2002 02:10:01 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B394137B400 for ; Fri, 28 Jun 2002 02:03:15 -0700 (PDT) Received: from mail0.ewetel.de (mail0.ewetel.de [212.6.122.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0063D43E06 for ; Fri, 28 Jun 2002 02:03:15 -0700 (PDT) (envelope-from frerich@frerich.ath.cx) Received: from daedalus.lan (dsl-213-170-170-118.ewetel.net [213.170.170.118]) by mail0.ewetel.de (8.12.1/8.12.1) with ESMTP id g5S939XG027938 for ; Fri, 28 Jun 2002 11:03:13 +0200 (MEST) Received: by daedalus.lan (Postfix, from userid 1001) id 9E2BB10E6; Fri, 28 Jun 2002 11:03:09 +0200 (CEST) Message-Id: <20020628090309.9E2BB10E6@daedalus.lan> Date: Fri, 28 Jun 2002 11:03:09 +0200 (CEST) From: Frerich Raabe Reply-To: Frerich Raabe To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/39948: Update port: devel/distcc (update to PR #39947) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 39948 >Category: ports >Synopsis: Update port: devel/distcc (update to PR #39947) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 28 02:10:00 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Frerich Raabe >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD daedalus.lan 4.6-STABLE FreeBSD 4.6-STABLE #6: Fri Jun 21 17:33:42 CEST 2002 root@daedalus.lan:/usr/obj/usr/src/sys/SWIFT i386 >Description: The accompanying patch overrides the one provided with problem report #39947; it now honours ${MANPREFIX} when installing the man pages. >How-To-Repeat: >Fix: diff -urN distcc.orig/Makefile distcc/Makefile --- distcc.orig/Makefile Fri Jun 28 09:42:27 2002 +++ distcc/Makefile Fri Jun 28 10:45:44 2002 @@ -6,25 +6,43 @@ # PORTNAME= distcc -PORTVERSION= 0.4 +PORTVERSION= 0.5 CATEGORIES= devel MASTER_SITES= http://ftp.samba.org/ftp/distcc/ MAINTAINER= frerich.raabe@gmx.de LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt +BUILD_DEPENDS= ps2pdf:${PORTSDIR}/print/ghostscript-gnu +USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" -BUILD_WRKSRC= ${WRKSRC}/src +MAN1= distcc.1 distccd.1 + +DOC_FILES= distcc.pdf distcc.ps distcc.html \ + distccd.pdf distccd.ps distccd.html do-install: @${INSTALL_PROGRAM} ${WRKSRC}/src/distcc ${PREFIX}/bin @${INSTALL_PROGRAM} ${WRKSRC}/src/distccd ${PREFIX}/sbin -post-install: +post-install: install-doc install-man @${CAT} ${PKGMESSAGE} + +install-doc: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in ${DOC_FILES} + @${INSTALL_MAN} ${WRKSRC}/man/${file} ${DOCSDIR} +.endfor +.endif + +install-man: +.for file in ${MAN1} + ${INSTALL_MAN} ${WRKSRC}/man/${file} ${MANPREFIX}/man/man1 +.endfor .include diff -urN distcc.orig/distinfo distcc/distinfo --- distcc.orig/distinfo Fri Jun 28 09:42:27 2002 +++ distcc/distinfo Fri Jun 28 02:55:35 2002 @@ -1 +1 @@ -MD5 (distcc-0.4.tar.gz) = 3b21a4bde9810eb8040b05e6924430f8 +MD5 (distcc-0.5.tar.gz) = e3c7054c2bd766b891b1ad9e779d3f7e diff -urN distcc.orig/files/patch-src::dparent.c distcc/files/patch-src::dparent.c --- distcc.orig/files/patch-src::dparent.c Fri Jun 28 09:42:27 2002 +++ distcc/files/patch-src::dparent.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/dparent.c.orig Tue Jun 25 15:58:35 2002 -+++ src/dparent.c Tue Jun 25 15:58:48 2002 -@@ -126,7 +126,7 @@ - - memset(&act_exited, 0, sizeof act_exited); - act_exited.sa_handler = dcc_child_exited; -- act_exited.sa_flags = SA_NOCLDSTOP; -+ act_exited.sa_flags = SA_NOCLDSTOP|SA_RESTART; - - if (sigaction(SIGTERM, &act_catch, NULL) - || sigaction(SIGHUP, &act_catch, NULL) diff -urN distcc.orig/files/patch-src::serve.c distcc/files/patch-src::serve.c --- distcc.orig/files/patch-src::serve.c Fri Jun 28 09:42:27 2002 +++ distcc/files/patch-src::serve.c Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/serve.c.orig Tue Jun 25 15:42:07 2002 -+++ src/serve.c Tue Jun 25 15:42:30 2002 -@@ -189,7 +189,7 @@ - * - * XXX: Perhaps this should be optional so that we can compare - * performance each way? */ -- if (mknod(temp_i, S_IFIFO|S_IRUSR|S_IWUSR, 0) == -1) { -+ if (mkfifo(temp_i, S_IFIFO|S_IRUSR|S_IWUSR) == -1) { - rs_log_error("failed to make fifo %s: %s", temp_i, - strerror(errno)); - goto failed; diff -urN distcc.orig/pkg-plist distcc/pkg-plist --- distcc.orig/pkg-plist Fri Jun 28 09:42:27 2002 +++ distcc/pkg-plist Fri Jun 28 03:32:05 2002 @@ -1,2 +1,9 @@ bin/distcc sbin/distccd +%%PORTDOCS%%share/doc/distcc/distcc.pdf +%%PORTDOCS%%share/doc/distcc/distcc.ps +%%PORTDOCS%%share/doc/distcc/distcc.html +%%PORTDOCS%%share/doc/distcc/distccd.pdf +%%PORTDOCS%%share/doc/distcc/distccd.ps +%%PORTDOCS%%share/doc/distcc/distccd.html +%%PORTDOCS%%@dirrm share/doc/distcc >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message