Upgrade to 1.1.2.

12 files changed, 66 insertions, 48 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 9ef22acdc305..459de4e50096 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.0
+# Version required:		1.1.2
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1998/07/28 15:22:15 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.0
+DISTNAME=	glib-1.1.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,9 +15,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+#USE_GMAKE=	yes
 
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index e87179524ee4..cda5a5e37a1e 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.0.tar.gz) = 6f8c4b3eda4b8e6953e3e09435a4eaa7
+MD5 (glib-1.1.2.tar.gz) = 077a3789b3305e89b493571e07700e2c
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index a50ccf36dc73..d3b1776cbf36 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Jul 27 13:33:53 1998
-+++ Makefile.in	Thu Jul 30 12:43:21 1998
+--- Makefile.in.orig	Thu Aug  6 01:16:42 1998
++++ Makefile.in	Thu Aug  6 14:45:14 1998
 @@ -77,8 +77,6 @@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
@@ -9,7 +9,7 @@
  bin_SCRIPTS=glib-config
  
  EXTRA_DIST =	\
-@@ -108,9 +106,7 @@
+@@ -109,12 +107,10 @@
  		gutils.c
  
  include_HEADERS = \
@@ -19,8 +19,12 @@
 +		glib.h \
  		glibconfig.h
  
- libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-@@ -150,7 +146,7 @@
+-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libglib_1_1_la_LDFLAGS = -version-info 0:2:0
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
+@@ -151,7 +147,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -29,7 +33,7 @@
  
  HEADERS =  $(include_HEADERS)
  
-@@ -307,25 +303,6 @@
+@@ -308,25 +304,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -55,7 +59,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -455,13 +432,13 @@
+@@ -457,13 +434,13 @@
  install-exec: install-libLTLIBRARIES install-binSCRIPTS
  	@$(NORMAL_INSTALL)
  
@@ -71,7 +75,7 @@
  
  install-strip:
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-@@ -517,7 +494,6 @@
+@@ -519,7 +496,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index 0f0106903b02..b8a22916dac5 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,10 +1,11 @@
 bin/glib-config
-include/glib.h
-include/glibconfig.h
+include/glib/glib.h
+include/glib/glibconfig.h
 lib/libglib-1.1.a
 lib/libglib-1.1.la
 lib/libglib-1.1.so
-lib/libglib-1.1.so.0.0
+lib/libglib-1.1.so.0.2
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 share/aclocal/glib.m4
+@dirrm include/glib
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 9ef22acdc305..459de4e50096 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.0
+# Version required:		1.1.2
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1998/07/28 15:22:15 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.0
+DISTNAME=	glib-1.1.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,9 +15,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+#USE_GMAKE=	yes
 
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index e87179524ee4..cda5a5e37a1e 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.0.tar.gz) = 6f8c4b3eda4b8e6953e3e09435a4eaa7
+MD5 (glib-1.1.2.tar.gz) = 077a3789b3305e89b493571e07700e2c
diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab
index a50ccf36dc73..d3b1776cbf36 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Jul 27 13:33:53 1998
-+++ Makefile.in	Thu Jul 30 12:43:21 1998
+--- Makefile.in.orig	Thu Aug  6 01:16:42 1998
++++ Makefile.in	Thu Aug  6 14:45:14 1998
 @@ -77,8 +77,6 @@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
@@ -9,7 +9,7 @@
  bin_SCRIPTS=glib-config
  
  EXTRA_DIST =	\
-@@ -108,9 +106,7 @@
+@@ -109,12 +107,10 @@
  		gutils.c
  
  include_HEADERS = \
@@ -19,8 +19,12 @@
 +		glib.h \
  		glibconfig.h
  
- libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-@@ -150,7 +146,7 @@
+-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libglib_1_1_la_LDFLAGS = -version-info 0:2:0
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
+@@ -151,7 +147,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -29,7 +33,7 @@
  
  HEADERS =  $(include_HEADERS)
  
-@@ -307,25 +303,6 @@
+@@ -308,25 +304,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -55,7 +59,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -455,13 +432,13 @@
+@@ -457,13 +434,13 @@
  install-exec: install-libLTLIBRARIES install-binSCRIPTS
  	@$(NORMAL_INSTALL)
  
@@ -71,7 +75,7 @@
  
  install-strip:
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-@@ -517,7 +494,6 @@
+@@ -519,7 +496,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index 0f0106903b02..b8a22916dac5 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -1,10 +1,11 @@
 bin/glib-config
-include/glib.h
-include/glibconfig.h
+include/glib/glib.h
+include/glib/glibconfig.h
 lib/libglib-1.1.a
 lib/libglib-1.1.la
 lib/libglib-1.1.so
-lib/libglib-1.1.so.0.0
+lib/libglib-1.1.so.0.2
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 share/aclocal/glib.m4
+@dirrm include/glib
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 9ef22acdc305..459de4e50096 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.0
+# Version required:		1.1.2
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1998/07/28 15:22:15 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.0
+DISTNAME=	glib-1.1.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,9 +15,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+#USE_GMAKE=	yes
 
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index e87179524ee4..cda5a5e37a1e 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.0.tar.gz) = 6f8c4b3eda4b8e6953e3e09435a4eaa7
+MD5 (glib-1.1.2.tar.gz) = 077a3789b3305e89b493571e07700e2c
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index a50ccf36dc73..d3b1776cbf36 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Jul 27 13:33:53 1998
-+++ Makefile.in	Thu Jul 30 12:43:21 1998
+--- Makefile.in.orig	Thu Aug  6 01:16:42 1998
++++ Makefile.in	Thu Aug  6 14:45:14 1998
 @@ -77,8 +77,6 @@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
@@ -9,7 +9,7 @@
  bin_SCRIPTS=glib-config
  
  EXTRA_DIST =	\
-@@ -108,9 +106,7 @@
+@@ -109,12 +107,10 @@
  		gutils.c
  
  include_HEADERS = \
@@ -19,8 +19,12 @@
 +		glib.h \
  		glibconfig.h
  
- libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-@@ -150,7 +146,7 @@
+-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libglib_1_1_la_LDFLAGS = -version-info 0:2:0
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
+@@ -151,7 +147,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -29,7 +33,7 @@
  
  HEADERS =  $(include_HEADERS)
  
-@@ -307,25 +303,6 @@
+@@ -308,25 +304,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -55,7 +59,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -455,13 +432,13 @@
+@@ -457,13 +434,13 @@
  install-exec: install-libLTLIBRARIES install-binSCRIPTS
  	@$(NORMAL_INSTALL)
  
@@ -71,7 +75,7 @@
  
  install-strip:
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-@@ -517,7 +494,6 @@
+@@ -519,7 +496,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 0f0106903b02..b8a22916dac5 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,10 +1,11 @@
 bin/glib-config
-include/glib.h
-include/glibconfig.h
+include/glib/glib.h
+include/glib/glibconfig.h
 lib/libglib-1.1.a
 lib/libglib-1.1.la
 lib/libglib-1.1.so
-lib/libglib-1.1.so.0.0
+lib/libglib-1.1.so.0.2
 @unexec /sbin/ldconfig -R
 @exec /sbin/ldconfig -m %D/lib
 share/aclocal/glib.m4
+@dirrm include/glib