Add ${LOCALBASE}/include/{tcl8.0,tk8.0} to CPPFLAGS.

Use install-info in PLIST. This seems to need a bit more work,
but I don't get errors from the pkg_* tools so I left it in.

OK'd by:	The Portsmeister

12 files changed, 42 insertions, 18 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 791c571a8225..572533a0372c 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1997/07/14 22:19:04 erich Exp $
+# $Id: Makefile,v 1.11 1997/10/15 20:17:47 erich Exp $
 #
 
 VERSION=	0.99.14
@@ -27,12 +27,13 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=  tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LIBS=-L/usr/local/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+		  -I${LOCALBASE}/include/tk8.0" LIBS=-L${LOCALBASE}/lib
 
 DATASTUFF=  brushes palettes gradients patterns
 
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index a2e001de63a8..557852365c3c 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -13,9 +13,12 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
 lib/libgimp.so.1.0
 lib/libgimp.la
 lib/libgimp.a
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 791c571a8225..572533a0372c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1997/07/14 22:19:04 erich Exp $
+# $Id: Makefile,v 1.11 1997/10/15 20:17:47 erich Exp $
 #
 
 VERSION=	0.99.14
@@ -27,12 +27,13 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=  tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LIBS=-L/usr/local/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+		  -I${LOCALBASE}/include/tk8.0" LIBS=-L${LOCALBASE}/lib
 
 DATASTUFF=  brushes palettes gradients patterns
 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index a2e001de63a8..557852365c3c 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -13,9 +13,12 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
 lib/libgimp.so.1.0
 lib/libgimp.la
 lib/libgimp.a
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 791c571a8225..572533a0372c 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1997/07/14 22:19:04 erich Exp $
+# $Id: Makefile,v 1.11 1997/10/15 20:17:47 erich Exp $
 #
 
 VERSION=	0.99.14
@@ -27,12 +27,13 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=  tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LIBS=-L/usr/local/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+		  -I${LOCALBASE}/include/tk8.0" LIBS=-L${LOCALBASE}/lib
 
 DATASTUFF=  brushes palettes gradients patterns
 
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index a2e001de63a8..557852365c3c 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -13,9 +13,12 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
 lib/libgimp.so.1.0
 lib/libgimp.la
 lib/libgimp.a
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 791c571a8225..572533a0372c 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1997/07/14 22:19:04 erich Exp $
+# $Id: Makefile,v 1.11 1997/10/15 20:17:47 erich Exp $
 #
 
 VERSION=	0.99.14
@@ -27,12 +27,13 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=  tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LIBS=-L/usr/local/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+		  -I${LOCALBASE}/include/tk8.0" LIBS=-L${LOCALBASE}/lib
 
 DATASTUFF=  brushes palettes gradients patterns
 
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index a2e001de63a8..557852365c3c 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -13,9 +13,12 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
 lib/libgimp.so.1.0
 lib/libgimp.la
 lib/libgimp.a
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 791c571a8225..572533a0372c 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1997/07/14 22:19:04 erich Exp $
+# $Id: Makefile,v 1.11 1997/10/15 20:17:47 erich Exp $
 #
 
 VERSION=	0.99.14
@@ -27,12 +27,13 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=  tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LIBS=-L/usr/local/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+		  -I${LOCALBASE}/include/tk8.0" LIBS=-L${LOCALBASE}/lib
 
 DATASTUFF=  brushes palettes gradients patterns
 
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index a2e001de63a8..557852365c3c 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -13,9 +13,12 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
 lib/libgimp.so.1.0
 lib/libgimp.la
 lib/libgimp.a
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 791c571a8225..572533a0372c 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1997/07/14 22:19:04 erich Exp $
+# $Id: Makefile,v 1.11 1997/10/15 20:17:47 erich Exp $
 #
 
 VERSION=	0.99.14
@@ -27,12 +27,13 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=  tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV= CPPFLAGS=-I/usr/local/include LIBS=-L/usr/local/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+		  -I${LOCALBASE}/include/tk8.0" LIBS=-L${LOCALBASE}/lib
 
 DATASTUFF=  brushes palettes gradients patterns
 
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index a2e001de63a8..557852365c3c 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -13,9 +13,12 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
 lib/libgimp.so.1.0
 lib/libgimp.la
 lib/libgimp.a