Upgrade to 1.1.2, and convert gtk11 to elf.

5 files changed, 94 insertions, 90 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index e35459ec680..736687b2fe5 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gtk
-# Version required:		1.1.1
+# Version required:		1.1.2
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.25 1998/09/15 11:41:42 vanilla Exp $
+# $Id: Makefile,v 1.26 1998/09/22 23:31:14 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.1
-PKGNAME=	gtk-1.1.1
+DISTNAME=	gtk+-1.1.2
+PKGNAME=	gtk-1.1.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -30,7 +30,7 @@ pre-install:
 	fi
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index 9fb09b85fd6..13bf0800541 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.1.tar.gz) = 9725821ec86dbe570f45fc81b8457202
+MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index b9eb0bfe33a..cf490e3a34c 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Aug  5 13:06:11 1998
-+++ Makefile.in	Tue Sep 15 00:13:02 1998
-@@ -93,7 +93,7 @@
+--- Makefile.in.orig	Tue Sep 22 11:47:07 1998
++++ Makefile.in	Tue Sep 22 22:32:20 1998
+@@ -97,7 +97,7 @@
  SRC_SUBDIRS = gdk gtk
  SUBDIRS = $(SRC_SUBDIRS) docs
  
@@ -9,7 +9,7 @@
  
  EXTRA_DIST =	\
  	HACKING		\
-@@ -174,7 +174,7 @@
+@@ -179,7 +179,7 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
@@ -18,21 +18,19 @@
  SCRIPTS =  $(bin_SCRIPTS)
  
  DATA =  $(m4data_DATA)
-@@ -227,8 +227,11 @@
+@@ -232,7 +232,10 @@
  	-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-config.in: gtk-config.in
 +	cp gtk-config.in gtk11-config.in
 +
 +gtk11-config: $(top_builddir)/config.status gtk11-config.in
-+	cd $(top_builddir) && CONFIG_FILES=gtk11-config CONFIG_HEADERS= ./config.status
+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
  
  install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
-@@ -407,7 +410,7 @@
+@@ -412,7 +415,7 @@
  all-recursive-am: config.h
  	$(MAKE) all-recursive
  
@@ -41,7 +39,7 @@
  
  install-exec-am: install-binSCRIPTS
  
-@@ -421,7 +424,7 @@
+@@ -426,7 +429,7 @@
  install-data: install-data-recursive install-data-am
  	@$(NORMAL_INSTALL)
  
@@ -50,9 +48,9 @@
  	@:
  
  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 @@
+--- docs/Makefile.in.orig	Tue Sep 22 11:47:19 1998
++++ docs/Makefile.in	Tue Sep 22 22:29:10 1998
+@@ -96,7 +96,7 @@
  
  info_TEXINFOS = gdk.texi gtk.texi glib.texi
  
@@ -61,7 +59,7 @@
  
  EXTRA_DIST =	\
  	texinfo.tex 		\
-@@ -133,7 +133,7 @@
+@@ -137,7 +137,7 @@
  
  TAR = tar
  GZIP = --best
@@ -70,7 +68,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-@@ -159,10 +159,13 @@
+@@ -163,10 +163,13 @@
  
  DVIPS = dvips
  
@@ -85,7 +83,7 @@
  
  .texi.dvi:
  	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-@@ -361,7 +364,7 @@
+@@ -365,7 +368,7 @@
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  mostlyclean:  mostlyclean-aminfo mostlyclean-generic
  
@@ -94,132 +92,137 @@
  
  distclean:  distclean-aminfo distclean-generic clean
  	-rm -f config.status
---- gtk/Makefile.in.orig	Wed Aug  5 13:06:16 1998
-+++ gtk/Makefile.in	Mon Sep 14 23:28:50 1998
-@@ -94,9 +94,9 @@
+--- gtk/Makefile.in.orig	Tue Sep 22 11:47:15 1998
++++ gtk/Makefile.in	Tue Sep 22 22:35:50 1998
+@@ -98,9 +98,9 @@
  
  gtkincludedir = $(includedir)/gtk
  
--lib_LTLIBRARIES = libgtk-1.1.la
+-lib_LTLIBRARIES = libgtk.la
 +lib_LTLIBRARIES = libgtk11.la
  
--libgtk_1_1_la_SOURCES = \
+-libgtk_la_SOURCES = \
 +libgtk11_la_SOURCES = \
  	gtkaccelgroup.c		\
  	gtkaccellabel.c		\
  	gtkadjustment.c		\
-@@ -302,7 +302,7 @@
- 	gtkwindow.h             \
- 	gtktypebuiltins.h
+@@ -329,8 +329,8 @@
+ # special remake rules
+ # makeenums.h: @REBUILD@ gtk.h gtkprivate.h
  
--libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libgtk11_la_LDFLAGS = -version-info 1:0:0
+-libgtk_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++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
+@@ -367,12 +367,12 @@
+ noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple 
  
  DEPS =	\
--	libgtk-@LT_RELEASE@.la				\
-+	libgtk11.la				\
- 	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la
+-	libgtk.la					\
+-	$(top_builddir)/gdk/libgdk.la
++	libgtk11.la					\
++	$(top_builddir)/gdk/libgdk11.la
  
  LDADDS = \
--	libgtk-@LT_RELEASE@.la				\
-+	libgtk11.la				\
- 	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
+-	libgtk.la					\
+-	$(top_builddir)/gdk/libgdk.la			\
++	libgtk11.la					\
++	$(top_builddir)/gdk/libgdk11.la			\
  	@x_ldflags@					\
  	@x_libs@					\
-@@ -377,8 +377,8 @@
+ 	@GLIB_LIBS@                                     \
+@@ -405,8 +405,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 \
+-libgtk_la_LIBADD = 
+-libgtk_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.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 @@
++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 gtkcolorsel.lo gtkcombo.lo \
+@@ -461,10 +461,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
+-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c simple.c
+-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o simple.o
++SOURCES = $(libgtk11_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c simple.c
++OBJECTS = $(libgtk11_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o simple.o
  
 -all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all: Makefile $(LTLIBRARIES) $(HEADERS)
  
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
-@@ -510,8 +510,8 @@
+@@ -541,8 +541,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)
+-libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_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	Wed Aug  5 13:06:14 1998
-+++ gdk/Makefile.in	Mon Sep 14 23:28:50 1998
-@@ -92,9 +92,9 @@
+--- gdk/Makefile.in.orig	Tue Sep 22 11:47:10 1998
++++ gdk/Makefile.in	Tue Sep 22 22:37:27 1998
+@@ -96,9 +96,9 @@
  
  gdkincludedir = $(includedir)/gdk
  
--lib_LTLIBRARIES = libgdk-1.1.la
+-lib_LTLIBRARIES = libgdk.la
 +lib_LTLIBRARIES = libgdk11.la
  
--libgdk_1_1_la_SOURCES = \
+-libgdk_la_SOURCES = \
 +libgdk11_la_SOURCES = \
  	gdk.c		\
  	gdkcc.c		\
  	gdkcolor.c	\
-@@ -136,8 +136,8 @@
+@@ -140,8 +140,8 @@
  	gdktypes.h	\
  	gdkx.h
  
--libgdk_1_1_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+-libgdk_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
 +libgdk11_la_LDFLAGS = \
 +	-version-info 1:0:0 \
- 	@x_ldflags@ @x_libs@
+          @x_ldflags@ @x_libs@
  
  INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
-@@ -170,8 +170,8 @@
+@@ -174,8 +174,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 \
+-libgdk_la_LIBADD = 
+-libgdk_la_OBJECTS =  gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.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 @@
++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 gdkxid.lo \
+@@ -198,8 +198,8 @@
  
  TAR = tar
  GZIP = --best
--SOURCES = $(libgdk_1_1_la_SOURCES) $(gxid_SOURCES)
--OBJECTS = $(libgdk_1_1_la_OBJECTS) $(gxid_OBJECTS)
+-SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
+-OBJECTS = $(libgdk_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 @@
+@@ -276,8 +276,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)
+-libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
 +libgdk11.la: $(libgdk11_la_OBJECTS) $(libgdk11_la_DEPENDENCIES)
 +	$(LINK) -rpath $(libdir) $(libgdk11_la_LDFLAGS) $(libgdk11_la_OBJECTS) $(libgdk11_la_LIBADD) $(LIBS)
  
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 3f0e2bd3516..7587411b1da 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,5 +1,5 @@
---- gtk-config.in.orig	Fri Aug 14 18:21:57 1998
-+++ gtk-config.in	Fri Aug 14 18:20:36 1998
+--- gtk-config.in.orig	Sat Sep 19 14:38:07 1998
++++ gtk-config.in	Tue Sep 22 22:47:02 1998
 @@ -8,7 +8,7 @@
  exec_prefix_set=no
  
@@ -13,13 +13,13 @@
            fi
          fi
        done
--      echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @x_libs@ -lm
+-      echo $libdirs @x_ldflags@ -lgtk -lgdk $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
+--- gtk.m4.orig	Tue Sep 15 09:55:52 1998
++++ gtk.m4	Tue Sep 22 22:46:00 1998
 @@ -6,7 +6,7 @@
  dnl
  AC_DEFUN(AM_PATH_GTK,
@@ -79,8 +79,8 @@
 +      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
        printf("*** before re-running configure\n");
      } 
-   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-@@ -115,10 +115,10 @@
+ #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+@@ -117,10 +117,10 @@
          printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
          printf("***\n");
          printf("*** If you have already installed a sufficiently new version, this error\n");
@@ -93,7 +93,7 @@
          printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
          printf("*** so that the correct libraries are found at run-time))\n");
        }
-@@ -136,10 +136,10 @@
+@@ -138,10 +138,10 @@
    else
       AC_MSG_RESULT(no)
       if test "$GTK_CONFIG" = "no" ; then
@@ -106,7 +106,7 @@
       else
         if test -f conf.gtktest ; then
          :
-@@ -168,7 +168,7 @@
+@@ -170,7 +170,7 @@
          [ echo "*** The test program failed to compile or link. See the file config.log for the"
            echo "*** exact error that occured. This usually means GTK was incorrectly installed"
            echo "*** or that you have moved GTK since it was installed. In the latter case, you"
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 299af96596d..1634473330f 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -91,6 +91,7 @@ include/gtk11/gtk/gtkspinbutton.h
 include/gtk11/gtk/gtkstatusbar.h
 include/gtk11/gtk/gtkstyle.h
 include/gtk11/gtk/gtktable.h
+include/gtk11/gtk/gtktearoffmenuitem.h
 include/gtk11/gtk/gtktext.h
 include/gtk11/gtk/gtktipsquery.h
 include/gtk11/gtk/gtktogglebutton.h
@@ -123,13 +124,13 @@ info/gtk.info
 lib/libgdk11.a
 lib/libgdk11.la
 lib/libgdk11.so
-lib/libgdk11.so.1.0
+lib/libgdk11.so.1
 lib/libgtk11.a
 lib/libgtk11.la
 lib/libgtk11.so
-lib/libgtk11.so.1.0
-@unexec /sbin/ldconfig -R
-@exec /sbin/ldconfig -m %D/lib
+lib/libgtk11.so.1
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm include/gtk11/gdk
 @dirrm include/gtk11/gtk
 @dirrm include/gtk11