4 files changed, 17 insertions, 20 deletions

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index f4d0987da5a0..461ae99699b0 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -7,13 +7,9 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	2.18.3
-PORTREVISION=	11
+PORTVERSION=	3.1
 CATEGORIES=	devel
-MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
-#PATCH_SITES=	http://0pointer.de/public/
-PATCH_SITES=	${MASTER_SITES_LOCAL}
-PATCH_SITE_SUBDIR=	ahze
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
@@ -23,7 +19,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	 --enable-rfc2553
+CONFIGURE_ARGS=	--enable-gprof
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -31,20 +27,22 @@ DISTCCD_PIDFILE=/var/run/distccd.pid
 USE_RC_SUBR=	distccd.sh
 SUB_LIST=	DISTCCD_PIDFILE=${DISTCCD_PIDFILE}
 
-OPTIONS=	AVAHI   "Enable Avahi Zeroconf/mDNS/Bonjour support" Off \
-		GNOME	"Build GUI monitor based on GNOME"	Off \
+OPTIONS=	GNOME	"Build GUI monitor based on GNOME"	Off \
 		GTK	"Build GUI monitor based on GTK"	Off \
+		RFC2553 "Enable IPv6 support"	Off \
+		AVAHI "Enable Avahi Zeroconf/mDNS/Bonjour support"	Off \
 		COMPILER_LINKS	"Create symlinks to distcc"	On
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_AVAHI)
-PATCHFILES+=	distcc-avahi-080101.patch
+.if defined(WITHOUT_AVAHI)
+CONFIGURE_ARGS+=	--without-avahi
+.else
 LIB_DEPENDS+=	avahi-glib.1:${PORTSDIR}/net/avahi-app
-PATCH_DIST_STRIP=	-p1
-USE_AUTOTOOLS+=	autoconf:262
-AUTOCONF_ARGS+=	-I${LOCALBASE}/share/libtool/libltdl/
-CFLAGS+=	-DHAVE_AVAHI
+.endif
+
+.if defined(WITHOUT_RFC2553)
+CONFIGURE_ARGS+=	--without-avahi
 .endif
 
 .if defined(WITH_COMPILER_LINKS)
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index 7fabfe3901bb..21f6677c0d26 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1,6 +1,6 @@
-MD5 (distcc-2.18.3.tar.bz2) = 0d6b80a1efc3a3d816c4f4175f63eaa2
-SHA256 (distcc-2.18.3.tar.bz2) = 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
-SIZE (distcc-2.18.3.tar.bz2) = 341601
+MD5 (distcc-3.1.tar.bz2) = a1a9d3853df7133669fffec2a9aab9f3
+SHA256 (distcc-3.1.tar.bz2) = f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
+SIZE (distcc-3.1.tar.bz2) = 588820
 MD5 (distcc-avahi-080101.patch) = 461b21ec45c9314b70fb04b634e581de
 SHA256 (distcc-avahi-080101.patch) = 4e506a8a2299af18839c443b8665ea4fe4492bf3ecae010d262406c01509058e
 SIZE (distcc-avahi-080101.patch) = 387519
diff --git a/devel/distcc/pkg-descr b/devel/distcc/pkg-descr
index f38b8f5702c7..fe90a95afb16 100644
--- a/devel/distcc/pkg-descr
+++ b/devel/distcc/pkg-descr
@@ -18,6 +18,6 @@ This version also comes with a text-based as well as a GNOME-based monitor
 to inspect the load on the cluster, and how it is distributed among the
 various distcc nodes.
 
-WWW: http://distcc.samba.org/
+WWW: http://distcc.org
 
 - Frerich Raabe frerich.raabe@gmx.de
diff --git a/devel/distcc/pkg-message b/devel/distcc/pkg-message
index 08bc97ee586f..ec6f8c1842e9 100644
--- a/devel/distcc/pkg-message
+++ b/devel/distcc/pkg-message
@@ -1,7 +1,6 @@
 WARNING: distcc[d] performs NO AUTHENTICATION at all and should
 ONLY be used in trusted networks!
 
-NEW in 2.18
 Distccd now requires the --allow (-a) argument when running
 in daemon mode. This option restricts distcc to a specific
 network, by default this port uses 127.0.0.0/8, you should