Now that Glib 1.2 and GTK+ 1.2 are the only versions in the tree that use

the old xxx-config files, remove the "12" suffix.  This will allow people
building Glib and GTK+ ports by hand to do so without a lot of extra
hacking.  Since these ports are so heavily used, the xxx12-config files
aren't removed completely, but rather symlinked to their xxx-config
counterparts.

PR:		39417

6 files changed, 19 insertions, 70 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 9badc1c9eb7d..dbfa68617322 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
@@ -30,12 +30,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		X_CFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		gtk12-config.1
+MAN1=		gtk-config.1
 
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
+	@${LN} -sf ${PREFIX}/bin/gtk-config ${PREFIX}/bin/gtk12-config
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index d88fd757f7ce..258db13435f7 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,33 +1,28 @@
---- Makefile.in.orig	Sun Apr  1 22:14:07 2001
-+++ Makefile.in	Mon May 21 20:01:41 2001
-@@ -37,3 +37,3 @@
+--- Makefile.in.orig	Sun Apr  1 23:14:07 2001
++++ Makefile.in	Wed Nov 20 14:56:58 2002
+@@ -35,7 +35,7 @@
+ DESTDIR =
+ 
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/pkgconfig
  pkgincludedir = $(includedir)/@PACKAGE@
-@@ -130,3 +130,3 @@
  
--bin_SCRIPTS = gtk-config
-+bin_SCRIPTS = gtk@LT_RELEASE@-config
+ top_builddir = .
+@@ -136,7 +136,7 @@
+ EXTRA_DIST =  	HACKING			gtk+.spec.in	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/Makefile  	examples/README.1ST  	examples/extract.awk  	examples/extract.sh  	examples/base/Makefile  	examples/base/base.c  	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/calendar/Makefile  	examples/calendar/calendar.c  	examples/clist/Makefile  	examples/clist/clist.c  	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/itemfactory.c  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/packer/Makefile  	examples/packer/pack.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rangewidgets/Makefile  	examples/rangewidgets/rangewidgets.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/text/Makefile  	examples/text/text.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/tree/Makefile  	examples/tree/tree.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/fixed/fixed.c  	examples/fixed/Makefile  	examples/frame/frame.c  	examples/frame/Makefile  	examples/spinbutton/spinbutton.c  	examples/spinbutton/Makefile  	examples/find-examples.sh 	gdk.pc.in gtk+.pc.in
  
-@@ -138,3 +138,3 @@
  
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(pkglibdir)
  pkgconfig_DATA = gdk.pc gtk+.pc
-@@ -146,3 +146,3 @@
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES =  gtk+.spec gtk-config gdk.pc gtk+.pc
-+CONFIG_CLEAN_FILES =  gtk+.spec gtk@LT_RELEASE@-config gdk.pc gtk+.pc
- SCRIPTS =  $(bin_SCRIPTS)
-@@ -208,3 +208,5 @@
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--gtk-config: $(top_builddir)/config.status gtk-config.in
-+gtk@LT_RELEASE@-config.in: gtk-config.in
-+	cp gtk-config.in gtk@LT_RELEASE@-config.in
-+gtk@LT_RELEASE@-config: $(top_builddir)/config.status gtk@LT_RELEASE@-config.in
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -440,3 +442,2 @@
+ 
+ m4datadir = $(datadir)/aclocal
+@@ -438,7 +438,6 @@
+ 	      || exit 1; \
+ 	  fi; \
  	done
 -	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
  info-am:
+ info: info-recursive
+ dvi-am:
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index ffdba095a18b..620f9437519a 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -1,14 +1,5 @@
 --- gtk-config.in.orig	Sat Oct 21 18:20:40 2000
 +++ gtk-config.in	Tue Mar  6 10:11:59 2001
-@@ -12,7 +12,7 @@
- usage()
- {
- 	cat <<EOF
--Usage: gtk-config [OPTIONS] [LIBRARIES]
-+Usage: gtk@LT_RELEASE@-config [OPTIONS] [LIBRARIES]
- Options:
- 	[--prefix[=DIR]]
- 	[--exec-prefix[=DIR]]
 @@ -91,7 +91,7 @@
  fi
  
diff --git a/x11-toolkits/gtk12/files/patch-ah b/x11-toolkits/gtk12/files/patch-ah
index b0b87b71e8bc..fe8134b8f217 100644
--- a/x11-toolkits/gtk12/files/patch-ah
+++ b/x11-toolkits/gtk12/files/patch-ah
@@ -9,31 +9,3 @@
  MKINSTALLDIRS = @MKINSTALLDIRS@
  NM = @NM@
  OBJDUMP = @OBJDUMP@
-@@ -128,7 +128,7 @@
- 
- info_TEXINFOS = gdk.texi gtk.texi 
- 
--man_MANS = gtk-config.1
-+man_MANS = gtk@LT_RELEASE@-config.1
- 
- TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	html/gtk_tut_fr-2.html   	html/gtk_tut_fr-3.html   	html/gtk_tut_fr-4.html   	html/gtk_tut_fr-5.html   	html/gtk_tut_fr-6.html   	html/gtk_tut_fr-7.html   	html/gtk_tut_fr-8.html   	html/gtk_tut_fr-9.html   	html/gtk_tut_fr-10.html  	html/gtk_tut_fr-11.html  	html/gtk_tut_fr-12.html  	html/gtk_tut_fr-13.html  	html/gtk_tut_fr-14.html  	html/gtk_tut_fr-15.html  	html/gtk_tut_fr-16.html  	html/gtk_tut_fr-17.html  	html/gtk_tut_fr-18.html  	html/gtk_tut_fr-19.html  	html/gtk_tut_fr-20.html  	html/gtk_tut_fr-21.html  	html/gtk_tut_fr-22.html  	html/gtk_tut_fr-23.html  	html/gtk_tut_fr-24.html  	html/gtk_tut_fr.html text/gtk_tut_fr.txt
- 
-@@ -146,7 +146,7 @@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES =  gtk-config.1
-+CONFIG_CLEAN_FILES =  gtk@LT_RELEASE@-config.1
- TEXI2DVI = texi2dvi
- INFO_DEPS = gdk.info gtk.info
- DVIS = gdk.dvi gtk.dvi
-@@ -174,6 +174,9 @@
- 
- gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
- 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+gtk@LT_RELEASE@-config.1: gtk-config.1
-+	cp gtk-config.1 gtk@LT_RELEASE@-config.1
- 
- gdk.info: gdk.texi
- gdk.dvi: gdk.texi
diff --git a/x11-toolkits/gtk12/files/patch-gtk.m4 b/x11-toolkits/gtk12/files/patch-gtk.m4
deleted file mode 100644
index 75c7b9213b8e..000000000000
--- a/x11-toolkits/gtk12/files/patch-gtk.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk.m4.orig	Fri Feb  9 22:56:43 2001
-+++ gtk.m4	Fri Feb  9 22:57:20 2001
-@@ -37,7 +37,7 @@
-      fi
-   fi
- 
--  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+  AC_PATH_PROG(GTK_CONFIG, gtk-config, gtk12-config, no)
-   min_gtk_version=ifelse([$1], ,0.99.7,$1)
-   AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-   no_gtk=""
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index d500e0da9953..6839e7b0c029 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,3 +1,4 @@
+bin/gtk-config
 bin/gtk12-config
 include/gtk12/gdk/gdk.h
 include/gtk12/gdk/gdkcursors.h