summaryrefslogtreecommitdiff
path: root/devel/distcc
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-12-12 23:10:57 +0000
committerjmmv <jmmv@pkgsrc.org>2003-12-12 23:10:57 +0000
commitfb7ec2adea81ee63054565b089ed81d0e5cda2b5 (patch)
tree3088e42b5dba9a1c59d2cc96b2f1aa0531400087 /devel/distcc
parent361e32c3c0047b3d7228ba94ad354aae4b03c67a (diff)
downloadpkgsrc-fb7ec2adea81ee63054565b089ed81d0e5cda2b5.tar.gz
Update to 2.11.2. While here, make this package honour PKG_SYSCONFDIR.
Changes since 2.11: distcc-2.11.2 "Muscovado" 2003-10-23 BUG FIXES: * Correct the handling of --without-gnome. Reported by Dimitri Papadopoulos. * Fatal signal handlers for client and daemon should reset the signal vector before doing anything else, to protect against an (unlikely) spin if the signal is re-sent. * Corrections to .desktop file from Dag Wieers. INTERNAL: * Remove dependency on libglade for GTK+ and GNOME monitor programs. PORTABILITY: * IRIX portability fixes from Dimitri Papadopoulos. * Use AC_TYPE_SIGNAL to generate correct signal handler return types. (It can be either int or void.) DOCUMENTATION: * Various manual updates. * Update to xinetd example from Dag Wieers. distcc-2.11.1 "Burnt sugar" 2003-10-08 FEATURES: * The graphical monitor can now be configured with either --with-gnome or --with-gtk. In the second case, the GNOME libraries are not used. In both cases the resulting program is called distccmon-gnome and the functional differences are fairly small. BUG FIXES: * An error message is emitted and compilation fails if distcc cannot use the specified TMPDIR. This can happen if distccd is started by root with a TMPDIR only accessible to root. Reported by Brett Dikeman. * GNOME data files are now only installed when the application is configured with --with-gnome or --with-gtk. Files are installed into a distcc/ subdirectory of the configured data directory. (By default this is /usr/local/share/distcc/). Reported by Erik Jan Tromp and Noe`l Ko"the. * Fix bug in sending compressed files where errors were ignored. * C++ compilation using -frepo must be local. Reported by Andrew Slater. PORTABILITY: * Don't use stdint.h, which is not available on FreeBSD 4-STABLE, IRIX or Solaris. Reported by Frerich Raabe. DOCUMENTATION: * Corrections to distcc manpage reported by Lionel Sausin. * Documentation of how to write monitor programs, from Frerich Raabe. INTERNAL: * Fix state.h for use with C++. Patch from Frerich Raabe.
Diffstat (limited to 'devel/distcc')
-rw-r--r--devel/distcc/Makefile11
-rw-r--r--devel/distcc/PLIST6
-rw-r--r--devel/distcc/distinfo8
-rw-r--r--devel/distcc/patches/patch-ab13
-rw-r--r--devel/distcc/patches/patch-ac13
5 files changed, 40 insertions, 11 deletions
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index ed82ab13dd6..dd8d3202022 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/10/05 12:03:12 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/12 23:10:57 jmmv Exp $
-DISTNAME= distcc-2.11
+DISTNAME= distcc-2.11.2
CATEGORIES= devel
MASTER_SITES= http://distcc.samba.org/ftp/distcc/
EXTRACT_SUFX= .tar.bz2
@@ -9,8 +9,13 @@ MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://distcc.samba.org/
COMMENT= Tool for distributed C/C++ compiling
+USE_BUILDLINK2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --prefix=${LOCALBASE}
+CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR}
+
+PKG_SYSCONFSUBDIR= distcc
+
+.include "../../devel/popt/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/distcc/PLIST b/devel/distcc/PLIST
index 8732d80e42e..d1b0d80fb9c 100644
--- a/devel/distcc/PLIST
+++ b/devel/distcc/PLIST
@@ -1,13 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2003/10/05 12:03:12 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/12/12 23:10:57 jmmv Exp $
bin/distcc
bin/distccd
bin/distccmon-text
man/man1/distcc.1
man/man1/distccd.1
-share/distccmon-gnome-icon.png
-share/distccmon-gnome.desktop
-share/distccmon-gnome.glade
-share/distccmon-gnome.gladep
share/doc/distcc/AUTHORS
share/doc/distcc/COPYING
share/doc/distcc/INSTALL
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index ff3c2234455..f93d53be297 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/10/05 12:03:12 martti Exp $
+$NetBSD: distinfo,v 1.9 2003/12/12 23:10:57 jmmv Exp $
-SHA1 (distcc-2.11.tar.bz2) = bcadfe544c94a08862cf58f56458ca8566f2cb03
-Size (distcc-2.11.tar.bz2) = 249365 bytes
+SHA1 (distcc-2.11.2.tar.bz2) = 457c0ecf753b8cfb0856419379f79e78eb2a1103
+Size (distcc-2.11.2.tar.bz2) = 253066 bytes
SHA1 (patch-aa) = c61ca877191a1dec433f87dfd22c692416634578
+SHA1 (patch-ab) = babdfcddddebfecc1b5feb4da2128dc8efe82d98
+SHA1 (patch-ac) = 872bc0442bd10f4d79f5d55a5733cbd0dc59f297
diff --git a/devel/distcc/patches/patch-ab b/devel/distcc/patches/patch-ab
new file mode 100644
index 00000000000..e29a28099e0
--- /dev/null
+++ b/devel/distcc/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/12/12 23:10:57 jmmv Exp $
+
+--- src/distcc.c.orig 2003-10-13 11:59:25.000000000 +0200
++++ src/distcc.c
+@@ -96,7 +96,7 @@ static void dcc_show_usage(void)
+ "\n"
+ "Server specification:\n"
+ "A list of servers is taken from the environment variable $DISTCC_HOSTS, or\n"
+-"the file $HOME/.distcc/hosts, or the file %s/distcc/hosts.\n"
++"the file $HOME/.distcc/hosts, or the file %s/hosts.\n"
+ "Each host can be given in any of these forms, see the manual for details:\n"
+ "\n"
+ " localhost run in place\n"
diff --git a/devel/distcc/patches/patch-ac b/devel/distcc/patches/patch-ac
new file mode 100644
index 00000000000..6a0d92219b7
--- /dev/null
+++ b/devel/distcc/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/12/12 23:10:57 jmmv Exp $
+
+--- src/hosts.c.orig 2003-07-21 04:00:38.000000000 +0200
++++ src/hosts.c
+@@ -153,7 +153,7 @@ int dcc_get_hostlist(struct dcc_hostdef
+ }
+ }
+
+- asprintf(&path, "%s/distcc/hosts", SYSCONFDIR);
++ asprintf(&path, "%s/hosts", SYSCONFDIR);
+ if (access(path, R_OK) == 0) {
+ ret = dcc_parse_hosts_file(path, ret_list, ret_nhosts);
+ free(path);