o Update to 0.11

o Remove patches merged back into the distribution

PR:		43360
Submitted by:	maintainer

5 files changed, 4 insertions, 36 deletions

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index d446f291d18a..531b7e2bb251 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTVERSION=	0.11
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -18,8 +17,8 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-	LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CONFIGURE_ARGS+=	--with-extra-includes="${LOCALBASE}/include" \
+			--with-extra-libs="${LOCALBASE}/lib"
 
 MAN1=	distcc.1 distccd.1
 DOC_FILES=	AUTHORS COPYING COPYING.FDL NEWS OLDNEWS README \
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index 98f7f9578684..a6238401e413 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1 +1 @@
-MD5 (distcc-0.10.1.tar.gz) = 2ca79e14a2d15da07aa4b3b181b28ad3
+MD5 (distcc-0.11.tar.gz) = b985678ef3c237c6373a4f80cf37db0e
diff --git a/devel/distcc/files/patch-src::daemon.c b/devel/distcc/files/patch-src::daemon.c
deleted file mode 100644
index e88efad2a8ae..000000000000
--- a/devel/distcc/files/patch-src::daemon.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/daemon.c.orig	Mon Sep 23 11:15:29 2002
-+++ src/daemon.c	Mon Sep 23 11:15:37 2002
-@@ -170,7 +170,7 @@
- int dcc_refuse_root(void)
- {
-     /* Just be careful */
--    if (getuid() == 0  ||  geteuid() == 0  ||  getgid() == 0 || getegid() == 0) {
-+    if (getuid() == 0  ||  geteuid() == 0) {
-         rs_log_crit("distccd must not be run as root!");
-         return EXIT_DISTCC_FAILED;
-     }
diff --git a/devel/distcc/files/patch-src::distcc.h b/devel/distcc/files/patch-src::distcc.h
deleted file mode 100644
index 743033dfecb7..000000000000
--- a/devel/distcc/files/patch-src::distcc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/distcc.h.orig	Sun Sep 15 18:20:01 2002
-+++ src/distcc.h	Sun Sep 15 18:18:53 2002
-@@ -102,6 +102,7 @@
- 
- 
- /* bulk.c */
-+#include <sys/stat.h>
- int dcc_open_read(const char *fname, int *ifd, off_t *fsize);
- 
- 
diff --git a/devel/distcc/files/patch-src::srvnet.c b/devel/distcc/files/patch-src::srvnet.c
deleted file mode 100644
index 511e19f3956d..000000000000
--- a/devel/distcc/files/patch-src::srvnet.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/srvnet.c.orig	Sun Sep 15 18:20:11 2002
-+++ src/srvnet.c	Sun Sep 15 18:19:16 2002
-@@ -43,7 +43,6 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <netdb.h>
--#include <resolv.h>
- 
- #include <sys/stat.h>
- #include <sys/types.h>