Will not build testgtk anymore, review pkg/PLIST.

Pushed by:	jordan :)

2 files changed, 84 insertions, 29 deletions

diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 6cbd584d1638..5e9bfaed5695 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,16 +1,15 @@
---- glib/configure.orig	Sun Dec  7 05:45:40 1997
-+++ glib/configure	Tue Dec  9 16:00:29 1997
-@@ -561,6 +561,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
-+INSTALL="/usr/bin/install -c"
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:566: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
---- docs/Makefile.in.orig	Sun Dec  7 06:12:07 1997
-+++ docs/Makefile.in	Tue Dec  9 16:00:29 1997
-@@ -117,7 +117,7 @@
+--- docs/Makefile.in.orig	Tue Apr 14 11:22:32 1998
++++ docs/Makefile.in	Fri Apr 24 04:21:27 1998
+@@ -111,7 +111,7 @@
+ 
+ TAR = tar
+ GZIP = --best
+-all: Makefile $(INFO_DEPS)
++all: Makefile clean $(INFO_DEPS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+@@ -140,7 +140,7 @@
  .texi.info:
  	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
  	cd $(srcdir) \
@@ -19,13 +18,68 @@
  
  .texi.dvi:
  	TEXINPUTS=$(srcdir):$$TEXINPUTS \
---- configure.orig	Sun Jan  4 01:16:42 1998
-+++ configure	Mon Jan  5 23:09:23 1998
-@@ -590,6 +590,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
-+INSTALL="/usr/bin/install -c"
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:595: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
+@@ -300,7 +300,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	Tue Apr 14 11:22:14 1998
++++ gtk/Makefile.in	Fri Apr 24 03:59:06 1998
+@@ -397,7 +397,7 @@
+ SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c simple.c
+ OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o
+ 
+-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
++all: Makefile $(LTLIBRARIES) $(HEADERS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+--- glib/Makefile.am.orig	Sat Mar 28 00:50:30 1998
++++ glib/Makefile.am	Sat Apr  4 16:18:47 1998
+@@ -1,7 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-configincludedir = $(pkglibdir)/include
+-
+ lib_LTLIBRARIES = libglib.la
+ 
+ libglib_la_SOURCES = \
+@@ -20,10 +18,7 @@
+ 		gutils.c
+ 
+ include_HEADERS = \
+-		glib.h
+-
+-configinclude_DATA = \
+-		glibconfig.h
++		glib.h glibconfig.h
+ 
+ libglib_la_LDFLAGS = -version-info 1:0:0
+ 
+--- glib/Makefile.in.orig	Sat Mar 28 09:02:29 1998
++++ glib/Makefile.in	Sat Apr  4 16:19:26 1998
+@@ -68,8 +68,6 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ 
+-configincludedir = $(pkglibdir)/include
+-
+ lib_LTLIBRARIES = libglib.la
+ 
+ libglib_la_SOURCES = \
+@@ -88,10 +86,7 @@
+ 		gutils.c
+ 
+ include_HEADERS = \
+-		glib.h
+-
+-configinclude_DATA = \
+-		glibconfig.h
++		glib.h glibconfig.h
+ 
+ libglib_la_LDFLAGS = -version-info 1:0:0
+ 
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index ab02c5865bda..f20bf1072c96 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -101,15 +101,16 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-info/dir
+@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
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
+@exec [ -f %D/info/dif ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dif
+@exec install-info %D/info/glib.info %D/info/dif
+@exec install-info %D/info/gtk.info %D/info/dif
 lib/libgdk.a
 lib/libgdk.la
 lib/libgdk.so