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.

26 files changed, 162 insertions, 210 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 65b74f62eac1..00d1df496fcf 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -7,13 +7,16 @@
 
 PORTNAME=	ORBit
 PORTVERSION=	0.5.8
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
 USE_GLIB=	yes
diff --git a/devel/ORBit/files/patch-ab b/devel/ORBit/files/patch-ab
index b690fbea9a83..97ca1f138dc9 100644
--- a/devel/ORBit/files/patch-ab
+++ b/devel/ORBit/files/patch-ab
@@ -1,23 +1,21 @@
---- Makefile.in.orig	Thu Oct 12 11:06:49 2000
-+++ Makefile.in	Thu Oct 12 13:28:39 2000
-@@ -97,3 +97,3 @@
+--- Makefile.in.orig	Sun May 13 02:20:09 2001
++++ Makefile.in	Mon May 21 22:32:11 2001
+@@ -37,3 +37,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -93,3 +93,2 @@
+ YACC = @YACC@
+-pkglibdir = @pkglibdir@
+ 
+@@ -97,3 +96,3 @@
  
 -SUBDIRS = popt libIDL src test
 +SUBDIRS = popt libIDL src
  
-@@ -114,3 +114,3 @@
- 
--DATA =  $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(m4data_DATA)
- 
-@@ -396,3 +396,3 @@
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
-@@ -411,4 +411,3 @@
- installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \
--		$(DESTDIR)$(pkgconfigdir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir)
+@@ -106,3 +105,3 @@
  
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = ORBit.pc
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index 8844d91f0bd5..62c710cfd460 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -39,42 +39,29 @@
 -libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 +libORBitCosNaming_la_LDFLAGS =  	-version-info 2:0:0
  
---- libIDL/Makefile.in.orig	Thu Oct 12 11:06:54 2000
-+++ libIDL/Makefile.in	Thu Oct 12 13:30:30 2000
+--- libIDL/Makefile.in.orig	Sun May 13 02:20:15 2001
++++ libIDL/Makefile.in	Mon May 21 22:33:45 2001
+@@ -42,3 +42,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
 @@ -92,3 +92,3 @@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  OBJDUMP = @OBJDUMP@
-@@ -122,4 +122,3 @@
+@@ -122,3 +122,3 @@
  
 -libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
--
 +libIDL_la_LDFLAGS = -version-info 2:0:0
  
-@@ -131,3 +130,3 @@
+@@ -131,6 +131,6 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = libIDLConf.sh
-@@ -164,3 +163,3 @@
- TEXINFOS = libIDL.texi
--DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(confexec_DATA) $(m4data_DATA)
- 
-@@ -596,3 +595,3 @@
- install-data-am: install-info-am install-m4dataDATA \
--		install-pkgconfigDATA install-pkgincludeHEADERS
-+		install-pkgincludeHEADERS
- install-data: install-data-am
-@@ -607,3 +606,3 @@
- uninstall: uninstall-am
--all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
-+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
- 		$(DATA) $(HEADERS)
-@@ -615,4 +614,3 @@
- 		$(DESTDIR)$(infodir) $(DESTDIR)$(confexecdir) \
--		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir) \
--		$(DESTDIR)$(pkgincludedir)
-+		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgincludedir)
  
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = libIDL.pc
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index bf59812aac78..1b03b0a0507e 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -93,6 +93,8 @@ lib/libORBitutil.so
 lib/libORBitutil.so.2
 lib/libname-server.a
 lib/liborbit-c-backend.a
+libdata/pkgconfig/ORBit.pc
+libdata/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
 @dirrm include/IIOP
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 65b74f62eac1..00d1df496fcf 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -7,13 +7,16 @@
 
 PORTNAME=	ORBit
 PORTVERSION=	0.5.8
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
 USE_GLIB=	yes
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index b690fbea9a83..97ca1f138dc9 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,23 +1,21 @@
---- Makefile.in.orig	Thu Oct 12 11:06:49 2000
-+++ Makefile.in	Thu Oct 12 13:28:39 2000
-@@ -97,3 +97,3 @@
+--- Makefile.in.orig	Sun May 13 02:20:09 2001
++++ Makefile.in	Mon May 21 22:32:11 2001
+@@ -37,3 +37,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -93,3 +93,2 @@
+ YACC = @YACC@
+-pkglibdir = @pkglibdir@
+ 
+@@ -97,3 +96,3 @@
  
 -SUBDIRS = popt libIDL src test
 +SUBDIRS = popt libIDL src
  
-@@ -114,3 +114,3 @@
- 
--DATA =  $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(m4data_DATA)
- 
-@@ -396,3 +396,3 @@
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
-@@ -411,4 +411,3 @@
- installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \
--		$(DESTDIR)$(pkgconfigdir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir)
+@@ -106,3 +105,3 @@
  
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = ORBit.pc
diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac
index 8844d91f0bd5..62c710cfd460 100644
--- a/devel/ORBit2/files/patch-ac
+++ b/devel/ORBit2/files/patch-ac
@@ -39,42 +39,29 @@
 -libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 +libORBitCosNaming_la_LDFLAGS =  	-version-info 2:0:0
  
---- libIDL/Makefile.in.orig	Thu Oct 12 11:06:54 2000
-+++ libIDL/Makefile.in	Thu Oct 12 13:30:30 2000
+--- libIDL/Makefile.in.orig	Sun May 13 02:20:15 2001
++++ libIDL/Makefile.in	Mon May 21 22:33:45 2001
+@@ -42,3 +42,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
 @@ -92,3 +92,3 @@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  OBJDUMP = @OBJDUMP@
-@@ -122,4 +122,3 @@
+@@ -122,3 +122,3 @@
  
 -libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
--
 +libIDL_la_LDFLAGS = -version-info 2:0:0
  
-@@ -131,3 +130,3 @@
+@@ -131,6 +131,6 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = libIDLConf.sh
-@@ -164,3 +163,3 @@
- TEXINFOS = libIDL.texi
--DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(confexec_DATA) $(m4data_DATA)
- 
-@@ -596,3 +595,3 @@
- install-data-am: install-info-am install-m4dataDATA \
--		install-pkgconfigDATA install-pkgincludeHEADERS
-+		install-pkgincludeHEADERS
- install-data: install-data-am
-@@ -607,3 +606,3 @@
- uninstall: uninstall-am
--all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
-+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
- 		$(DATA) $(HEADERS)
-@@ -615,4 +614,3 @@
- 		$(DESTDIR)$(infodir) $(DESTDIR)$(confexecdir) \
--		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir) \
--		$(DESTDIR)$(pkgincludedir)
-+		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgincludedir)
  
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = libIDL.pc
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index bf59812aac78..1b03b0a0507e 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -93,6 +93,8 @@ lib/libORBitutil.so
 lib/libORBitutil.so.2
 lib/libname-server.a
 lib/liborbit-c-backend.a
+libdata/pkgconfig/ORBit.pc
+libdata/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
 @dirrm include/IIOP
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 8c15b77c5cb3..d195d4497df5 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bonobo
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bonobo
diff --git a/devel/bonobo/files/patch-ac b/devel/bonobo/files/patch-ac
index 667c8f15bbf9..727e795ebd2f 100644
--- a/devel/bonobo/files/patch-ac
+++ b/devel/bonobo/files/patch-ac
@@ -1,17 +1,12 @@
---- libefs/Makefile.in.orig	Tue Oct  3 21:50:49 2000
-+++ libefs/Makefile.in	Tue Oct  3 22:26:30 2000
-@@ -91,3 +91,3 @@
- CONFIG_CLEAN_FILES =  libefs-config libefs.pc
--SCRIPTS =  $(bin_SCRIPTS) $(pc_SCRIPTS)
-+SCRIPTS =  $(bin_SCRIPTS)
- 
-@@ -350,3 +350,3 @@
- 
--install-data-am: install-pcSCRIPTS
-+install-data-am:
- install-data: install-data-recursive
-@@ -364,3 +364,3 @@
- installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(pcdir)
-+	$(mkinstalldirs)  $(DESTDIR)$(bindir)
+--- libefs/Makefile.in.orig	Mon May 14 17:01:15 2001
++++ libefs/Makefile.in	Tue May 22 11:04:58 2001
+@@ -37,3 +37,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -85,3 +85,3 @@
  
+-pcdir = $(libdir)/pkgconfig
++pcdir = $(pkglibdir)
+ pc_SCRIPTS = libefs.pc
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 106e61f8e37d..cf27bb05c0fc 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -106,6 +106,7 @@ lib/libbonobox.so.2
 lib/libefs.a
 lib/libefs.so
 lib/libefs.so.1
+libdata/pkgconfig/libefs.pc
 share/gnome/bonobo/html/bonobo-api.html
 share/gnome/bonobo/html/bonobo-api.sgml
 share/gnome/bonobo/html/bonobo-decl.txt
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index fba5733e8557..de66cdf8dfe8 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gconf
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/GConf
diff --git a/devel/gconf/files/patch-ab b/devel/gconf/files/patch-ab
index 895ebded1cc3..032c7e5eab94 100644
--- a/devel/gconf/files/patch-ab
+++ b/devel/gconf/files/patch-ab
@@ -1,10 +1,15 @@
 --- Makefile.in.orig	Mon May 14 13:07:48 2001
-+++ Makefile.in	Mon May 14 15:43:44 2001
-@@ -399,3 +399,3 @@
++++ Makefile.in	Mon May 21 23:29:41 2001
+@@ -37,3 +37,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -144,3 +144,3 @@
  
--install-data-am: install-pkgconfigDATA install-data-local
-+install-data-am: install-data-local
- install-data: install-data-recursive
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = gconf.pc gconfgtk.pc
 @@ -476,4 +476,4 @@
  install-data-local:
 -	-mkdir -p $(DESTDIR)$(datadir)/aclocal
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 18cd54ffe782..ba1228fcb484 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -23,6 +23,8 @@ lib/libgconf-1.so.1
 lib/libgconf-gtk-1.a
 lib/libgconf-gtk-1.so
 lib/libgconf-gtk-1.so.1
+libdata/pkgconfig/gconf.pc
+libdata/pkgconfig/gconfgtk.pc
 share/aclocal/gconf-1.m4
 share/gnome/oaf/gconfd-1.oafinfo
 share/locale/az/LC_MESSAGES/GConf.mo
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index fba5733e8557..de66cdf8dfe8 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gconf
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/GConf
diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
index 895ebded1cc3..032c7e5eab94 100644
--- a/devel/gconf2/files/patch-ab
+++ b/devel/gconf2/files/patch-ab
@@ -1,10 +1,15 @@
 --- Makefile.in.orig	Mon May 14 13:07:48 2001
-+++ Makefile.in	Mon May 14 15:43:44 2001
-@@ -399,3 +399,3 @@
++++ Makefile.in	Mon May 21 23:29:41 2001
+@@ -37,3 +37,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -144,3 +144,3 @@
  
--install-data-am: install-pkgconfigDATA install-data-local
-+install-data-am: install-data-local
- install-data: install-data-recursive
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = gconf.pc gconfgtk.pc
 @@ -476,4 +476,4 @@
  install-data-local:
 -	-mkdir -p $(DESTDIR)$(datadir)/aclocal
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 18cd54ffe782..ba1228fcb484 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -23,6 +23,8 @@ lib/libgconf-1.so.1
 lib/libgconf-gtk-1.a
 lib/libgconf-gtk-1.so
 lib/libgconf-gtk-1.so.1
+libdata/pkgconfig/gconf.pc
+libdata/pkgconfig/gconfgtk.pc
 share/aclocal/gconf-1.m4
 share/gnome/oaf/gconfd-1.oafinfo
 share/locale/az/LC_MESSAGES/GConf.mo
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
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index ebd31ef5c462..1a0f5c2260e8 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libglade
diff --git a/devel/libglade/files/patch-ab b/devel/libglade/files/patch-ab
index b6f8a2945f60..7c58782cbc50 100644
--- a/devel/libglade/files/patch-ab
+++ b/devel/libglade/files/patch-ab
@@ -1,6 +1,11 @@
---- Makefile.in.orig	Wed Nov 22 08:36:15 2000
-+++ Makefile.in	Wed Nov 29 18:22:18 2000
-@@ -162,8 +162,8 @@
+--- Makefile.in.orig	Sat Feb 10 05:27:41 2001
++++ Makefile.in	Tue May 22 11:30:14 2001
+@@ -36,3 +36,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -168,11 +168,11 @@
  test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
 -SUBDIRS = intl po macros glade doc
 +SUBDIRS = intl po macros glade
@@ -10,25 +15,9 @@
  m4data_DATA = libglade.m4
  
 -confexecdir = $(libdir)
-+confexecdir = $(prefix)/etc
++confexecdir = $(sysconfdir)
  confexec_DATA = libgladeConf.sh
-@@ -201,3 +201,3 @@
- DIST_SOURCES =  $(test_libglade_SOURCES)
--DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(confexec_DATA) $(m4data_DATA)
- 
-@@ -592,3 +592,3 @@
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
-@@ -599,3 +599,3 @@
- uninstall-am: uninstall-binSCRIPTS uninstall-confexecDATA \
--		uninstall-m4dataDATA uninstall-pkgconfigDATA
-+		uninstall-m4dataDATA
- uninstall: uninstall-recursive
-@@ -608,3 +608,3 @@
- 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(confexecdir) \
--		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir)
-+		$(DESTDIR)$(m4datadir)
  
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libglade.pc $(libglade_gnome_pc) $(libglade_bonobo_pc) \
diff --git a/devel/libglade/pkg-plist b/devel/libglade/pkg-plist
index e13fdefbe04b..cdc9d22e003a 100644
--- a/devel/libglade/pkg-plist
+++ b/devel/libglade/pkg-plist
@@ -14,5 +14,8 @@ lib/libglade-bonobo.so.4
 lib/libglade-gnome.a
 lib/libglade-gnome.so
 lib/libglade-gnome.so.4
+libdata/pkgconfig/libglade.pc
+libdata/pkgconfig/libglade-bonobo.pc
+libdata/pkgconfig/libglade-gnome.pc
 share/aclocal/libglade.m4
 @dirrm include/glade
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index ebd31ef5c462..1a0f5c2260e8 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglade
 PORTVERSION=	0.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libglade
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index b6f8a2945f60..7c58782cbc50 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,6 +1,11 @@
---- Makefile.in.orig	Wed Nov 22 08:36:15 2000
-+++ Makefile.in	Wed Nov 29 18:22:18 2000
-@@ -162,8 +162,8 @@
+--- Makefile.in.orig	Sat Feb 10 05:27:41 2001
++++ Makefile.in	Tue May 22 11:30:14 2001
+@@ -36,3 +36,3 @@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -168,11 +168,11 @@
  test_libglade_LDADD = $(THE_LIBS) $(XML_LIBS)
 -SUBDIRS = intl po macros glade doc
 +SUBDIRS = intl po macros glade
@@ -10,25 +15,9 @@
  m4data_DATA = libglade.m4
  
 -confexecdir = $(libdir)
-+confexecdir = $(prefix)/etc
++confexecdir = $(sysconfdir)
  confexec_DATA = libgladeConf.sh
-@@ -201,3 +201,3 @@
- DIST_SOURCES =  $(test_libglade_SOURCES)
--DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
-+DATA =  $(confexec_DATA) $(m4data_DATA)
- 
-@@ -592,3 +592,3 @@
- 
--install-data-am: install-m4dataDATA install-pkgconfigDATA
-+install-data-am: install-m4dataDATA
- install-data: install-data-recursive
-@@ -599,3 +599,3 @@
- uninstall-am: uninstall-binSCRIPTS uninstall-confexecDATA \
--		uninstall-m4dataDATA uninstall-pkgconfigDATA
-+		uninstall-m4dataDATA
- uninstall: uninstall-recursive
-@@ -608,3 +608,3 @@
- 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(confexecdir) \
--		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir)
-+		$(DESTDIR)$(m4datadir)
  
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libglade.pc $(libglade_gnome_pc) $(libglade_bonobo_pc) \
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index e13fdefbe04b..cdc9d22e003a 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -14,5 +14,8 @@ lib/libglade-bonobo.so.4
 lib/libglade-gnome.a
 lib/libglade-gnome.so
 lib/libglade-gnome.so.4
+libdata/pkgconfig/libglade.pc
+libdata/pkgconfig/libglade-bonobo.pc
+libdata/pkgconfig/libglade-gnome.pc
 share/aclocal/libglade.m4
 @dirrm include/glade