Update "glib" package to version 1.1.9.

5 files changed, 44 insertions, 24 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index f3e4ed8685a..fc842f38841 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.7 1998/11/21 16:57:29 tron Exp $
+# $NetBSD: Makefile,v 1.8 1998/12/18 23:52:22 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
-DISTNAME=	glib-1.1.4
+DISTNAME=	glib-1.1.9
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
-		http://www.ameth.org/gimp/pub/gtk/v1.1/
+		http://www.ameth.org/gimp/pub/gtk/v1.1/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gtk.org/docs/glib_toc.html
 
-CONFLICTS=	glib-1.1.2 glib-1.1.3 gtk+-1.0.4
+CONFLICTS=	glib-* gtk+-1.0.*
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/devel/glib/files/md5 b/devel/glib/files/md5
index 6dd832fa026..b79dc32b776 100644
--- a/devel/glib/files/md5
+++ b/devel/glib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/11/21 16:57:29 tron Exp $
+$NetBSD: md5,v 1.4 1998/12/18 23:52:22 tron Exp $
 
-MD5 (glib-1.1.4.tar.gz) = 4d2ec8a2234c26074d286658935d1e93
+MD5 (glib-1.1.9.tar.gz) = a645722c4c32d091876851269da4bea1
diff --git a/devel/glib/patches/patch-ab b/devel/glib/patches/patch-ab
index e53e766c79b..9a0fbac3bec 100644
--- a/devel/glib/patches/patch-ab
+++ b/devel/glib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/18 23:52:22 tron Exp $
 
---- Makefile.in.orig	Tue Sep 22 05:27:49 1998
-+++ Makefile.in	Sun Oct  4 19:58:07 1998
-@@ -48,7 +48,7 @@
+--- Makefile.in.orig	Fri Dec 11 07:15:56 1998
++++ Makefile.in	Tue Dec 15 21:03:08 1998
+@@ -50,7 +50,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
  transform = @program_transform_name@
  
  NORMAL_INSTALL = :
-@@ -84,8 +84,6 @@
- 
- SUBDIRS = gmodule
+@@ -89,8 +89,6 @@
+ # alpha `automake' supports this better
+ #SUBDIRS = . gmodule docs
  
 -configincludedir = $(pkglibdir)/include
 -
  bin_SCRIPTS=glib-config
  BUILT_SOURCES=glib-config
  
-@@ -117,13 +115,11 @@
+@@ -135,15 +133,13 @@
  		gutils.c
  
  include_HEADERS = \
@@ -30,13 +30,15 @@ $NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
 +		glib.h \
  		glibconfig.h
  
+ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
+ 
  libglib_la_LDFLAGS = \
 -	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 +	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- INCLUDES = -I$(top_srcdir)
  
- noinst_PROGRAMS = testglib
-@@ -159,7 +155,7 @@
+ noinst_PROGRAMS = testglib testgdate testgdateparser
+ testglib_LDADD = libglib.la
+@@ -188,7 +184,7 @@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@@ -45,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
  
  HEADERS =  $(include_HEADERS)
  
-@@ -316,25 +312,6 @@
+@@ -353,25 +349,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -71,7 +73,7 @@ $NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -517,7 +494,7 @@
+@@ -534,7 +511,7 @@
  
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
  
@@ -80,7 +82,7 @@ $NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
  
  uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
  
-@@ -595,7 +572,6 @@
+@@ -612,7 +589,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
diff --git a/devel/glib/patches/patch-ae b/devel/glib/patches/patch-ae
new file mode 100644
index 00000000000..4158e653a1c
--- /dev/null
+++ b/devel/glib/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 1998/12/18 23:52:22 tron Exp $
+
+--- gthread/Makefile.in.orig	Thu Dec 17 06:11:39 1998
++++ gthread/Makefile.in	Fri Dec 18 23:23:06 1998
+@@ -99,8 +99,7 @@
+ 
+ libgthread_la_SOURCES = gthread.c
+ libgthread_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+-	-release $(LT_RELEASE)
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ libgthread_la_LIBADD = @G_THREAD_LIBS@
+ 
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
index 0cd1cdfbec1..7a5ee71445f 100644
--- a/devel/glib/pkg/PLIST
+++ b/devel/glib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/11/24 21:42:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/12/18 23:52:22 tron Exp $
 bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
@@ -8,10 +8,13 @@ info/glib.info
 @exec %D/bin/install-info %D/info/glib.info %D/info/dir
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so.4.0
+lib/libglib.so.9.0
 lib/libgmodule.a
 lib/libgmodule.la
-lib/libgmodule.so.4.0
+lib/libgmodule.so.9.0
+lib/libgthread.a
+lib/libgthread.la
+lib/libgthread.so.9.0
 man/man1/glib-config.1
 share/aclocal/glib.m4
 @dirrm include/glib