Forget about ${PREFIX}/include/giflib.

47 files changed, 92 insertions, 141 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/audio/kdemultimedia11/Makefile b/audio/kdemultimedia11/Makefile
index a1b37f0ee025..5e0db2a6c55f 100644
--- a/audio/kdemultimedia11/Makefile
+++ b/audio/kdemultimedia11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.31 1999/03/24 23:41:16 se Exp $
+# $Id: Makefile,v 1.32 1999/05/03 22:28:26 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index a1b37f0ee025..5e0db2a6c55f 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.31 1999/03/24 23:41:16 se Exp $
+# $Id: Makefile,v 1.32 1999/05/03 22:28:26 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index a1b37f0ee025..5e0db2a6c55f 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.31 1999/03/24 23:41:16 se Exp $
+# $Id: Makefile,v 1.32 1999/05/03 22:28:26 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/deskutils/korganizer/Makefile b/deskutils/korganizer/Makefile
index f1445e5e98e2..076bba3902c2 100644
--- a/deskutils/korganizer/Makefile
+++ b/deskutils/korganizer/Makefile
@@ -3,7 +3,7 @@
 # Date created:        23 May 1998
 # Whom:                Hans Petter Bieker <hanspb@persbraten.vgs.no>
 #
-# $Id: Makefile,v 1.11 1998/10/02 18:21:25 brian Exp $
+# $Id: Makefile,v 1.12 1999/04/21 03:21:14 jkoshy Exp $
 #
 
 DISTNAME=	korganizer-1.1
@@ -22,9 +22,7 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
-
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
diff --git a/games/kdegames11/Makefile b/games/kdegames11/Makefile
index d1c0cb95c430..fa17bf4a841e 100644
--- a/games/kdegames11/Makefile
+++ b/games/kdegames11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:30:41 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:40 se Exp $
 #
 
 DISTNAME=	kdegames-1.1.1
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS= "--prefix=$(PREFIX)"
 USE_GMAKE=	yes
 
 CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index d1c0cb95c430..fa17bf4a841e 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:30:41 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:40 se Exp $
 #
 
 DISTNAME=	kdegames-1.1.1
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS= "--prefix=$(PREFIX)"
 USE_GMAKE=	yes
 
 CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index d1c0cb95c430..fa17bf4a841e 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:30:41 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:40 se Exp $
 #
 
 DISTNAME=	kdegames-1.1.1
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS= "--prefix=$(PREFIX)"
 USE_GMAKE=	yes
 
 CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index d1c0cb95c430..fa17bf4a841e 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:30:41 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:40 se Exp $
 #
 
 DISTNAME=	kdegames-1.1.1
@@ -21,8 +21,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS= "--prefix=$(PREFIX)"
 USE_GMAKE=	yes
 
 CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 34e677e1137e..910434659009 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.46 1999/03/27 10:35:57 vanilla Exp $
+# $Id: Makefile,v 1.47 1999/04/08 18:08:33 steve Exp $
 #
 
 DISTNAME=	imlib-1.9.4
@@ -23,8 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/giflib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 34e677e1137e..910434659009 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.46 1999/03/27 10:35:57 vanilla Exp $
+# $Id: Makefile,v 1.47 1999/04/08 18:08:33 steve Exp $
 #
 
 DISTNAME=	imlib-1.9.4
@@ -23,8 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/giflib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 34e677e1137e..910434659009 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.46 1999/03/27 10:35:57 vanilla Exp $
+# $Id: Makefile,v 1.47 1999/04/08 18:08:33 steve Exp $
 #
 
 DISTNAME=	imlib-1.9.4
@@ -23,8 +23,7 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/giflib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile
index 112daea8e69c..8d5615a2624c 100644
--- a/graphics/kdegraphics11/Makefile
+++ b/graphics/kdegraphics11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/02/28 21:32:01 asami Exp $
+# $Id: Makefile,v 1.26 1999/05/03 22:28:48 se Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 CFLAGS+=	"-I${PREFIX}/include"
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 112daea8e69c..8d5615a2624c 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/02/28 21:32:01 asami Exp $
+# $Id: Makefile,v 1.26 1999/05/03 22:28:48 se Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 CFLAGS+=	"-I${PREFIX}/include"
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 112daea8e69c..8d5615a2624c 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/02/28 21:32:01 asami Exp $
+# $Id: Makefile,v 1.26 1999/05/03 22:28:48 se Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 CFLAGS+=	"-I${PREFIX}/include"
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 112daea8e69c..8d5615a2624c 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.25 1999/02/28 21:32:01 asami Exp $
+# $Id: Makefile,v 1.26 1999/05/03 22:28:48 se Exp $
 #
 
 DISTNAME=	kdegraphics-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 CFLAGS+=	"-I${PREFIX}/include"
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/misc/kdeutils11/Makefile
+++ b/misc/kdeutils11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index a1b37f0ee025..5e0db2a6c55f 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.31 1999/03/24 23:41:16 se Exp $
+# $Id: Makefile,v 1.32 1999/05/03 22:28:26 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index a1b37f0ee025..5e0db2a6c55f 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.31 1999/03/24 23:41:16 se Exp $
+# $Id: Makefile,v 1.32 1999/05/03 22:28:26 se Exp $
 #
 
 DISTNAME=	kdemultimedia-1.1.1
@@ -20,8 +20,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/net/kdenetwork11/Makefile b/net/kdenetwork11/Makefile
index f512bff7adf9..6473e168f0c9 100644
--- a/net/kdenetwork11/Makefile
+++ b/net/kdenetwork11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.33 1999/05/03 22:29:03 se Exp $
+# $Id: Makefile,v 1.34 1999/05/20 19:08:00 asami Exp $
 #
 
 DISTNAME=	kdenetwork-1.1.1
@@ -27,8 +27,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index f512bff7adf9..6473e168f0c9 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.33 1999/05/03 22:29:03 se Exp $
+# $Id: Makefile,v 1.34 1999/05/20 19:08:00 asami Exp $
 #
 
 DISTNAME=	kdenetwork-1.1.1
@@ -27,8 +27,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index f512bff7adf9..6473e168f0c9 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.33 1999/05/03 22:29:03 se Exp $
+# $Id: Makefile,v 1.34 1999/05/20 19:08:00 asami Exp $
 #
 
 DISTNAME=	kdenetwork-1.1.1
@@ -27,8 +27,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index f512bff7adf9..6473e168f0c9 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.33 1999/05/03 22:29:03 se Exp $
+# $Id: Makefile,v 1.34 1999/05/20 19:08:00 asami Exp $
 #
 
 DISTNAME=	kdenetwork-1.1.1
@@ -27,8 +27,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index b0ce162fea29..1c0194165a69 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 May 1998
 # Whom:			Hans Petter Bieker <hanspb@persbraten.vgs.no>
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/03 01:57:16 steve Exp $
+# $Id: Makefile,v 1.2 1999/04/07 17:45:26 jseger Exp $
 #
 
 DISTNAME=	ktelnet-0.61
@@ -22,9 +22,7 @@ LIB_DEPENDS=	qt.2:${PORTSDIR}/x11-toolkits/qt142 \
 		kdeui.2:${PORTSDIR}/x11/kdelibs11
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
-
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 
diff --git a/palm/kpilot/Makefile b/palm/kpilot/Makefile
index d8b6cb54b1ab..ed4a676f28a9 100644
--- a/palm/kpilot/Makefile
+++ b/palm/kpilot/Makefile
@@ -3,7 +3,7 @@
 # Date created:        09 April 1998
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.21 1999/01/09 08:52:26 asami Exp $
+# $Id: Makefile,v 1.22 1999/05/24 02:31:44 steve Exp $
 #
 
 DISTNAME=	kpilot-3.0.2
@@ -24,9 +24,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_QT=		yes
 KDEDIR?=	$(PREFIX)
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-extra-includes=$(PREFIX)/include/giflib"
 USE_GMAKE=	yes
-
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555" \
 		KDEDIR="${KDEDIR}"
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 4a2526ceee38..0e14f703b3b7 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.30 1999/02/28 21:48:05 asami Exp $
+# $Id: Makefile,v 1.31 1999/05/03 22:28:56 se Exp $
 #
 
 DISTNAME=	kdeutils-1.1.1
@@ -21,10 +21,9 @@ USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+		"--with-extra-includes=$(PREFIX)/include"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
-CFLAGS+=	"-I${PREFIX}/include"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index f2be06f23695..21fbb9f2c97e 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.56 1999/04/08 09:18:10 flathill Exp $
+# $Id: Makefile,v 1.57 1999/05/01 02:43:22 steve Exp $
 
 DISTNAME=	WindowMaker-0.53.0
 PKGNAME=	windowmaker-i18n-0.53.0
@@ -34,7 +34,6 @@ CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
 		LINGUAS="de es fi fr hr it ja_JP.EUC ko nl no pl pt ru"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${PREFIX}/share/locale \
-	--with-gfx-incs="-I${LOCALBASE}/include/giflib" \
 	--disable-debug --enable-kanji --disable-shared
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index df7f93e2b33a..cd3403586602 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.49 1999/04/16 05:22:48 taoka Exp $
+# $Id: Makefile,v 1.50 1999/05/01 02:45:29 steve Exp $
 
 DISTNAME=	WindowMaker-0.53.0
 PKGNAME=	windowmaker-0.53.0
@@ -30,7 +30,7 @@ CONFIGURE_ENV=	X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${LOCALBASE}/lib/locale \
 	--with-gfx-libs="-L${LOCALBASE}/lib" \
-	--with-gfx-incs="-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+	--with-gfx-incs="-I${LOCALBASE}/include" \
 	--disable-debug
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 36c43d85a1ba..e552bdbf4325 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.35 1999/05/03 22:29:15 se Exp $
+# $Id: Makefile,v 1.36 1999/05/10 22:50:21 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1.1
@@ -22,8 +22,7 @@ LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
-		"--with-extra-includes=$(PREFIX)/include/giflib"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 		INSTALL_SCRIPT="install -c -m 555"
 USE_GMAKE=	yes