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, 25 insertions, 50 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 1abb9d83bb29..0d8833b96f08 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	glib
 PORTVERSION=	1.2.10
+PORTREVISION=	1
 CATEGORIES=	devel
-#MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-#		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-#		http://www.ameth.org/gimp/%SUBDIR%/ \
-#		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITES=	${MASTER_SITE_GNOME}
-#MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
 MASTER_SITE_SUBDIR=	stable/sources/glib
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_LIBTOOL=	yes
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index aaa94c0f90ee..774c38934d1a 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,8 +1,11 @@
---- Makefile.in.orig	Fri Mar  2 17:37:20 2001
-+++ Makefile.in	Tue Mar  6 09:26:01 2001
-@@ -96,11 +96,11 @@
- 
- AUTOMAKE_OPTIONS = 1.4
+--- Makefile.in.orig	Thu Mar 15 09:48:50 2001
++++ Makefile.in	Mon May 21 21:23:16 2001
+@@ -39,3 +39,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -98,7 +98,7 @@
  
 -SUBDIRS = . gmodule gthread docs tests
 +SUBDIRS = . gmodule gthread docs
@@ -13,73 +16,43 @@
 -bin_SCRIPTS = glib-config
 +bin_SCRIPTS = glib@LT_RELEASE@-config
  
- BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
- 
-@@ -114,7 +114,7 @@
- libglib_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
- 
+@@ -116,3 +116,3 @@
  
 -glibincludedir = $(includedir)/glib-1.2
 +glibincludedir = $(includedir)
  glibinclude_HEADERS =  	glib.h
+@@ -136,3 +136,3 @@
  
- 
-@@ -139,7 +139,7 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = glib.pc gmodule.pc gthread.pc
+@@ -141,3 +141,3 @@
  CONFIG_HEADER = config.h
 -CONFIG_CLEAN_FILES =  glib.spec glib-config glib.pc gmodule.pc \
 +CONFIG_CLEAN_FILES =  glib.spec glib@LT_RELEASE@-config glib.pc gmodule.pc \
  gthread.pc
- LTLIBRARIES =  $(lib_LTLIBRARIES)
- 
-@@ -240,7 +240,7 @@
- maintainer-clean-hdr:
- glib.spec: $(top_builddir)/config.status glib.spec.in
+@@ -242,3 +242,3 @@
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 -glib-config: $(top_builddir)/config.status glib-config.in
 +glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- glib.pc: $(top_builddir)/config.status glib.pc.in
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -574,7 +574,7 @@
- 	      || exit 1; \
- 	  fi; \
+@@ -576,3 +576,3 @@
  	done
 -	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 +
  garray.lo garray.o : garray.c glib.h glibconfig.h
- gcache.lo gcache.o : gcache.c glib.h glibconfig.h
- gcompletion.lo gcompletion.o : gcompletion.c glib.h glibconfig.h
-@@ -619,7 +619,7 @@
- install-exec: install-exec-recursive
- 
- install-data-am: install-configincludeDATA install-m4dataDATA \
--		install-pkgconfigDATA install-glibincludeHEADERS
-+		install-glibincludeHEADERS
- install-data: install-data-recursive
- 
- install-am: all-am
-@@ -629,7 +629,7 @@
- 		uninstall-configincludeDATA uninstall-m4dataDATA \
- 		uninstall-pkgconfigDATA uninstall-glibincludeHEADERS
+@@ -631,3 +631,3 @@
  uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
  		$(HEADERS) config.h
- all-redirect: all-recursive-am
- install-strip:
-@@ -708,7 +708,9 @@
- installdirs mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+@@ -710,3 +710,5 @@
  
 -glib-config: glib-config.in
 +glib@LT_RELEASE@-config.in: glib-config.in
 +	cp glib-config.in glib@LT_RELEASE@-config.in
 +
  glibconfig.h: stamp-gc-h
- 	@:
- stamp-gc-h: config.status
 --- gmodule/Makefile.in.orig	Fri Mar  2 17:37:21 2001
 +++ gmodule/Makefile.in	Tue Mar  6 09:24:01 2001
 @@ -100,7 +100,7 @@
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index 86054550259d..ec9d428aa6d9 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -14,5 +14,8 @@ lib/libgmodule12.so.3
 lib/libgthread12.a
 lib/libgthread12.so
 lib/libgthread12.so.3
+libdata/pkgconfig/glib.pc
+libdata/pkgconfig/gmodule.pc
+libdata/pkgconfig/gthread.pc
 share/aclocal/glib.m4
 @dirrm include/glib12