Downgrage to 1.1.3.

Remind by:	asami

12 files changed, 99 insertions, 147 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index dcac5602a959..6d00dcee18fe 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.4
+# Version required:		1.1.3
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/10/28 15:46:56 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/11/02 15:59:38 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.4
+DISTNAME=	glib-1.1.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -20,9 +20,9 @@ CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
+#	@if [ ! -f ${PREFIX}/info/dir ]; then \
+#	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+#	fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index 337ad9992772..e19e1f315126 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.4.tar.gz) = 4d2ec8a2234c26074d286658935d1e93
+MD5 (glib-1.1.3.tar.gz) = 1fbc57380af911ae651d9b739e41daa5
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index b83367772933..121377e5b0c2 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Sun Oct 25 15:59:19 1998
-+++ Makefile.in	Mon Nov  2 20:00:22 1998
+--- Makefile.in.orig	Tue Sep 22 11:27:49 1998
++++ Makefile.in	Tue Nov 17 22:28:11 1998
 @@ -84,8 +84,6 @@
  
- SUBDIRS = gmodule docs
+ SUBDIRS = gmodule
  
 -configincludedir = $(pkglibdir)/include
 -
  bin_SCRIPTS=glib-config
  BUILT_SOURCES=glib-config
  
-@@ -94,9 +92,9 @@
- 		glib.spec	\
- 		sanity_check
+@@ -93,9 +91,9 @@
+ 		glib.m4 \
+ 		glib.spec
  
 -lib_LTLIBRARIES = libglib.la
 +lib_LTLIBRARIES = libglib11.la
@@ -21,7 +21,7 @@
  		garray.c	\
  		gcache.c	\
  		gcompletion.c	\
-@@ -119,17 +117,15 @@
+@@ -117,17 +115,15 @@
  		gutils.c
  
  include_HEADERS = \
@@ -31,10 +31,9 @@
 +		glib.h \
  		glibconfig.h
  
--libglib_la_LDFLAGS = \
+ libglib_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libglib11_la_LDFLAGS = \
-+	-version-info 0:4:0
++	-version-info 0:3:0
  INCLUDES = -I$(top_srcdir)
  
  noinst_PROGRAMS = testglib
@@ -43,7 +42,7 @@
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = glib.m4
-@@ -144,8 +140,8 @@
+@@ -142,8 +138,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -51,10 +50,10 @@
 -libglib_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
 +libglib11_la_LIBADD = 
 +libglib11_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gerror.lo ghash.lo ghook.lo glist.lo gmem.lo gmessages.lo gnode.lo \
- gprimes.lo gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
+ gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gnode.lo gprimes.lo \
+ gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
  gscanner.lo gutils.lo
-@@ -153,7 +149,7 @@
+@@ -151,7 +147,7 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -63,16 +62,16 @@
  testglib_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -161,7 +157,7 @@
+@@ -159,7 +155,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 -DATA =  $(configinclude_DATA) $(m4data_DATA)
-+DATA = $(m4data_DATA)
++DATA =  $(m4data_DATA)
  
  HEADERS =  $(include_HEADERS)
  
-@@ -175,8 +171,8 @@
+@@ -173,8 +169,8 @@
  
  TAR = tar
  GZIP = --best
@@ -83,7 +82,7 @@
  
  all: all-recursive-am all-am
  
-@@ -283,8 +279,8 @@
+@@ -281,8 +277,8 @@
  
  maintainer-clean-libtool:
  
@@ -94,7 +93,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -318,25 +314,6 @@
+@@ -316,25 +312,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -120,7 +119,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -499,9 +476,9 @@
+@@ -517,9 +494,9 @@
  
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
  
@@ -132,7 +131,7 @@
  
  install-exec: install-exec-recursive install-exec-am
  	@$(NORMAL_INSTALL)
-@@ -577,7 +554,6 @@
+@@ -595,7 +572,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
@@ -140,8 +139,8 @@
  uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
  install-includeHEADERS install-data-recursive uninstall-data-recursive \
  install-exec-recursive uninstall-exec-recursive installdirs-recursive \
---- gmodule/Makefile.in.orig	Sun Oct 25 15:59:20 1998
-+++ gmodule/Makefile.in	Mon Nov  2 19:59:52 1998
+--- gmodule/Makefile.in.orig	Tue Sep 22 11:27:51 1998
++++ gmodule/Makefile.in	Tue Nov 17 22:28:23 1998
 @@ -94,30 +94,29 @@
  include_HEADERS = \
  		gmodule.h
@@ -159,7 +158,7 @@
  	@G_MODULE_LDFLAGS@ \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 -	-release $(LT_RELEASE)
-+	-version-info 0:4:0
++	-version-info 0:3:0
  
 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 +libgmodule11_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
@@ -244,7 +243,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -380,10 +379,10 @@
+@@ -387,10 +386,10 @@
  	  echo $$p; \
  	done
  
@@ -257,14 +256,3 @@
  	 if test -f $$p; then \
  	  echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
---- docs/Makefile.in.orig	Mon Nov  2 20:01:03 1998
-+++ docs/Makefile.in	Mon Nov  2 20:01:16 1998
-@@ -76,7 +76,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index b9ef2a278605..99b206555e23 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -2,18 +2,14 @@ bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
 include/glib/gmodule.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-info/glib.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
 lib/libglib11.a
 lib/libglib11.la
 lib/libglib11.so
-lib/libglib11.so.0.4
+lib/libglib11.so.0.3
 lib/libgmodule11.a
 lib/libgmodule11.la
 lib/libgmodule11.so
-lib/libgmodule11.so.0.4
+lib/libgmodule11.so.0.3
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index dcac5602a959..6d00dcee18fe 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.4
+# Version required:		1.1.3
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/10/28 15:46:56 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/11/02 15:59:38 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.4
+DISTNAME=	glib-1.1.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -20,9 +20,9 @@ CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
+#	@if [ ! -f ${PREFIX}/info/dir ]; then \
+#	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+#	fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index 337ad9992772..e19e1f315126 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.4.tar.gz) = 4d2ec8a2234c26074d286658935d1e93
+MD5 (glib-1.1.3.tar.gz) = 1fbc57380af911ae651d9b739e41daa5
diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab
index b83367772933..121377e5b0c2 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Sun Oct 25 15:59:19 1998
-+++ Makefile.in	Mon Nov  2 20:00:22 1998
+--- Makefile.in.orig	Tue Sep 22 11:27:49 1998
++++ Makefile.in	Tue Nov 17 22:28:11 1998
 @@ -84,8 +84,6 @@
  
- SUBDIRS = gmodule docs
+ SUBDIRS = gmodule
  
 -configincludedir = $(pkglibdir)/include
 -
  bin_SCRIPTS=glib-config
  BUILT_SOURCES=glib-config
  
-@@ -94,9 +92,9 @@
- 		glib.spec	\
- 		sanity_check
+@@ -93,9 +91,9 @@
+ 		glib.m4 \
+ 		glib.spec
  
 -lib_LTLIBRARIES = libglib.la
 +lib_LTLIBRARIES = libglib11.la
@@ -21,7 +21,7 @@
  		garray.c	\
  		gcache.c	\
  		gcompletion.c	\
-@@ -119,17 +117,15 @@
+@@ -117,17 +115,15 @@
  		gutils.c
  
  include_HEADERS = \
@@ -31,10 +31,9 @@
 +		glib.h \
  		glibconfig.h
  
--libglib_la_LDFLAGS = \
+ libglib_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libglib11_la_LDFLAGS = \
-+	-version-info 0:4:0
++	-version-info 0:3:0
  INCLUDES = -I$(top_srcdir)
  
  noinst_PROGRAMS = testglib
@@ -43,7 +42,7 @@
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = glib.m4
-@@ -144,8 +140,8 @@
+@@ -142,8 +138,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -51,10 +50,10 @@
 -libglib_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
 +libglib11_la_LIBADD = 
 +libglib11_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gerror.lo ghash.lo ghook.lo glist.lo gmem.lo gmessages.lo gnode.lo \
- gprimes.lo gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
+ gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gnode.lo gprimes.lo \
+ gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
  gscanner.lo gutils.lo
-@@ -153,7 +149,7 @@
+@@ -151,7 +147,7 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -63,16 +62,16 @@
  testglib_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -161,7 +157,7 @@
+@@ -159,7 +155,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 -DATA =  $(configinclude_DATA) $(m4data_DATA)
-+DATA = $(m4data_DATA)
++DATA =  $(m4data_DATA)
  
  HEADERS =  $(include_HEADERS)
  
-@@ -175,8 +171,8 @@
+@@ -173,8 +169,8 @@
  
  TAR = tar
  GZIP = --best
@@ -83,7 +82,7 @@
  
  all: all-recursive-am all-am
  
-@@ -283,8 +279,8 @@
+@@ -281,8 +277,8 @@
  
  maintainer-clean-libtool:
  
@@ -94,7 +93,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -318,25 +314,6 @@
+@@ -316,25 +312,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -120,7 +119,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -499,9 +476,9 @@
+@@ -517,9 +494,9 @@
  
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
  
@@ -132,7 +131,7 @@
  
  install-exec: install-exec-recursive install-exec-am
  	@$(NORMAL_INSTALL)
-@@ -577,7 +554,6 @@
+@@ -595,7 +572,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
@@ -140,8 +139,8 @@
  uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
  install-includeHEADERS install-data-recursive uninstall-data-recursive \
  install-exec-recursive uninstall-exec-recursive installdirs-recursive \
---- gmodule/Makefile.in.orig	Sun Oct 25 15:59:20 1998
-+++ gmodule/Makefile.in	Mon Nov  2 19:59:52 1998
+--- gmodule/Makefile.in.orig	Tue Sep 22 11:27:51 1998
++++ gmodule/Makefile.in	Tue Nov 17 22:28:23 1998
 @@ -94,30 +94,29 @@
  include_HEADERS = \
  		gmodule.h
@@ -159,7 +158,7 @@
  	@G_MODULE_LDFLAGS@ \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 -	-release $(LT_RELEASE)
-+	-version-info 0:4:0
++	-version-info 0:3:0
  
 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 +libgmodule11_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
@@ -244,7 +243,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -380,10 +379,10 @@
+@@ -387,10 +386,10 @@
  	  echo $$p; \
  	done
  
@@ -257,14 +256,3 @@
  	 if test -f $$p; then \
  	  echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
---- docs/Makefile.in.orig	Mon Nov  2 20:01:03 1998
-+++ docs/Makefile.in	Mon Nov  2 20:01:16 1998
-@@ -76,7 +76,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index b9ef2a278605..99b206555e23 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -2,18 +2,14 @@ bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
 include/glib/gmodule.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-info/glib.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
 lib/libglib11.a
 lib/libglib11.la
 lib/libglib11.so
-lib/libglib11.so.0.4
+lib/libglib11.so.0.3
 lib/libgmodule11.a
 lib/libgmodule11.la
 lib/libgmodule11.so
-lib/libgmodule11.so.0.4
+lib/libgmodule11.so.0.3
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index dcac5602a959..6d00dcee18fe 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.4
+# Version required:		1.1.3
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/10/28 15:46:56 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/11/02 15:59:38 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.4
+DISTNAME=	glib-1.1.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -20,9 +20,9 @@ CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib
 
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
+#	@if [ ! -f ${PREFIX}/info/dir ]; then \
+#	${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
+#	fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 337ad9992772..e19e1f315126 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.4.tar.gz) = 4d2ec8a2234c26074d286658935d1e93
+MD5 (glib-1.1.3.tar.gz) = 1fbc57380af911ae651d9b739e41daa5
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index b83367772933..121377e5b0c2 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Sun Oct 25 15:59:19 1998
-+++ Makefile.in	Mon Nov  2 20:00:22 1998
+--- Makefile.in.orig	Tue Sep 22 11:27:49 1998
++++ Makefile.in	Tue Nov 17 22:28:11 1998
 @@ -84,8 +84,6 @@
  
- SUBDIRS = gmodule docs
+ SUBDIRS = gmodule
  
 -configincludedir = $(pkglibdir)/include
 -
  bin_SCRIPTS=glib-config
  BUILT_SOURCES=glib-config
  
-@@ -94,9 +92,9 @@
- 		glib.spec	\
- 		sanity_check
+@@ -93,9 +91,9 @@
+ 		glib.m4 \
+ 		glib.spec
  
 -lib_LTLIBRARIES = libglib.la
 +lib_LTLIBRARIES = libglib11.la
@@ -21,7 +21,7 @@
  		garray.c	\
  		gcache.c	\
  		gcompletion.c	\
-@@ -119,17 +117,15 @@
+@@ -117,17 +115,15 @@
  		gutils.c
  
  include_HEADERS = \
@@ -31,10 +31,9 @@
 +		glib.h \
  		glibconfig.h
  
--libglib_la_LDFLAGS = \
+ libglib_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libglib11_la_LDFLAGS = \
-+	-version-info 0:4:0
++	-version-info 0:3:0
  INCLUDES = -I$(top_srcdir)
  
  noinst_PROGRAMS = testglib
@@ -43,7 +42,7 @@
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = glib.m4
-@@ -144,8 +140,8 @@
+@@ -142,8 +138,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -51,10 +50,10 @@
 -libglib_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
 +libglib11_la_LIBADD = 
 +libglib11_la_OBJECTS =  garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gerror.lo ghash.lo ghook.lo glist.lo gmem.lo gmessages.lo gnode.lo \
- gprimes.lo gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
+ gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gnode.lo gprimes.lo \
+ gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
  gscanner.lo gutils.lo
-@@ -153,7 +149,7 @@
+@@ -151,7 +147,7 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -63,16 +62,16 @@
  testglib_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -161,7 +157,7 @@
+@@ -159,7 +155,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 -DATA =  $(configinclude_DATA) $(m4data_DATA)
-+DATA = $(m4data_DATA)
++DATA =  $(m4data_DATA)
  
  HEADERS =  $(include_HEADERS)
  
-@@ -175,8 +171,8 @@
+@@ -173,8 +169,8 @@
  
  TAR = tar
  GZIP = --best
@@ -83,7 +82,7 @@
  
  all: all-recursive-am all-am
  
-@@ -283,8 +279,8 @@
+@@ -281,8 +277,8 @@
  
  maintainer-clean-libtool:
  
@@ -94,7 +93,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -318,25 +314,6 @@
+@@ -316,25 +312,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -120,7 +119,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -499,9 +476,9 @@
+@@ -517,9 +494,9 @@
  
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
  
@@ -132,7 +131,7 @@
  
  install-exec: install-exec-recursive install-exec-am
  	@$(NORMAL_INSTALL)
-@@ -577,7 +554,6 @@
+@@ -595,7 +572,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
@@ -140,8 +139,8 @@
  uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
  install-includeHEADERS install-data-recursive uninstall-data-recursive \
  install-exec-recursive uninstall-exec-recursive installdirs-recursive \
---- gmodule/Makefile.in.orig	Sun Oct 25 15:59:20 1998
-+++ gmodule/Makefile.in	Mon Nov  2 19:59:52 1998
+--- gmodule/Makefile.in.orig	Tue Sep 22 11:27:51 1998
++++ gmodule/Makefile.in	Tue Nov 17 22:28:23 1998
 @@ -94,30 +94,29 @@
  include_HEADERS = \
  		gmodule.h
@@ -159,7 +158,7 @@
  	@G_MODULE_LDFLAGS@ \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 -	-release $(LT_RELEASE)
-+	-version-info 0:4:0
++	-version-info 0:3:0
  
 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 +libgmodule11_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
@@ -244,7 +243,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -380,10 +379,10 @@
+@@ -387,10 +386,10 @@
  	  echo $$p; \
  	done
  
@@ -257,14 +256,3 @@
  	 if test -f $$p; then \
  	  echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
---- docs/Makefile.in.orig	Mon Nov  2 20:01:03 1998
-+++ docs/Makefile.in	Mon Nov  2 20:01:16 1998
-@@ -76,7 +76,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index b9ef2a278605..99b206555e23 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -2,18 +2,14 @@ bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
 include/glib/gmodule.h
-@unexec install-info --delete %D/info/glib.info %D/info/dir
-info/glib.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
 lib/libglib11.a
 lib/libglib11.la
 lib/libglib11.so
-lib/libglib11.so.0.4
+lib/libglib11.so.0.3
 lib/libgmodule11.a
 lib/libgmodule11.la
 lib/libgmodule11.so
-lib/libgmodule11.so.0.4
+lib/libgmodule11.so.0.3
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4