freebsd-ports/x11-toolkits/gtk12/files/patch-aa

--- Makefile.in.orig	Sat Oct 31 18:05:09 1998
+++ Makefile.in	Tue Nov 10 23:27:32 1998
@@ -97,7 +97,7 @@
 SRC_SUBDIRS = gdk gtk
 SUBDIRS = $(SRC_SUBDIRS) docs
 
-bin_SCRIPTS = gtk-config
+bin_SCRIPTS = gtk11-config
 
 EXTRA_DIST =	\
 	HACKING		\
@@ -179,7 +179,7 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  gtk-config
+CONFIG_CLEAN_FILES =  gtk11-config
 SCRIPTS =  $(bin_SCRIPTS)
 
 DATA =  $(m4data_DATA)
@@ -232,7 +232,10 @@
 	-rm -f config.h
 
 maintainer-clean-hdr:
-gtk-config: $(top_builddir)/config.status gtk-config.in
+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=$@ CONFIG_HEADERS= ./config.status
 
 install-binSCRIPTS: $(bin_SCRIPTS)
@@ -412,7 +415,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
 
@@ -426,7 +429,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	Sat Oct 31 18:05:18 1998
+++ docs/Makefile.in	Tue Nov 10 23:27:32 1998
@@ -96,7 +96,7 @@
 
 info_TEXINFOS = gdk.texi gtk.texi 
 
-man_MANS = gtk-config.1
+man_MANS = gtk11-config.1
 
 EXTRA_DIST =	\
 	texinfo.tex 		\
@@ -237,7 +237,7 @@
 
 TAR = tar
 GZIP = --best
-all: Makefile $(INFO_DEPS) $(MANS)
+all: Makefile clean $(INFO_DEPS) $(MANS)
 
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
@@ -259,10 +259,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 \
@@ -459,7 +462,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
--- gdk/Makefile.in.orig	Sat Oct 31 18:05:12 1998
+++ gdk/Makefile.in	Tue Nov 10 23:27:47 1998
@@ -96,9 +96,9 @@
 
 gdkincludedir = $(includedir)/gdk
 
-lib_LTLIBRARIES = libgdk.la
+lib_LTLIBRARIES = libgdk11.la
 
-libgdk_la_SOURCES = \
+libgdk11_la_SOURCES = \
 	gdk.c		\
 	gdkcc.c		\
 	gdkcolor.c	\
@@ -140,8 +140,8 @@
 	gdktypes.h	\
 	gdkx.h
 
-libgdk_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
+libgdk11_la_LDFLAGS = \
+	-version-info 1:3:0 \
          @x_ldflags@ @x_libs@
 
 INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
@@ -174,8 +174,8 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-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 gdkxid.lo \
@@ -198,8 +198,8 @@
 
 TAR = tar
 GZIP = --best
-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)
 
@@ -276,8 +276,8 @@
 
 maintainer-clean-libtool:
 
-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)
 
 mostlyclean-binPROGRAMS:
 
--- gtk/Makefile.in.orig	Sat Oct 31 18:05:14 1998
+++ gtk/Makefile.in	Tue Nov 10 23:28:11 1998
@@ -98,9 +98,9 @@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk.la
+lib_LTLIBRARIES = libgtk11.la
 
-libgtk_la_SOURCES = \
+libgtk11_la_SOURCES = \
 	gtkaccelgroup.c		\
 	gtkaccellabel.c		\
 	gtkadjustment.c		\
@@ -331,8 +331,8 @@
 	../gdk/gdktypes.h \
 	../gdk/gdkrgb.h
 
-libgtk_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libgtk11_la_LDFLAGS = \
+	-version-info 1:3:0
 
 EXTRA_DIST = \
 	line-arrow.xbm 		\
@@ -371,12 +371,12 @@
 # FIXME, we currently rely on linking against libglib-1.1
 
 DEPS =	\
-	libgtk.la					\
-	$(top_builddir)/gdk/libgdk.la
+	libgtk11.la					\
+	$(top_builddir)/gdk/libgdk11.la
 
 LDADDS = \
-	libgtk.la					\
-	$(top_builddir)/gdk/libgdk.la			\
+	libgtk11.la					\
+	$(top_builddir)/gdk/libgdk11.la			\
 	@x_ldflags@					\
 	@x_libs@					\
 	@GLIB_LIBS@                                     \
@@ -411,8 +411,8 @@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-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 gtkcalendar.lo \
 gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \
@@ -471,10 +471,10 @@
 
 TAR = tar
 GZIP = --best
-SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c
-OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o
+SOURCES = $(libgtk11_la_SOURCES) testgtk.c testinput.c testselection.c testthreads.c testrgb.c testdnd.c simple.c
+OBJECTS = $(libgtk11_la_OBJECTS) testgtk.o testinput.o testselection.o testthreads.o testrgb.o testdnd.o simple.o
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
@@ -551,8 +551,8 @@
 
 maintainer-clean-libtool:
 
-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: