Update "glib" package to version 1.1.3.
This commit is contained in:
tron
parent
092596ed73
commit
b6d0452662
5 changed files with 47 additions and 113 deletions
|
|
@ -1,8 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.5 1998/08/25 11:49:53 agc Exp $
|
||||
# $NetBSD: Makefile,v 1.6 1998/10/04 18:03:18 tron Exp $
|
||||
# FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
|
||||
#
|
||||
|
||||
DISTNAME= glib-1.1.2
|
||||
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/ \
|
||||
|
|
@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
|
|||
MAINTAINER= packages@netbsd.org
|
||||
HOMEPAGE= http://www.gtk.org/docs/glib_toc.html
|
||||
|
||||
CONFLICTS= gtk+-1.0.4
|
||||
CONFLICTS= glib-1.1.2 gtk+-1.0.4
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LIBTOOL= yes
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
$NetBSD: md5,v 1.1.1.1 1998/08/19 09:29:25 agc Exp $
|
||||
$NetBSD: md5,v 1.2 1998/10/04 18:03:19 tron Exp $
|
||||
|
||||
MD5 (glib-1.1.2.tar.gz) = 077a3789b3305e89b493571e07700e2c
|
||||
MD5 (glib-1.1.3.tar.gz) = 1fbc57380af911ae651d9b739e41daa5
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
|
||||
$NetBSD: patch-ab,v 1.2 1998/10/04 18:03:19 tron Exp $
|
||||
|
||||
Various Makefile.in mods
|
||||
|
||||
--- Makefile.in.orig Wed Aug 5 18:16:42 1998
|
||||
+++ Makefile.in Wed Aug 19 11:08:31 1998
|
||||
--- Makefile.in.orig Tue Sep 22 05:27:49 1998
|
||||
+++ Makefile.in Sun Oct 4 19:58:07 1998
|
||||
@@ -48,7 +48,7 @@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -13,27 +11,16 @@ Various Makefile.in mods
|
|||
transform = @program_transform_name@
|
||||
|
||||
NORMAL_INSTALL = :
|
||||
@@ -77,17 +77,15 @@
|
||||
RANLIB = @RANLIB@
|
||||
VERSION = @VERSION@
|
||||
@@ -84,8 +84,6 @@
|
||||
|
||||
SUBDIRS = gmodule
|
||||
|
||||
-configincludedir = $(pkglibdir)/include
|
||||
-
|
||||
bin_SCRIPTS=glib-config
|
||||
BUILT_SOURCES=glib-config
|
||||
|
||||
EXTRA_DIST = \
|
||||
glib.m4 \
|
||||
glib.spec
|
||||
|
||||
-lib_LTLIBRARIES = libglib-1.1.la
|
||||
+lib_LTLIBRARIES = libglib11.la
|
||||
|
||||
-libglib_1_1_la_SOURCES = \
|
||||
+libglib11_la_SOURCES = \
|
||||
garray.c \
|
||||
gcache.c \
|
||||
gcompletion.c \
|
||||
@@ -109,17 +107,15 @@
|
||||
@@ -117,13 +115,11 @@
|
||||
gutils.c
|
||||
|
||||
include_HEADERS = \
|
||||
|
|
@ -43,38 +30,13 @@ Various Makefile.in mods
|
|||
+ glib.h \
|
||||
glibconfig.h
|
||||
|
||||
-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
||||
+libglib11_la_LDFLAGS = -version-info 0:2:0
|
||||
|
||||
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
|
||||
-testglib_LDADD = libglib-@LT_RELEASE@.la
|
||||
+testglib_LDADD = libglib11.la
|
||||
|
||||
m4datadir = $(datadir)/aclocal
|
||||
m4data_DATA = glib.m4
|
||||
@@ -134,8 +130,8 @@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
-libglib_1_1_la_LIBADD =
|
||||
-libglib_1_1_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 \
|
||||
gscanner.lo gutils.lo
|
||||
@@ -143,7 +139,7 @@
|
||||
|
||||
testglib_SOURCES = testglib.c
|
||||
testglib_OBJECTS = testglib.o
|
||||
-testglib_DEPENDENCIES = libglib-@LT_RELEASE@.la
|
||||
+testglib_DEPENDENCIES = libglib11.la
|
||||
testglib_LDFLAGS =
|
||||
SCRIPTS = $(bin_SCRIPTS)
|
||||
|
||||
@@ -151,7 +147,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 $@
|
||||
|
|
@ -83,29 +45,7 @@ Various Makefile.in mods
|
|||
|
||||
HEADERS = $(include_HEADERS)
|
||||
|
||||
@@ -165,8 +161,8 @@
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
-SOURCES = $(libglib_1_1_la_SOURCES) testglib.c
|
||||
-OBJECTS = $(libglib_1_1_la_OBJECTS) testglib.o
|
||||
+SOURCES = $(libglib11_la_SOURCES) testglib.c
|
||||
+OBJECTS = $(libglib11_la_OBJECTS) testglib.o
|
||||
|
||||
all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) glibconfig.h
|
||||
|
||||
@@ -273,8 +269,8 @@
|
||||
|
||||
maintainer-clean-libtool:
|
||||
|
||||
-libglib-1.1.la: $(libglib_1_1_la_OBJECTS) $(libglib_1_1_la_DEPENDENCIES)
|
||||
- $(LINK) -rpath $(libdir) $(libglib_1_1_la_LDFLAGS) $(libglib_1_1_la_OBJECTS) $(libglib_1_1_la_LIBADD) $(LIBS)
|
||||
+libglib11.la: $(libglib11_la_OBJECTS) $(libglib11_la_DEPENDENCIES)
|
||||
+ $(LINK) -rpath $(libdir) $(libglib11_la_LDFLAGS) $(libglib11_la_OBJECTS) $(libglib11_la_LIBADD) $(LIBS)
|
||||
|
||||
mostlyclean-noinstPROGRAMS:
|
||||
|
||||
@@ -308,25 +304,6 @@
|
||||
@@ -316,25 +312,6 @@
|
||||
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
||||
done
|
||||
|
||||
|
|
@ -131,27 +71,20 @@ Various Makefile.in mods
|
|||
install-m4dataDATA: $(m4data_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
$(mkinstalldirs) $(DESTDIR)$(m4datadir)
|
||||
@@ -457,13 +434,13 @@
|
||||
install-exec: install-libLTLIBRARIES install-binSCRIPTS
|
||||
@$(NORMAL_INSTALL)
|
||||
@@ -517,7 +494,7 @@
|
||||
|
||||
-install-data: install-configincludeDATA install-m4dataDATA install-includeHEADERS
|
||||
+install-data: install-m4dataDATA install-includeHEADERS
|
||||
@$(NORMAL_INSTALL)
|
||||
install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
|
||||
|
||||
install: install-exec install-data all
|
||||
@:
|
||||
-install-data-am: install-configincludeDATA install-m4dataDATA install-includeHEADERS
|
||||
+install-data-am: install-m4dataDATA install-includeHEADERS
|
||||
|
||||
-uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
|
||||
+uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-m4dataDATA uninstall-includeHEADERS
|
||||
uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
||||
@@ -519,7 +496,6 @@
|
||||
@@ -595,7 +572,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 tags mostlyclean-tags distclean-tags clean-tags \
|
||||
maintainer-clean-tags distdir info dvi installcheck install-exec \
|
||||
install-includeHEADERS install-data-recursive uninstall-data-recursive \
|
||||
install-exec-recursive uninstall-exec-recursive installdirs-recursive \
|
||||
|
|
|
|||
|
|
@ -1,17 +1,14 @@
|
|||
$NetBSD: patch-ac,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
|
||||
$NetBSD: patch-ac,v 1.2 1998/10/04 18:03:19 tron Exp $
|
||||
|
||||
--- glib-config.in.orig Thu Jun 11 07:21:14 1998
|
||||
+++ glib-config.in Thu Aug 13 17:46:26 1998
|
||||
@@ -42,10 +42,10 @@
|
||||
if test @includedir@ != /usr/include ; then
|
||||
includes=-I@includedir@
|
||||
fi
|
||||
- echo -I@libdir@/glib/include $includes
|
||||
+ echo $includes
|
||||
;;
|
||||
--libs)
|
||||
- echo -L@libdir@ -lglib-@LT_RELEASE@
|
||||
+ echo -L@libdir@ -lglib11
|
||||
;;
|
||||
*)
|
||||
echo "${usage}" 1>&2
|
||||
--- 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 @@
|
||||
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_LIBADD = @G_MODULE_LIBS@ # $(libglib)
|
||||
# we should really depend on $(libglib) for libgmodule.la, but libtool has a
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
@comment $NetBSD: PLIST,v 1.1.1.1 1998/08/19 09:29:26 agc Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 1998/10/04 18:03:20 tron Exp $
|
||||
bin/glib-config
|
||||
include/glib/glib.h
|
||||
include/glib/glibconfig.h
|
||||
lib/libglib11.a
|
||||
lib/libglib11.la
|
||||
lib/libglib11.so.0.2
|
||||
include/glib/gmodule.h
|
||||
lib/libglib.a
|
||||
lib/libglib.la
|
||||
lib/libglib.so.3.0
|
||||
lib/libgmodule.a
|
||||
lib/libgmodule.la
|
||||
lib/libgmodule.so.3.0
|
||||
share/aclocal/glib.m4
|
||||
@dirrm include/glib
|
||||
|
|
|
|||
Loading…
Reference in a new issue