4 files changed, 149 insertions, 19 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 2231e1d3b013..f08581bd0f3c 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.22 1998/08/07 23:08:38 asami Exp $
+# $Id: Makefile,v 1.23 1998/08/12 10:38:28 vanilla Exp $
 #
 
 DISTNAME=	gtk+-1.1.1
@@ -15,8 +15,9 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	glib11\\.0\\.:${PORTSDIR}/devel/glib
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11
 
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index f9811e5de7d3..9fcd54207f5d 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Wed Aug  5 13:06:11 1998
-+++ Makefile.in	Wed Aug 12 17:58:02 1998
++++ Makefile.in	Fri Aug 14 18:14:54 1998
 @@ -91,9 +91,9 @@
  xinput_progs = @xinput_progs@
  
@@ -46,13 +46,133 @@
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
 --- gtk/Makefile.in.orig	Wed Aug  5 13:06:16 1998
-+++ gtk/Makefile.in	Wed Aug 12 17:47:57 1998
-@@ -433,7 +433,7 @@
- SOURCES = $(libgtk_1_1_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
- OBJECTS = $(libgtk_1_1_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
++++ gtk/Makefile.in	Fri Aug 14 18:16:50 1998
+@@ -94,9 +94,9 @@
+ 
+ gtkincludedir = $(includedir)/gtk
+ 
+-lib_LTLIBRARIES = libgtk-1.1.la
++lib_LTLIBRARIES = libgtk11.la
+ 
+-libgtk_1_1_la_SOURCES = \
++libgtk11_la_SOURCES = \
+ 	gtkaccelgroup.c		\
+ 	gtkaccellabel.c		\
+ 	gtkadjustment.c		\
+@@ -302,7 +302,7 @@
+ 	gtkwindow.h             \
+ 	gtktypebuiltins.h
+ 
+-libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libgtk11_la_LDFLAGS = -version-info 1:0:0
+ 
+ EXTRA_DIST = \
+ 	line-arrow.xbm 		\
+@@ -341,11 +341,11 @@
+ # FIXME, we currently rely on linking against libglib-1.1
+ 
+ DEPS =	\
+-	libgtk-@LT_RELEASE@.la				\
++	libgtk11.la				\
+ 	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la
+ 
+ LDADDS = \
+-	libgtk-@LT_RELEASE@.la				\
++	libgtk11.la				\
+ 	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
+ 	@x_ldflags@					\
+ 	@x_libs@					\
+@@ -377,8 +377,8 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libgtk_1_1_la_LIBADD = 
+-libgtk_1_1_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo \
++libgtk11_la_LIBADD = 
++libgtk11_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo \
+ gtkadjustment.lo gtkalignment.lo gtkarg.lo gtkarrow.lo \
+ gtkaspectframe.lo gtkbin.lo gtkbindings.lo gtkbbox.lo gtkbox.lo \
+ gtkbutton.lo gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo \
+@@ -430,10 +430,10 @@
+ 
+ TAR = tar
+ GZIP = --best
+-SOURCES = $(libgtk_1_1_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
+-OBJECTS = $(libgtk_1_1_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
++SOURCES = $(libgtk11_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c simple.c
++OBJECTS = $(libgtk11_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o simple.o
  
 -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all: Makefile $(LTLIBRARIES) $(HEADERS)
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
+@@ -510,8 +510,8 @@
+ 
+ maintainer-clean-libtool:
+ 
+-libgtk-1.1.la: $(libgtk_1_1_la_OBJECTS) $(libgtk_1_1_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libgtk_1_1_la_LDFLAGS) $(libgtk_1_1_la_OBJECTS) $(libgtk_1_1_la_LIBADD) $(LIBS)
++libgtk11.la: $(libgtk11_la_OBJECTS) $(libgtk11_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libgtk11_la_LDFLAGS) $(libgtk11_la_OBJECTS) $(libgtk11_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-noinstPROGRAMS:
+ 
+--- gdk/Makefile.in.orig	Fri Aug 14 18:46:01 1998
++++ gdk/Makefile.in	Fri Aug 14 18:46:36 1998
+@@ -92,9 +92,9 @@
+ 
+ gdkincludedir = $(includedir)/gdk
+ 
+-lib_LTLIBRARIES = libgdk-1.1.la
++lib_LTLIBRARIES = libgdk11.la
+ 
+-libgdk_1_1_la_SOURCES = \
++libgdk11_la_SOURCES = \
+ 	gdk.c		\
+ 	gdkcc.c		\
+ 	gdkcolor.c	\
+@@ -136,8 +136,8 @@
+ 	gdktypes.h	\
+ 	gdkx.h
+ 
+-libgdk_1_1_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++libgdk11_la_LDFLAGS = \
++	-version-info 1:0:0 \
+ 	@x_ldflags@ @x_libs@
+ 
+ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
+@@ -170,8 +170,8 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libgdk_1_1_la_LIBADD = 
+-libgdk_1_1_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo \
++libgdk11_la_LIBADD = 
++libgdk11_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo \
+ gdkdnd.lo gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo \
+ gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo gdkrectangle.lo \
+ gdkregion.lo gdkselection.lo gdkthreads.lo gdkvisual.lo gdkwindow.lo \
+@@ -194,8 +194,8 @@
+ 
+ TAR = tar
+ GZIP = --best
+-SOURCES = $(libgdk_1_1_la_SOURCES) $(gxid_SOURCES)
+-OBJECTS = $(libgdk_1_1_la_OBJECTS) $(gxid_OBJECTS)
++SOURCES = $(libgdk11_la_SOURCES) $(gxid_SOURCES)
++OBJECTS = $(libgdk11_la_OBJECTS) $(gxid_OBJECTS)
+ 
+ all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+ 
+@@ -272,8 +272,8 @@
+ 
+ maintainer-clean-libtool:
+ 
+-libgdk-1.1.la: $(libgdk_1_1_la_OBJECTS) $(libgdk_1_1_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libgdk_1_1_la_LDFLAGS) $(libgdk_1_1_la_OBJECTS) $(libgdk_1_1_la_LIBADD) $(LIBS)
++libgdk11.la: $(libgdk11_la_OBJECTS) $(libgdk11_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libgdk11_la_LDFLAGS) $(libgdk11_la_OBJECTS) $(libgdk11_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-binPROGRAMS:
+ 
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 2f9f3dea3336..3f0e2bd35167 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,5 +1,5 @@
---- gtk-config.in.orig	Wed Aug 12 18:24:01 1998
-+++ gtk-config.in	Wed Aug 12 18:24:15 1998
+--- gtk-config.in.orig	Fri Aug 14 18:21:57 1998
++++ gtk-config.in	Fri Aug 14 18:20:36 1998
 @@ -8,7 +8,7 @@
  exec_prefix_set=no
  
@@ -9,8 +9,17 @@
  
  if test $# -eq 0; then
        echo "${usage}" 1>&2
---- gtk.m4.orig	Wed Aug 12 18:24:19 1998
-+++ gtk.m4	Wed Aug 12 18:24:59 1998
+@@ -64,7 +64,7 @@
+           fi
+         fi
+       done
+-      echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @x_libs@ -lm
++      echo $libdirs @x_ldflags@ -lgtk11 -lgdk11 $my_glib_libs @x_libs@ -lm
+       ;;
+     *)
+       echo "${usage}" 1>&2
+--- gtk.m4.orig	Thu Jun 11 07:52:13 1998
++++ gtk.m4	Fri Aug 14 18:14:55 1998
 @@ -6,7 +6,7 @@
  dnl
  AC_DEFUN(AM_PATH_GTK,
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 0400963dd39f..c08049d8ac07 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -110,14 +110,14 @@ include/gtk11/gtk/gtkvscrollbar.h
 include/gtk11/gtk/gtkvseparator.h
 include/gtk11/gtk/gtkwidget.h
 include/gtk11/gtk/gtkwindow.h
-lib/libgdk-1.1.a
-lib/libgdk-1.1.la
-lib/libgdk-1.1.so
-lib/libgdk-1.1.so.1.0
-lib/libgtk-1.1.a
-lib/libgtk-1.1.la
-lib/libgtk-1.1.so
-lib/libgtk-1.1.so.1.0
+lib/libgdk11.a
+lib/libgdk11.la
+lib/libgdk11.so
+lib/libgdk11.so.1.0
+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