distcc-3.2 "Back in black" 2011-10-11

FEATURES:
 * IPv6 support
 * Optional support for GSS-API authentication
 * Added an environment variable DISTCC_SKIP_LOCAL_RETRY for skipping
   the local retry in case of a remote compilation failure
 * Some constants that were previously hard-coded in the
   sources are now configurable via environment variables:
   DISTCC_MAX_DISCREPANCY, DISTCC_IO_TIMEOUT

BUG FIXES:
 * Fixed the following 20 issues <http://code.google.com/p/distcc/issues/list>:

   30: 3.0 on OSX: ValueError: Expected absolute path, but got '(framework'.
   33: distcc --scan-includes dumps core
   34: Zeroconf fails if avahi supports IPv6
   35: Include server internal error: '<class 'sre_constants.error'>: ('bogus escape (end of line)',)'
   36: distcc-mon-gnome displays multiple rows for same host/slot
   39: build with gcc 4.1 snprintf.h error "expected declaration specifiers"
   42: distcc --show-hosts fails when using Avahi with IPv6 support and +zeroconf for distcc.
   43: Remove duplicate hosts from zeroconf list
   44: Failed tests on make check (gentoo gcc-4.3.3)
   46: Add TAGS target to Makefile.in
   49: make check fails on PreprocessAsm_Case
   57: Fix warnings
   58: PUMP mode can`t PARSE the HOSTS
   60: CPlusPlus test case fails with GCC 4.4.1
   61: Gdb tests fail in pumped mode on Ubuntu 9.10 amd64
   66: pump mode fails to compile certain KDE-4 packages, finds/looks for incorrect headers
   70: variable overlapping causing errors..
   75: include_server documentation, distcc_fallback flag incorrect
   81: distcc 3.1 will not compile correctly with current version of gcc

9 files changed, 24 insertions, 73 deletions

diff --git a/devel/distcc-pump/Makefile b/devel/distcc-pump/Makefile
index 1e7b49d304a..1ebe25999ea 100644
--- a/devel/distcc-pump/Makefile
+++ b/devel/distcc-pump/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/04/25 16:13:32 adam Exp $
 
-PKGNAME=	${DISTNAME:S/-/-pump-/}
-PKGREVISION=	4
+PKGNAME=	${DISTNAME:S/-/-pump-/:S/rc1//}
 COMMENT=	Accelerated remote compilation with distcc
 
 .include "../../devel/distcc/Makefile.common"
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 329d1a92f1b..e8b7677ec29 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2013/07/12 10:44:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2014/04/25 16:13:31 adam Exp $
 
-PKGNAME=	${DISTNAME}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:S/rc1//}
 COMMENT=	Tool for distributed C/C++ compiling
 
 .include "Makefile.common"
diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common
index bf99b81dc40..eeda2c52b73 100644
--- a/devel/distcc/Makefile.common
+++ b/devel/distcc/Makefile.common
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile.common,v 1.10 2012/10/31 11:16:53 asau Exp $
+# $NetBSD: Makefile.common,v 1.11 2014/04/25 16:13:31 adam Exp $
 # used by devel/distcc-pump/Makefile
 # used by devel/distccmon-gnome/Makefile
 # used by devel/distccmon-gtk/Makefile
 
-DISTCC_VERSION=		3.1
+# XXX: in the future, remove rc1 substitutions from Makefiles mentioned above
+DISTNAME=	distcc-3.2rc1
+CATEGORIES=	devel
+MASTER_SITES=	http://distcc.googlecode.com/files/
+EXTRACT_SUFX=	.tar.bz2
 
-DISTNAME=		distcc-${DISTCC_VERSION}
-CATEGORIES=		devel
-MASTER_SITES=		http://distcc.googlecode.com/files/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://distcc.org/
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://distcc.org/
+LICENSE=	gnu-gpl-v2
 
 DISTINFO_FILE=		${.CURDIR}/../../devel/distcc/distinfo
 PATCHDIR=		${.CURDIR}/../../devel/distcc/patches
@@ -32,7 +32,7 @@ SUBST_SED.doc=		-e "s|%s/distcc/hosts|%s/hosts|g"
 SUBST_MESSAGE.doc=	Fixing paths.
 
 .if empty(PKGNAME:Mdistcc-[0-9]*)
-DEPENDS+=		distcc>=${DISTCC_VERSION}:../../devel/distcc
+DEPENDS+=		distcc>=${PKGVERSION_NOREV}:../../devel/distcc
 .endif
 
 INSTALLATION_DIRS+=	bin
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index 5fe83433d21..d08a719dad3 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.21 2013/02/03 14:02:31 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2014/04/25 16:13:31 adam Exp $
 
-SHA1 (distcc-3.1.tar.bz2) = 30663e8ff94f13c0553fbfb928adba91814e1b3a
-RMD160 (distcc-3.1.tar.bz2) = 82229c230e6917b0df7db275460579b02dbf6b60
-Size (distcc-3.1.tar.bz2) = 588820 bytes
+SHA1 (distcc-3.2rc1.tar.bz2) = 7564e4a4890ad6ff78ec0de620329b71179361e7
+RMD160 (distcc-3.2rc1.tar.bz2) = 505447b910d90ea403a98fe0d0a3a0fa92cd7039
+Size (distcc-3.2rc1.tar.bz2) = 609904 bytes
 SHA1 (patch-aa) = f459c5e80a60b80f391d9d6c37d8ad2574740372
 SHA1 (patch-ab) = c3a306be0a3576b33f506bd6516d8242ceec07ca
 SHA1 (patch-ac) = 618015e2954dc54c6db3712381749feb17106647
-SHA1 (patch-ad) = 79ce3ea1b7dd75dce1654dd31eaa372174f8f5d1
 SHA1 (patch-ae) = d4e5eba767f08a1c346c0223ddf88e98a5ed7c59
-SHA1 (patch-src_dotd.c) = 20a540e724858c62ca0b179860787508e72a2d00
-SHA1 (patch-src_emaillog.c) = be202a47d82d412d572bee5ff29e2ebc707922c4
 SHA1 (patch-src_io.c) = 5c662a4f9af20b5cffbd6285a3b0d6d6c4066571
diff --git a/devel/distcc/patches/patch-ad b/devel/distcc/patches/patch-ad
deleted file mode 100644
index ad7c005d6c0..00000000000
--- a/devel/distcc/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/01/17 13:27:48 adam Exp $
-
---- configure.orig	2008-12-02 22:50:34.000000000 +0100
-+++ configure
-@@ -7968,6 +7968,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/types.h>
- #include <sys/socket.h>
- 
- int
diff --git a/devel/distcc/patches/patch-src_dotd.c b/devel/distcc/patches/patch-src_dotd.c
deleted file mode 100644
index 49043fd1e50..00000000000
--- a/devel/distcc/patches/patch-src_dotd.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_dotd.c,v 1.1 2013/02/03 13:56:17 schmonz Exp $
-
-Use system vsnprintf() as intended (fixes build on OS X 10.6).
-
---- src/dotd.c.orig	2008-12-02 21:50:25.000000000 +0000
-+++ src/dotd.c
-@@ -18,6 +18,8 @@
-  * USA.
-  */
- 
-+#include <config.h>
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/devel/distcc/patches/patch-src_emaillog.c b/devel/distcc/patches/patch-src_emaillog.c
deleted file mode 100644
index c034d4cd7a4..00000000000
--- a/devel/distcc/patches/patch-src_emaillog.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_emaillog.c,v 1.1 2013/02/03 13:56:17 schmonz Exp $
-
-Use system vsnprintf() as intended (fixes build on OS X 10.6).
-
---- src/emaillog.c.orig	2008-12-02 21:50:24.000000000 +0000
-+++ src/emaillog.c
-@@ -18,6 +18,8 @@
-  * USA.
-  */
- 
-+#include <config.h>
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <errno.h>
diff --git a/devel/distccmon-gnome/Makefile b/devel/distccmon-gnome/Makefile
index 4b52255f39c..62d74d368a0 100644
--- a/devel/distccmon-gnome/Makefile
+++ b/devel/distccmon-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2014/02/12 23:17:46 tron Exp $
+# $NetBSD: Makefile,v 1.50 2014/04/25 16:13:32 adam Exp $
 
-PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	30
+PKGNAME=	${DISTNAME:S/-/-gnome-/:S/rc1//}
 CATEGORIES+=	gnome
 COMMENT=	Graphical monitor for distcc, the distributed C/C++ compiler
 
@@ -11,10 +10,10 @@ USE_TOOLS+=		pkg-config
 CONFIGURE_ARGS+=	--with-gnome
 
 BUILD_TARGET=		distccmon-gnome
+INSTALLATION_DIRS+=	share/distcc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/distcc
 	${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \
 		${DESTDIR}${PREFIX}/share/distcc
 	${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \
diff --git a/devel/distccmon-gtk/Makefile b/devel/distccmon-gtk/Makefile
index 265848b4e2a..e2e970b0ba7 100644
--- a/devel/distccmon-gtk/Makefile
+++ b/devel/distccmon-gtk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2013/10/10 14:42:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2014/04/25 16:13:32 adam Exp $
 
-PKGNAME=	${DISTNAME:S/-/-gtk-/}
-PKGREVISION=	19
+PKGNAME=	${DISTNAME:S/-/-gtk-/:S/rc1//}
 COMMENT=	Graphical monitor for distcc, the distributed C/C++ compiler
 
 .include "../../devel/distcc/Makefile.common"
@@ -16,11 +15,11 @@ SUBST_SED.gtk=		-e "s/distccmon-gnome/distccmon-gtk/g"
 SUBST_MESSAGE.gtk=	Renaming -gnome to -gtk.
 
 BUILD_TARGET=		distccmon-gnome
+INSTALLATION_DIRS+=	share/distcc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome \
 		${DESTDIR}${PREFIX}/bin/distccmon-gtk
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/distcc
 	${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome-icon.png \
 		${DESTDIR}${PREFIX}/share/distcc/distccmon-gtk-icon.png
 	${INSTALL_DATA} ${WRKSRC}/gnome/distccmon-gnome.desktop \