7 files changed, 14 insertions, 21 deletions

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"