Install info page now, and I move gtk(11) back to X11R6 now.

9 files changed, 150 insertions, 29 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index f08581bd0f3c..a4b52344a5a8 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.23 1998/08/12 10:38:28 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/08/14 11:16:49 vanilla Exp $
 #
 
 DISTNAME=	gtk+-1.1.1
@@ -17,11 +17,20 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	glib11\\.0\\.:${PORTSDIR}/devel/glib
 
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
 
+MAN1=		gtk11-config.1
+
+pre-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 9fcd54207f5d..b9eb0bfe33af 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,25 +1,15 @@
 --- Makefile.in.orig	Wed Aug  5 13:06:11 1998
-+++ Makefile.in	Fri Aug 14 18:14:54 1998
-@@ -91,9 +91,9 @@
- xinput_progs = @xinput_progs@
- 
++++ Makefile.in	Tue Sep 15 00:13:02 1998
+@@ -93,7 +93,7 @@
  SRC_SUBDIRS = gdk gtk
--SUBDIRS = $(SRC_SUBDIRS) docs
-+SUBDIRS = $(SRC_SUBDIRS)
+ SUBDIRS = $(SRC_SUBDIRS) docs
  
 -bin_SCRIPTS = gtk-config
 +bin_SCRIPTS = gtk11-config
  
  EXTRA_DIST =	\
  	HACKING		\
-@@ -169,12 +169,12 @@
- 	examples/wheelbarrow/wheelbarrow.c  \
- 	examples/find-examples.sh
- 
--m4datadir = $(datadir)/aclocal
--m4data_DATA = gtk.m4
-+m4datadir = $(PREFIX)/share/aclocal
-+m4data_DATA = gtk11.m4
+@@ -174,7 +174,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
@@ -28,15 +18,12 @@
  SCRIPTS =  $(bin_SCRIPTS)
  
  DATA =  $(m4data_DATA)
-@@ -227,8 +227,14 @@
+@@ -227,8 +227,11 @@
  	-rm -f config.h
  
  maintainer-clean-hdr:
 -gtk-config: $(top_builddir)/config.status gtk-config.in
 -	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
-+gtk11.m4: gtk.m4
-+	cp gtk.m4 gtk11.m4
-+
 +gtk11-config.in: gtk-config.in
 +	cp gtk-config.in gtk11-config.in
 +
@@ -45,8 +32,70 @@
  
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
+@@ -407,7 +410,7 @@
+ all-recursive-am: config.h
+ 	$(MAKE) all-recursive
+ 
+-all-am: Makefile $(SCRIPTS) $(DATA) config.h
++all-am: Makefile $(SCRIPTS) config.h
+ 
+ install-exec-am: install-binSCRIPTS
+ 
+@@ -421,7 +424,7 @@
+ install-data: install-data-recursive install-data-am
+ 	@$(NORMAL_INSTALL)
+ 
+-install: install-recursive install-exec-am install-data-am
++install: install-recursive install-exec-am
+ 	@:
+ 
+ uninstall: uninstall-recursive uninstall-am
+--- docs/Makefile.in.orig	Mon Sep 14 23:35:03 1998
++++ docs/Makefile.in	Mon Sep 14 23:39:53 1998
+@@ -92,7 +92,7 @@
+ 
+ info_TEXINFOS = gdk.texi gtk.texi glib.texi
+ 
+-man_MANS = gtk-config.1
++man_MANS = gtk11-config.1
+ 
+ EXTRA_DIST =	\
+ 	texinfo.tex 		\
+@@ -133,7 +133,7 @@
+ 
+ TAR = tar
+ GZIP = --best
+-all: Makefile $(INFO_DEPS) $(MANS)
++all: Makefile clean $(INFO_DEPS) $(MANS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+@@ -159,10 +159,13 @@
+ 
+ DVIPS = dvips
+ 
++gtk11-config.1:	gtk-config.1
++	cp gtk-config.1 gtk11-config.1
++
+ .texi.info:
+ 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ 	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+ 
+ .texi.dvi:
+ 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+@@ -361,7 +364,7 @@
+ 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ mostlyclean:  mostlyclean-aminfo mostlyclean-generic
+ 
+-clean:  clean-aminfo clean-generic mostlyclean
++clean:  clean-aminfo clean-generic mostlyclean maintainer-clean-aminfo
+ 
+ distclean:  distclean-aminfo distclean-generic clean
+ 	-rm -f config.status
 --- gtk/Makefile.in.orig	Wed Aug  5 13:06:16 1998
-+++ gtk/Makefile.in	Fri Aug 14 18:16:50 1998
++++ gtk/Makefile.in	Mon Sep 14 23:28:50 1998
 @@ -94,9 +94,9 @@
  
  gtkincludedir = $(includedir)/gtk
@@ -118,8 +167,8 @@
  
  mostlyclean-noinstPROGRAMS:
  
---- gdk/Makefile.in.orig	Fri Aug 14 18:46:01 1998
-+++ gdk/Makefile.in	Fri Aug 14 18:46:36 1998
+--- gdk/Makefile.in.orig	Wed Aug  5 13:06:14 1998
++++ gdk/Makefile.in	Mon Sep 14 23:28:50 1998
 @@ -92,9 +92,9 @@
  
  gdkincludedir = $(includedir)/gdk
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index c08049d8ac07..299af96596d9 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -110,6 +110,16 @@ include/gtk11/gtk/gtkvscrollbar.h
 include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/glib.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+@exec install-info %D/info/glib.info %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
 lib/libgdk11.a
 lib/libgdk11.la
 lib/libgdk11.so
@@ -118,7 +128,6 @@ lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
 lib/libgtk11.so.1.0
-share/aclocal/gtk11.m4
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 @dirrm include/gtk11/gdk
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index f08581bd0f3c..a4b52344a5a8 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.23 1998/08/12 10:38:28 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/08/14 11:16:49 vanilla Exp $
 #
 
 DISTNAME=	gtk+-1.1.1
@@ -17,11 +17,20 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	glib11\\.0\\.:${PORTSDIR}/devel/glib
 
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
 
+MAN1=		gtk11-config.1
+
+pre-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index c08049d8ac07..299af96596d9 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -110,6 +110,16 @@ include/gtk11/gtk/gtkvscrollbar.h
 include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/glib.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+@exec install-info %D/info/glib.info %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
 lib/libgdk11.a
 lib/libgdk11.la
 lib/libgdk11.so
@@ -118,7 +128,6 @@ lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
 lib/libgtk11.so.1.0
-share/aclocal/gtk11.m4
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 @dirrm include/gtk11/gdk
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f08581bd0f3c..a4b52344a5a8 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.23 1998/08/12 10:38:28 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/08/14 11:16:49 vanilla Exp $
 #
 
 DISTNAME=	gtk+-1.1.1
@@ -17,11 +17,20 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	glib11\\.0\\.:${PORTSDIR}/devel/glib
 
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
 
+MAN1=		gtk11-config.1
+
+pre-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index c08049d8ac07..299af96596d9 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -110,6 +110,16 @@ include/gtk11/gtk/gtkvscrollbar.h
 include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/glib.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+@exec install-info %D/info/glib.info %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
 lib/libgdk11.a
 lib/libgdk11.la
 lib/libgdk11.so
@@ -118,7 +128,6 @@ lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
 lib/libgtk11.so.1.0
-share/aclocal/gtk11.m4
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 @dirrm include/gtk11/gdk
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f08581bd0f3c..a4b52344a5a8 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.23 1998/08/12 10:38:28 vanilla Exp $
+# $Id: Makefile,v 1.24 1998/08/14 11:16:49 vanilla Exp $
 #
 
 DISTNAME=	gtk+-1.1.1
@@ -17,11 +17,20 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	glib11\\.0\\.:${PORTSDIR}/devel/glib
 
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
 
+MAN1=		gtk11-config.1
+
+pre-install:
+	@if [ ! -f ${PREFIX}/info/dir ]; then \
+	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+	fi
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index c08049d8ac07..299af96596d9 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -110,6 +110,16 @@ include/gtk11/gtk/gtkvscrollbar.h
 include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/glib.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+@exec install-info %D/info/glib.info %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
 lib/libgdk11.a
 lib/libgdk11.la
 lib/libgdk11.so
@@ -118,7 +128,6 @@ lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
 lib/libgtk11.so.1.0
-share/aclocal/gtk11.m4
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 @dirrm include/gtk11/gdk