Add pkgconfig support to most of the core of GNOME 1.4 and GTK+/GLIB 1.2

to make transitioning to GNOME/GTK+/GLIB a little easier.

3 files changed, 22 insertions, 37 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index c985bc580fb..cb59dad295c 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,13 +7,10 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-		http://www.ameth.org/gimp/%SUBDIR%/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/gtk+
 DISTNAME=	gtk+-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 2903edd7511..d88fd757f7c 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -1,48 +1,33 @@
---- Makefile.in.orig	Fri Mar  2 19:49:21 2001
-+++ Makefile.in	Tue Mar  6 10:46:49 2001
-@@ -128,7 +128,7 @@
- SRC_SUBDIRS = gdk gtk
- SUBDIRS = po $(SRC_SUBDIRS) docs
+--- Makefile.in.orig	Sun Apr  1 22:14:07 2001
++++ Makefile.in	Mon May 21 20:01:41 2001
+@@ -37,3 +37,3 @@
+ 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
  
- # require automake 1.4
- AUTOMAKE_OPTIONS = 1.4
-@@ -144,7 +144,7 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -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)
- 
- DATA =  $(m4data_DATA) $(pkgconfig_DATA)
-@@ -206,7 +206,9 @@
- maintainer-clean-hdr:
- gtk+.spec: $(top_builddir)/config.status gtk+.spec.in
+@@ -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
- gdk.pc: $(top_builddir)/config.status gdk.pc.in
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -438,7 +440,6 @@
- 	      || exit 1; \
- 	  fi; \
+@@ -440,3 +442,2 @@
  	done
 -	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
  info-am:
- info: info-recursive
- dvi-am:
-@@ -453,7 +454,7 @@
- install-exec-am: install-binSCRIPTS
- install-exec: install-exec-recursive
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
- 
- install-am: all-am
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 603754d6be4..c44b8faa654 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -131,6 +131,8 @@ lib/libgdk12.so.2
 lib/libgtk12.a
 lib/libgtk12.so
 lib/libgtk12.so.2
+libdata/pkgconfig/gdk.pc
+libdata/pkgconfig/gtk+.pc
 share/aclocal/gtk.m4
 share/locale/az/LC_MESSAGES/gtk+.mo
 share/locale/ca/LC_MESSAGES/gtk+.mo
@@ -223,6 +225,7 @@ share/themes/Default/gtk/gtkrc.yi
 share/themes/Default/gtk/gtkrc.zh_CN
 share/themes/Default/gtk/gtkrc.zh_TW.Big5
 @exec mkdir -p %D/lib/gtk/themes/engines
+@dirrm libdata/pkgconfig
 @dirrm lib/gtk/themes/engines
 @dirrm lib/gtk/themes
 @dirrm lib/gtk