Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Jun 2002 10:35:30 +0200 (CEST)
From:      Frerich Raabe <frerich.raabe@gmx.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/39947: Update port: devel/distcc update for distcc 0.5
Message-ID:  <20020628083530.66A9A10E6@daedalus.lan>

next in thread | raw e-mail | index | archive | help

>Number:         39947
>Category:       ports
>Synopsis:       Update port: devel/distcc update for distcc 0.5
>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 01:40:01 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:
distcc is a program to distribute compilation of C code across
several machines on a network. distcc should always generate the
same results as a local compile, is simple to install and use, and
is often significantly faster than a local compile.

Unlike other distributed build systems, distcc does not require all
machines to share a filesystem, have synchronized clocks, or to
have the same libraries or header files installed. Machines can be
running different operating systems, as long as they have compatible
binary formats or cross-compilers.

distcc sends the complete preprocessed source code across the network
for each job, so all it requires of the volunteer machines is that
they be running the distccd daemon, and that they have an appropriate
compiler installed.

The accompanying patch updates the devel/distcc port for distcc version
0.5.
>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 09:42:09 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} ${LOCALBASE}/man/man1
+.endfor
 
 .include <bsd.port.mk>
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020628083530.66A9A10E6>