Update "glib" package to version 1.2.6 included in GNOME 1.0.53 release.
This commit is contained in:
tron
parent
df05f07be8
commit
ed7208fe1a
8 changed files with 38 additions and 114 deletions
|
|
@ -1,15 +1,15 @@
|
|||
# $NetBSD: Makefile,v 1.19 1999/10/07 17:41:48 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.20 1999/10/22 23:34:22 tron Exp $
|
||||
# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
|
||||
#
|
||||
|
||||
DISTNAME= glib-1.2.4
|
||||
DISTNAME= glib-1.2.6
|
||||
CATEGORIES= devel
|
||||
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
|
||||
MAINTAINER= tron@netbsd.org
|
||||
HOMEPAGE= http://www.gtk.org/docs/glib_toc.html
|
||||
|
||||
CONFLICTS= gtk+-1.0.*
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
$NetBSD: md5,v 1.9 1999/08/28 09:34:46 rh Exp $
|
||||
$NetBSD: md5,v 1.10 1999/10/22 23:34:23 tron Exp $
|
||||
|
||||
MD5 (glib-1.2.4.tar.gz) = ff1061e3dc620ff0bff61adae7524ccc
|
||||
MD5 (glib-1.2.6.tar.gz) = 0a3af2085d6a597e43a3bfff9034ca68
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$NetBSD: patch-sum,v 1.3 1999/08/28 22:51:31 rh Exp $
|
||||
$NetBSD: patch-sum,v 1.4 1999/10/22 23:34:23 tron Exp $
|
||||
|
||||
MD5 (patch-aa) = f0f79c4b4966ceb121bd12f240e5aef6
|
||||
MD5 (patch-ab) = e26aa155f4ac1fc9c8f78de44e1dc7f1
|
||||
MD5 (patch-ac) = c072894b86c50791eefeef2f8920d497
|
||||
MD5 (patch-ad) = f7a6c4464f212e90ed71bb3bea32fe23
|
||||
MD5 (patch-ae) = c48c7445b6ad23423b7afcf4831414ec
|
||||
MD5 (patch-ab) = 9037429c991ff06f71a81e91c1e963f7
|
||||
MD5 (patch-ac) = cd3b59c2ee386ad8bd293b09adca1ba6
|
||||
MD5 (patch-ad) = 9aa610413ef097543e5e19ec626efe0e
|
||||
MD5 (patch-ae) = f4182beff6eedc691d74330a54dbb63b
|
||||
|
|
|
|||
|
|
@ -1,91 +1,13 @@
|
|||
$NetBSD: patch-ab,v 1.6 1999/03/05 09:44:20 tron Exp $
|
||||
$NetBSD: patch-ab,v 1.7 1999/10/22 23:34:23 tron Exp $
|
||||
|
||||
--- 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@ $(AM_INSTALL_PROGRAM_FLAGS)
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
|
||||
transform = @program_transform_name@
|
||||
--- Makefile.in.orig Thu Oct 7 19:35:19 1999
|
||||
+++ Makefile.in Wed Oct 20 19:55:00 1999
|
||||
@@ -123,7 +121,7 @@
|
||||
|
||||
NORMAL_INSTALL = :
|
||||
@@ -91,8 +91,6 @@
|
||||
CONFIGURE_DEPENDENCIES = acglib.m4
|
||||
|
||||
SUBDIRS = . gmodule gthread docs tests
|
||||
|
||||
-configincludedir = $(pkglibdir)/include
|
||||
-
|
||||
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
|
||||
|
||||
|
||||
-include_HEADERS = glib.h
|
||||
-
|
||||
-
|
||||
-configinclude_DATA = glibconfig.h
|
||||
+include_HEADERS = glib.h glibconfig.h
|
||||
|
||||
|
||||
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
|
||||
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
|
||||
+libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
|
||||
|
||||
noinst_PROGRAMS = testglib testgdate testgdateparser
|
||||
@@ -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)
|
||||
|
||||
@@ -335,25 +330,6 @@
|
||||
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
||||
done
|
||||
|
||||
-install-configincludeDATA: $(configinclude_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- $(mkinstalldirs) $(DESTDIR)$(configincludedir)
|
||||
- @list='$(configinclude_DATA)'; for p in $$list; do \
|
||||
- if test -f $(srcdir)/$$p; then \
|
||||
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
|
||||
- else if test -f $$p; then \
|
||||
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
|
||||
- $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
|
||||
- fi; fi; \
|
||||
- done
|
||||
-
|
||||
-uninstall-configincludeDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- list='$(configinclude_DATA)'; for p in $$list; do \
|
||||
- rm -f $(DESTDIR)$(configincludedir)/$$p; \
|
||||
- done
|
||||
-
|
||||
install-m4dataDATA: $(m4data_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(m4datadir)
|
||||
@@ -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-m4dataDATA install-includeHEADERS
|
||||
install-data: install-data-recursive
|
||||
|
||||
install-am: all-am
|
||||
@@ -625,7 +600,6 @@
|
||||
maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
|
||||
distclean-noinstPROGRAMS clean-noinstPROGRAMS \
|
||||
maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
|
||||
-uninstall-configincludeDATA install-configincludeDATA \
|
||||
uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
|
||||
install-includeHEADERS install-data-recursive uninstall-data-recursive \
|
||||
install-exec-recursive uninstall-exec-recursive installdirs-recursive \
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-ac,v 1.4 1999/03/05 09:44:20 tron Exp $
|
||||
$NetBSD: patch-ac,v 1.5 1999/10/22 23:34:23 tron Exp $
|
||||
|
||||
--- gmodule/Makefile.in.orig Wed Feb 24 23:09:16 1999
|
||||
+++ gmodule/Makefile.in Fri Mar 5 10:07:32 1999
|
||||
@@ -103,7 +103,7 @@
|
||||
--- gmodule/Makefile.in.orig Wed Oct 20 19:55:27 1999
|
||||
+++ gmodule/Makefile.in Wed Oct 20 19:55:59 1999
|
||||
@@ -109,7 +109,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)
|
||||
-libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
|
||||
+libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-ad,v 1.7 1999/08/28 22:51:32 rh Exp $
|
||||
$NetBSD: patch-ad,v 1.8 1999/10/22 23:34:23 tron Exp $
|
||||
|
||||
--- configure.orig Mon Aug 23 21:44:19 1999
|
||||
+++ configure Sun Aug 29 00:33:53 1999
|
||||
|
|
@ -6,10 +6,10 @@ $NetBSD: patch-ad,v 1.7 1999/08/28 22:51:32 rh Exp $
|
|||
#
|
||||
GLIB_MAJOR_VERSION=1
|
||||
GLIB_MINOR_VERSION=2
|
||||
-GLIB_MICRO_VERSION=4
|
||||
+GLIB_MICRO_VERSION=17
|
||||
GLIB_INTERFACE_AGE=4
|
||||
GLIB_BINARY_AGE=4
|
||||
-GLIB_MICRO_VERSION=6
|
||||
+GLIB_MICRO_VERSION=19
|
||||
GLIB_INTERFACE_AGE=6
|
||||
GLIB_BINARY_AGE=6
|
||||
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
|
||||
@@ -1537,9 +1537,12 @@
|
||||
# This can be used to rebuild libtool when needed
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-ae,v 1.3 1999/03/05 09:44:20 tron Exp $
|
||||
$NetBSD: patch-ae,v 1.4 1999/10/22 23:34:23 tron Exp $
|
||||
|
||||
--- 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 @@
|
||||
--- gthread/Makefile.in.orig Thu Oct 7 19:35:23 1999
|
||||
+++ gthread/Makefile.in Wed Oct 20 20:02:08 1999
|
||||
@@ -103,7 +103,7 @@
|
||||
lib_LTLIBRARIES = libgthread.la
|
||||
|
||||
libgthread_la_SOURCES = gthread.c
|
||||
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
|
||||
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic
|
||||
+libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,22 @@
|
|||
@comment $NetBSD: PLIST,v 1.13 1999/08/28 22:51:32 rh Exp $
|
||||
@comment $NetBSD: PLIST,v 1.14 1999/10/22 23:34:23 tron Exp $
|
||||
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 install-info %D/info/glib.info %D/info/dir
|
||||
lib/glib/include/glibconfig.h
|
||||
lib/libglib.a
|
||||
lib/libglib.la
|
||||
lib/libglib.so.13.4
|
||||
lib/libglib.so.13.6
|
||||
lib/libgmodule.a
|
||||
lib/libgmodule.la
|
||||
lib/libgmodule.so.13.4
|
||||
lib/libgmodule.so.13.6
|
||||
lib/libgthread.a
|
||||
lib/libgthread.la
|
||||
lib/libgthread.so.13.4
|
||||
lib/libgthread.so.13.6
|
||||
man/man1/glib-config.1
|
||||
share/aclocal/glib.m4
|
||||
@dirrm lib/glib/include
|
||||
@dirrm lib/glib
|
||||
@dirrm include/glib
|
||||
|
|
|
|||
Loading…
Reference in a new issue