Update "glib" package to release version 1.2.0.

7 files changed, 60 insertions, 77 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 7848a857fc4..dee1eb141b3 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 1999/02/21 09:07:51 tron Exp $
+# $NetBSD: Makefile,v 1.13 1999/03/04 08:50:43 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
-DISTNAME=	glib-1.1.12
+DISTNAME=	glib-1.2.0
 CATEGORIES=	devel
-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/ \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.2/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+		http://www.ameth.org/gimp/pub/gtk/v1.2/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.2/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gtk.org/docs/glib_toc.html
diff --git a/devel/glib/files/md5 b/devel/glib/files/md5
index 7ebd5edcb9e..44150b81e67 100644
--- a/devel/glib/files/md5
+++ b/devel/glib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/01/15 22:57:13 tron Exp $
+$NetBSD: md5,v 1.6 1999/03/04 08:50:43 tron Exp $
 
-MD5 (glib-1.1.12.tar.gz) = 276d4b8f0e6bba5d568e8679dcf1372a
+MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
diff --git a/devel/glib/patches/patch-aa b/devel/glib/patches/patch-aa
deleted file mode 100644
index 5d2fda4cc93..00000000000
--- a/devel/glib/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
-
---- ltconfig.orig	Tue Jul 28 22:17:11 1998
-+++ ltconfig	Tue Jul 28 22:17:28 1998
-@@ -798,7 +798,7 @@
- 
-   # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-   freebsd3*)
--    archive_cmds='$CC -shared -o $lib$libobjs'
-+    archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/aout/c++rt0.o'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-     hardcode_minus_L=yes
diff --git a/devel/glib/patches/patch-ab b/devel/glib/patches/patch-ab
index 85bf3675453..bf7fa3b6d27 100644
--- a/devel/glib/patches/patch-ab
+++ b/devel/glib/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 1999/01/15 22:57:13 tron Exp $
+$NetBSD: patch-ab,v 1.5 1999/03/04 08:50:44 tron Exp $
 
---- Makefile.in.orig	Mon Jan  4 10:47:12 1999
-+++ Makefile.in	Fri Jan 15 23:37:42 1999
-@@ -50,7 +50,7 @@
+--- Makefile.in.orig	Wed Feb 24 23:09:14 1999
++++ Makefile.in	Tue Mar  2 23:50:46 1999
+@@ -48,7 +48,7 @@
  INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
  INSTALL_DATA = @INSTALL_DATA@
 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
@@ -12,43 +12,40 @@ $NetBSD: patch-ab,v 1.4 1999/01/15 22:57:13 tron Exp $
  
  NORMAL_INSTALL = :
 @@ -91,8 +91,6 @@
- # alpha `automake' supports this better
- #SUBDIRS = . gmodule gthread docs tests
+ 
+ SUBDIRS = . gmodule gthread docs tests
  
 -configincludedir = $(pkglibdir)/include
 -
- bin_SCRIPTS=glib-config
- BUILT_SOURCES=glib-config
+ bin_SCRIPTS = glib-config
+ 
+ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
+@@ -107,13 +105,10 @@
+ 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
  
-@@ -139,16 +137,13 @@
- 	gutils.c
  
- include_HEADERS = \
--	glib.h
+-include_HEADERS =  	glib.h
+-
 -
--configinclude_DATA = \
-+	glib.h \
- 	glibconfig.h
+-configinclude_DATA =  	glibconfig.h
++include_HEADERS =  	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)
+-libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libglib_la_LDFLAGS =  	-release $(LT_RELEASE)
+ 
  
  noinst_PROGRAMS = testglib testgdate testgdateparser
- testglib_LDADD = libglib.la
-@@ -194,7 +189,7 @@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+@@ -161,7 +156,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 -DATA =  $(configinclude_DATA) $(m4data_DATA)
 +DATA =  $(m4data_DATA)
  
  HEADERS =  $(include_HEADERS)
  
-@@ -359,25 +354,6 @@
+@@ -335,25 +330,6 @@
  	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
  	done
  
@@ -74,16 +71,17 @@ $NetBSD: patch-ab,v 1.4 1999/01/15 22:57:13 tron Exp $
  install-m4dataDATA: $(m4data_DATA)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-@@ -540,7 +516,7 @@
- 
+@@ -551,8 +527,7 @@
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
+ install-exec: install-exec-recursive
  
--install-data-am: install-configincludeDATA install-m4dataDATA install-includeHEADERS
+-install-data-am: install-configincludeDATA install-m4dataDATA \
+-		install-includeHEADERS
 +install-data-am: install-m4dataDATA install-includeHEADERS
+ install-data: install-data-recursive
  
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
- 
-@@ -618,7 +594,6 @@
+ install-am: all-am
+@@ -625,7 +600,6 @@
  maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
  distclean-noinstPROGRAMS clean-noinstPROGRAMS \
  maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
diff --git a/devel/glib/patches/patch-ac b/devel/glib/patches/patch-ac
index 19dcbcf41da..0cbddcffc30 100644
--- a/devel/glib/patches/patch-ac
+++ b/devel/glib/patches/patch-ac
@@ -1,14 +1,13 @@
-$NetBSD: patch-ac,v 1.2 1998/10/04 18:03:19 tron Exp $
+$NetBSD: patch-ac,v 1.3 1999/03/04 08:50:44 tron Exp $
 
---- gmodule/Makefile.in.orig	Tue Sep 22 05:27:51 1998
-+++ gmodule/Makefile.in	Sun Oct  4 19:47:31 1998
-@@ -101,8 +101,7 @@
+--- gmodule/Makefile.in.orig	Wed Feb 24 23:09:16 1999
++++ gmodule/Makefile.in	Tue Mar  2 23:52:09 1999
+@@ -103,7 +103,7 @@
+ lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
+ 
  libgmodule_la_SOURCES = gmodule.c
- libgmodule_la_LDFLAGS = \
- 	@G_MODULE_LDFLAGS@ \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
--	-release $(LT_RELEASE)
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-release $(LT_RELEASE)
+ 
  
  libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
- # we should really depend on $(libglib) for libgmodule.la, but libtool has a
diff --git a/devel/glib/patches/patch-ae b/devel/glib/patches/patch-ae
index 4158e653a1c..71d2e90a881 100644
--- a/devel/glib/patches/patch-ae
+++ b/devel/glib/patches/patch-ae
@@ -1,14 +1,13 @@
-$NetBSD: patch-ae,v 1.1 1998/12/18 23:52:22 tron Exp $
+$NetBSD: patch-ae,v 1.2 1999/03/04 08:50:44 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 @@
+--- gthread/Makefile.in.orig	Wed Feb 24 23:09:17 1999
++++ gthread/Makefile.in	Tue Mar  2 23:53:32 1999
+@@ -97,7 +97,7 @@
+ lib_LTLIBRARIES = libgthread.la
  
  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_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgthread_la_LDFLAGS =  	-release $(LT_RELEASE)
  
- libgthread_la_LIBADD = @G_THREAD_LIBS@
  
+ libgthread_la_LIBADD = @G_THREAD_LIBS@
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
index e9765c4dabc..44156d896c9 100644
--- a/devel/glib/pkg/PLIST
+++ b/devel/glib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1999/02/11 19:17:30 tv Exp $
+@comment $NetBSD: PLIST,v 1.8 1999/03/04 08:50:45 tron Exp $
 bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
@@ -8,13 +8,13 @@ info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so.12.0
+lib/libglib-1.2.so.0.0
 lib/libgmodule.a
 lib/libgmodule.la
-lib/libgmodule.so.12.0
+lib/libgmodule-1.2.so.0.0
 lib/libgthread.a
 lib/libgthread.la
-lib/libgthread.so.12.0
+lib/libgthread-1.2.so.0.0
 man/man1/glib-config.1
 share/aclocal/glib.m4
 @dirrm include/glib