Upgrade to 1.1.4.

4 files changed, 35 insertions, 33 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 59731de14053..af8125c8582b 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   glib
-# Version required:		1.1.3
+# Version required:		1.1.4
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp $
+# $Id: Makefile,v 1.3 1998/09/22 15:33:35 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.3
+DISTNAME=	glib-1.1.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index e19e1f315126..337ad9992772 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.3.tar.gz) = 1fbc57380af911ae651d9b739e41daa5
+MD5 (glib-1.1.4.tar.gz) = 4d2ec8a2234c26074d286658935d1e93
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index c7ab09064b90..190a8c1e5f7d 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,17 +1,19 @@
---- Makefile.in.orig	Tue Sep 22 11:27:49 1998
-+++ Makefile.in	Tue Sep 22 21:10:17 1998
-@@ -84,8 +84,6 @@
+--- Makefile.in.orig	Sun Oct 25 15:59:19 1998
++++ Makefile.in	Wed Oct 28 23:22:13 1998
+@@ -82,9 +82,7 @@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
  
- SUBDIRS = gmodule
- 
--configincludedir = $(pkglibdir)/include
+-SUBDIRS = gmodule docs
 -
+-configincludedir = $(pkglibdir)/include
++SUBDIRS = gmodule
+ 
  bin_SCRIPTS=glib-config
  BUILT_SOURCES=glib-config
- 
-@@ -93,9 +91,9 @@
- 		glib.m4 \
- 		glib.spec
+@@ -94,9 +92,9 @@
+ 		glib.spec	\
+ 		sanity_check
  
 -lib_LTLIBRARIES = libglib.la
 +lib_LTLIBRARIES = libglib11.la
@@ -21,7 +23,7 @@
  		garray.c	\
  		gcache.c	\
  		gcompletion.c	\
-@@ -117,17 +115,15 @@
+@@ -119,17 +117,15 @@
  		gutils.c
  
  include_HEADERS = \
@@ -34,7 +36,7 @@
 -libglib_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 +libglib11_la_LDFLAGS = \
-+	-version-info 0:3:0
++	-version-info 0:4:0
  INCLUDES = -I$(top_srcdir)
  
  noinst_PROGRAMS = testglib
@@ -43,7 +45,7 @@
  
  m4datadir = $(datadir)/aclocal
  m4data_DATA = glib.m4
-@@ -142,8 +138,8 @@
+@@ -144,8 +140,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -51,10 +53,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 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 ghook.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
-@@ -151,7 +147,7 @@
+@@ -153,7 +149,7 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -63,16 +65,16 @@
  testglib_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -159,7 +155,7 @@
+@@ -161,7 +157,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)
  
-@@ -173,8 +169,8 @@
+@@ -175,8 +171,8 @@
  
  TAR = tar
  GZIP = --best
@@ -83,7 +85,7 @@
  
  all: all-recursive-am all-am
  
-@@ -281,8 +277,8 @@
+@@ -283,8 +279,8 @@
  
  maintainer-clean-libtool:
  
@@ -94,7 +96,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -316,25 +312,6 @@
+@@ -318,25 +314,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -120,7 +122,7 @@
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -517,9 +494,9 @@
+@@ -499,9 +476,9 @@
  
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
  
@@ -132,7 +134,7 @@
  
  install-exec: install-exec-recursive install-exec-am
  	@$(NORMAL_INSTALL)
-@@ -595,7 +572,6 @@
+@@ -577,7 +554,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
@@ -140,8 +142,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	Tue Sep 22 21:04:45 1998
-+++ gmodule/Makefile.in	Tue Sep 22 21:09:58 1998
+--- gmodule/Makefile.in.orig	Sun Oct 25 15:59:20 1998
++++ gmodule/Makefile.in	Wed Oct 28 23:12:09 1998
 @@ -94,30 +94,29 @@
  include_HEADERS = \
  		gmodule.h
@@ -159,7 +161,7 @@
  	@G_MODULE_LDFLAGS@ \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 -	-release $(LT_RELEASE)
-+	-version-info 0:3:0
++	-version-info 0:4:0
  
 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 +libgmodule11_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
@@ -244,7 +246,7 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -387,10 +386,10 @@
+@@ -380,10 +379,10 @@
  	  echo $$p; \
  	done
  
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 99b206555e23..b936042e23dc 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -5,11 +5,11 @@ include/glib/gmodule.h
 lib/libglib11.a
 lib/libglib11.la
 lib/libglib11.so
-lib/libglib11.so.0.3
+lib/libglib11.so.0.4
 lib/libgmodule11.a
 lib/libgmodule11.la
 lib/libgmodule11.so
-lib/libgmodule11.so.0.3
+lib/libgmodule11.so.0.4
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/glib.m4