aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/glib12/files/patch-ab67
-rw-r--r--devel/glib12/files/patch-ac10
-rw-r--r--devel/glib12/pkg-plist8
-rw-r--r--devel/glib13/files/patch-ab67
-rw-r--r--devel/glib13/pkg-plist8
-rw-r--r--devel/glib20/files/patch-ab67
-rw-r--r--devel/glib20/pkg-plist8
7 files changed, 208 insertions, 27 deletions
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index d3b1776cbf36..95db096dce85 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Aug 6 01:16:42 1998
-+++ Makefile.in Thu Aug 6 14:45:14 1998
-@@ -77,8 +77,6 @@
++++ Makefile.in Thu Aug 13 17:48:34 1998
+@@ -77,17 +77,15 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -9,7 +9,18 @@
bin_SCRIPTS=glib-config
EXTRA_DIST = \
-@@ -109,12 +107,10 @@
+ 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 @@
gutils.c
include_HEADERS = \
@@ -20,10 +31,36 @@
glibconfig.h
-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libglib_1_1_la_LDFLAGS = -version-info 0:2:0
++libglib11_la_LDFLAGS = -version-info 0:2:0
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 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -33,6 +70,28 @@
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 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-ac
index 21be1a24a57b..251456967597 100644
--- a/devel/glib12/files/patch-ac
+++ b/devel/glib12/files/patch-ac
@@ -1,6 +1,6 @@
--- glib-config.in.orig Thu Jun 11 07:21:14 1998
-+++ glib-config.in Thu Jul 30 12:44:12 1998
-@@ -42,7 +42,7 @@
++++ glib-config.in Thu Aug 13 17:46:26 1998
+@@ -42,10 +42,10 @@
if test @includedir@ != /usr/include ; then
includes=-I@includedir@
fi
@@ -8,4 +8,8 @@
+ echo $includes
;;
--libs)
- echo -L@libdir@ -lglib-@LT_RELEASE@
+- echo -L@libdir@ -lglib-@LT_RELEASE@
++ echo -L@libdir@ -lglib11
+ ;;
+ *)
+ echo "${usage}" 1>&2
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index b8a22916dac5..877971bf87f1 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,10 +1,10 @@
bin/glib-config
include/glib/glib.h
include/glib/glibconfig.h
-lib/libglib-1.1.a
-lib/libglib-1.1.la
-lib/libglib-1.1.so
-lib/libglib-1.1.so.0.2
+lib/libglib11.a
+lib/libglib11.la
+lib/libglib11.so
+lib/libglib11.so.0.2
@unexec /sbin/ldconfig -R
@exec /sbin/ldconfig -m %D/lib
share/aclocal/glib.m4
diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab
index d3b1776cbf36..95db096dce85 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Aug 6 01:16:42 1998
-+++ Makefile.in Thu Aug 6 14:45:14 1998
-@@ -77,8 +77,6 @@
++++ Makefile.in Thu Aug 13 17:48:34 1998
+@@ -77,17 +77,15 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -9,7 +9,18 @@
bin_SCRIPTS=glib-config
EXTRA_DIST = \
-@@ -109,12 +107,10 @@
+ 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 @@
gutils.c
include_HEADERS = \
@@ -20,10 +31,36 @@
glibconfig.h
-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libglib_1_1_la_LDFLAGS = -version-info 0:2:0
++libglib11_la_LDFLAGS = -version-info 0:2:0
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 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -33,6 +70,28 @@
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 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index b8a22916dac5..877971bf87f1 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -1,10 +1,10 @@
bin/glib-config
include/glib/glib.h
include/glib/glibconfig.h
-lib/libglib-1.1.a
-lib/libglib-1.1.la
-lib/libglib-1.1.so
-lib/libglib-1.1.so.0.2
+lib/libglib11.a
+lib/libglib11.la
+lib/libglib11.so
+lib/libglib11.so.0.2
@unexec /sbin/ldconfig -R
@exec /sbin/ldconfig -m %D/lib
share/aclocal/glib.m4
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index d3b1776cbf36..95db096dce85 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,6 +1,6 @@
--- Makefile.in.orig Thu Aug 6 01:16:42 1998
-+++ Makefile.in Thu Aug 6 14:45:14 1998
-@@ -77,8 +77,6 @@
++++ Makefile.in Thu Aug 13 17:48:34 1998
+@@ -77,17 +77,15 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -9,7 +9,18 @@
bin_SCRIPTS=glib-config
EXTRA_DIST = \
-@@ -109,12 +107,10 @@
+ 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 @@
gutils.c
include_HEADERS = \
@@ -20,10 +31,36 @@
glibconfig.h
-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libglib_1_1_la_LDFLAGS = -version-info 0:2:0
++libglib11_la_LDFLAGS = -version-info 0:2:0
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 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -33,6 +70,28 @@
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 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index b8a22916dac5..877971bf87f1 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,10 +1,10 @@
bin/glib-config
include/glib/glib.h
include/glib/glibconfig.h
-lib/libglib-1.1.a
-lib/libglib-1.1.la
-lib/libglib-1.1.so
-lib/libglib-1.1.so.0.2
+lib/libglib11.a
+lib/libglib11.la
+lib/libglib11.so
+lib/libglib11.so.0.2
@unexec /sbin/ldconfig -R
@exec /sbin/ldconfig -m %D/lib
share/aclocal/glib.m4
generated by cgit (git 2.34.1) at 2024-12-23 00:50:18 +0800