From a9ac780445061be7b17e91c0034f4dacb06b7d53 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Wed, 8 Oct 2003 14:28:34 +0000
Subject: Update to 2.11.1.

PR:		57743
Submitted by:	maintainer
---
 devel/distcc/Makefile                 | 22 +++++++++++-----------
 devel/distcc/distinfo                 |  2 +-
 devel/distcc/files/patch-src::state.h | 16 ----------------
 3 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 devel/distcc/files/patch-src::state.h

(limited to 'devel/distcc')

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 0c501b6db922..be9508123f16 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	2.11
+PORTVERSION=	2.11.1
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -25,11 +25,16 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibgnomeui} != ""
+.if defined(WITH_GNOME) 
 USE_GNOME=	libgnomeui
 CONFIGURE_ARGS+=	"--with-gnome"
 PKGNAMESUFFIX=	-gnome
 PLIST_SUB+=	WITH_GNOME=""
+.elif defined(WITH_GTK)
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=	"--with-gtk"
+PKGNAMESUFFIX=	-gtk
+PLIST_SUB+=	WITH_GNOME=""
 .else
 PLIST_SUB+=	WITH_GNOME="@comment "
 .endif
@@ -38,15 +43,10 @@ MAN1=	distcc.1 distccd.1
 DOC_FILES=	AUTHORS COPYING INSTALL NEWS README \
 		doc/protocol-1.txt doc/status-1.txt
 
-pre-fetch:
-.if !defined(WITHOUT_GNOME)
-	@${ECHO_MSG} "Building with GNOME-based monitor. To disable this, press"
-	@${ECHO_MSG} "Ctrl+C now and restart with 'make WITHOUT_GNOME=yes'."
-	@${ECHO_MSG} ""
-.else
-	@${ECHO_MSG} "Disabled GNOME-based monitor."
-	@${ECHO_MSG} ""
-.endif
+pre-everything::
+	@${ECHO_MSG} "Available knobs for ${PORTNAME}"
+	@${ECHO_MSG} "  - WITH_GNOME: Build GUI monitor based on GNOME"
+	@${ECHO_MSG} "  - WITH_GTK: Build GUI monitor based on GTK"
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index dd480b0730c5..0218d8e2074f 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1 +1 @@
-MD5 (distcc-2.11.tar.bz2) = f3458779c13255d88ee89ea7ccddda29
+MD5 (distcc-2.11.1.tar.bz2) = 7b096504d7ef4805d30b0638224c7f46
diff --git a/devel/distcc/files/patch-src::state.h b/devel/distcc/files/patch-src::state.h
deleted file mode 100644
index 01b0f95478d4..000000000000
--- a/devel/distcc/files/patch-src::state.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- src/state.h.orig	Tue Sep 23 06:07:03 2003
-+++ src/state.h	Sun Sep 28 16:47:03 2003
-@@ -20,7 +20,9 @@
-  * USA
-  */
- 
--#include <stdint.h>
-+#ifdef HAVE_STDINT_H
-+#  include <stdint.h>
-+#endif
- 
- int dcc_get_state_dir (char **p);
- int dcc_open_state_file (int *p_fd);
-- 
cgit v1.2.3