Update devel/distcc to 2.14.

Changes:

distcc-2.14  "Lake Albina"  2004-05-02

  FEATURES:

    * The host file is looked up in $DISTCC_DIR/hosts, not hardcoded
      to ~/.distcc/hosts.  The default for $DISTCC_DIR is still
      ~/.distcc.  Suggested by Sebastien Perochon.
    * Source file name is included in success/failure messages, e.g.
         distcc[6655] ERROR: compile ./cases/bad.c on cardhu failed
    * distcc can now be built with a build directory separate from the
      source directory.  Patch from Dennis Henriksen.

  DOCUMENTATION:

    * Add documentation of DISTCC_DIR, and other fixes.  Patch from
      Thomas Schwinge.
    * Slightly improved distcc --help.

  BUG FIXES:

    * Decompression buffer can dynamically resize to allow for very
      gassy files.  From a patch by Joe Buehler.

  PORTABILITY:

    * Add sample scripts for Red Hat / Fedora, by Colin Walters.
    * mmap is always disabled on HP-UX, because the inconsistent page
      case is a bit dangerous for the way distcc uses mmap.  Suggested
      by Joe Buehler.

distcc-2.13  "Carnal Bunt"  2004-03-02

  SECURITY:

    * Enforce IPv4 access control lists when the daemon is listening
      on an IPv6 port.  This only applies when the server was compiled
      using --enable-rfc2553 and run with --allow.

  FEATURES:

    * Hash comments are allowed in host list files.

  INTERNAL:

    * Use TCP_DEFER_ACCEPT on Linux to avoid some wasted context
      switching when a new connection comes in to the server.

  BUG FIXES:

    * Some fixes for connections over SSH when built using
      --enable-rfc2553.  Reported by Jeff Rizzo.
    * Handle arguments like "-xcpp" and "-Wa,-xarch=v8".  Suggested by
      Ben Scarlet.
    * Fix resource exhaustion when DISTCC_SAVE_TEMPS is set.  Reported
      by Mark DeGeorge.
    * Fix problems in running IPv6-enabled builds on kernels without
      IPv6 support.  Reported by Lisa Seelye.

  DOCUMENTATION:

    * More instructions for distributors/packagers.

  PORTABILITY:

    * Many portability patches from Albert Chin.  These patches were
      tested on: AIX 4.3.2, 5.1; HP-UX 10.20, 11.00, 11i; IRIX 6.5;
      Redhat Linux 7.1, 9; Solaris 2.5.1, 2.6, 7, 8, 9; Tru64 UNIX
      4.0D, 5.1.
    * Possibly fix mmap problem on HP-UX with compressed transfers.
      Reported by Joe Buehler.

  TESTING:

    * Add test for compilation with compression.
    * Testsuite portability patch from Albert Chin.  The tests pass
      on: HP-UX 10.20, 11.00, 11i; IRIX 6.5; Redhat Linux7.1, 9;
      Solaris 7, 8, 9; Tru64 UNIX 4.0d, 5.1.

pkgsrc changes:

	o Add a rc.d script to start distccd, by default this runs
	  as user "nobody".
	o Use subst.mk instead of patching multiple files.

7 files changed, 33 insertions, 36 deletions

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 5e980f44059..a9e4a45a57a 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2004/02/01 02:23:24 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/02 19:11:38 xtraeme Exp $
 
-DISTNAME=		distcc-2.12.1
+DISTNAME=		distcc-2.14
 CATEGORIES=		devel
 MASTER_SITES=		http://distcc.samba.org/ftp/distcc/
 EXTRACT_SUFX=		.tar.bz2
@@ -11,12 +11,20 @@ COMMENT=		Tool for distributed C/C++ compiling
 
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
+USE_PKGINSTALL=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-rfc2553
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR=	distcc
+RCD_SCRIPTS=		distccd
+
+SUBST_CLASSES=		doc
+SUBST_STAGE.doc=	post-patch
+SUBST_FILES.doc=	src/distcc.c src/hosts.c
+SUBST_SED.doc=		-e "s|%s/distcc/hosts|%s/hosts|g"
+SUBST_MESSAGE.doc=	"Fixing paths."
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/distcc/PLIST b/devel/distcc/PLIST
index df57e9c7ec2..71360667469 100644
--- a/devel/distcc/PLIST
+++ b/devel/distcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/01/16 07:09:28 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/05/02 19:11:38 xtraeme Exp $
 bin/distcc
 bin/distccd
 bin/distccmon-text
@@ -7,7 +7,6 @@ man/man1/distccd.1
 man/man1/distccmon-text.1
 share/doc/distcc/AUTHORS
 share/doc/distcc/COPYING
-share/doc/distcc/ChangeLog
 share/doc/distcc/INSTALL
 share/doc/distcc/NEWS
 share/doc/distcc/README
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index cf90f2fa0c5..60ff01d0b24 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2004/01/16 07:09:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2004/05/02 19:11:38 xtraeme Exp $
 
-SHA1 (distcc-2.12.1.tar.bz2) = 6db2ab8376814792bbf08aec7012282c1c3520b5
-Size (distcc-2.12.1.tar.bz2) = 325428 bytes
+SHA1 (distcc-2.14.tar.bz2) = 70afbc72dd8ddd915eb8b75430c06db5a2562c68
+Size (distcc-2.14.tar.bz2) = 340510 bytes
 SHA1 (patch-aa) = c61ca877191a1dec433f87dfd22c692416634578
-SHA1 (patch-ab) = babdfcddddebfecc1b5feb4da2128dc8efe82d98
-SHA1 (patch-ac) = 872bc0442bd10f4d79f5d55a5733cbd0dc59f297
diff --git a/devel/distcc/files/distccd.sh b/devel/distcc/files/distccd.sh
new file mode 100755
index 00000000000..efa9c946dd4
--- /dev/null
+++ b/devel/distcc/files/distccd.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $NetBSD: distccd.sh,v 1.1 2004/05/02 19:11:38 xtraeme Exp $
+#
+
+# PROVIDE: distccd
+# BEFORE:  DAEMON
+
+. /etc/rc.subr
+
+name="distccd"
+rcvar=$name
+command="/usr/pkg/bin/${name}"
+command_args='--daemon --pid-file /var/run/distccd.pid --user nobody'
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/devel/distcc/patches/patch-ab b/devel/distcc/patches/patch-ab
deleted file mode 100644
index e29a28099e0..00000000000
--- a/devel/distcc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 6a0d92219b7..00000000000
--- a/devel/distcc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);
diff --git a/doc/CHANGES b/doc/CHANGES
index e3863b5ca12..aa41413d1fa 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5793 2004/05/02 18:40:24 xtraeme Exp $
+$NetBSD: CHANGES,v 1.5794 2004/05/02 19:11:38 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2318,3 +2318,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated cue to 20040329 [xtraeme 2004-05-02]
 	Updated daemontools to 0.76 [xtraeme 2004-05-02]
 	Updated bluefish to 0.13 [xtraeme 2004-05-02]
+	Updated distcc to 2.14 [xtraeme 2004-05-02]