summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/glib12/files/patch-ab71
-rw-r--r--devel/glib12/files/patch-ac12
-rw-r--r--devel/glib12/pkg-plist8
-rw-r--r--devel/glib13/files/patch-ab71
-rw-r--r--devel/glib13/pkg-plist8
-rw-r--r--devel/glib20/files/patch-ab71
-rw-r--r--devel/glib20/pkg-plist8
7 files changed, 28 insertions, 221 deletions
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index da95cb33a5a0..a50ccf36dc73 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,6 +1,6 @@
--- Makefile.in.orig Mon Jul 27 13:33:53 1998
-+++ Makefile.in Tue Jul 28 23:02:07 1998
-@@ -77,17 +77,15 @@
++++ Makefile.in Thu Jul 30 12:43:21 1998
+@@ -77,8 +77,6 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -9,18 +9,7 @@
bin_SCRIPTS=glib-config
EXTRA_DIST = \
- glib.m4 \
- glib.spec
-
--lib_LTLIBRARIES = libglib-1.1.la
-+lib_LTLIBRARIES = libglib.la
-
--libglib_1_1_la_SOURCES = \
-+libglib_la_SOURCES = \
- garray.c \
- gcache.c \
- gcompletion.c \
-@@ -108,17 +106,15 @@
+@@ -108,9 +106,7 @@
gutils.c
include_HEADERS = \
@@ -30,37 +19,7 @@
+ glib.h \
glibconfig.h
--libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libglib_la_LDFLAGS = -version-info 1:5:0
-
- INCLUDES = -I$(top_srcdir)
-
- noinst_PROGRAMS = testglib
--testglib_LDADD = libglib-@LT_RELEASE@.la
-+testglib_LDADD = libglib.la
-
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
-@@ -133,8 +129,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 \
-+libglib_la_LIBADD =
-+libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gprimes.lo gslist.lo \
- gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo \
- gutils.lo
-@@ -142,7 +138,7 @@
-
- testglib_SOURCES = testglib.c
- testglib_OBJECTS = testglib.o
--testglib_DEPENDENCIES = libglib-@LT_RELEASE@.la
-+testglib_DEPENDENCIES = libglib.la
- testglib_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
-
+ libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -150,7 +146,7 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -70,28 +29,6 @@
HEADERS = $(include_HEADERS)
-@@ -164,8 +160,8 @@
-
- TAR = tar
- GZIP = --best
--SOURCES = $(libglib_1_1_la_SOURCES) testglib.c
--OBJECTS = $(libglib_1_1_la_OBJECTS) testglib.o
-+SOURCES = $(libglib_la_SOURCES) testglib.c
-+OBJECTS = $(libglib_la_OBJECTS) testglib.o
-
- all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) glibconfig.h
-
-@@ -272,8 +268,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)
-+libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-
- mostlyclean-noinstPROGRAMS:
-
@@ -307,25 +303,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 35c3f1b53085..21be1a24a57b 100644
--- a/devel/glib12/files/patch-ac
+++ b/devel/glib12/files/patch-ac
@@ -1,6 +1,6 @@
---- glib-config.in.orig Tue Jul 28 23:37:04 1998
-+++ glib-config.in Tue Jul 28 23:39:18 1998
-@@ -42,10 +42,10 @@
+--- 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 @@
if test @includedir@ != /usr/include ; then
includes=-I@includedir@
fi
@@ -8,8 +8,4 @@
+ echo $includes
;;
--libs)
-- echo -L@libdir@ -lglib-@LT_RELEASE@
-+ echo -L@libdir@ -lglib
- ;;
- *)
- echo "${usage}" 1>&2
+ echo -L@libdir@ -lglib-@LT_RELEASE@
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index 65de9d66b061..0f0106903b02 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,10 +1,10 @@
bin/glib-config
include/glib.h
include/glibconfig.h
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so
-lib/libglib.so.1.5
+lib/libglib-1.1.a
+lib/libglib-1.1.la
+lib/libglib-1.1.so
+lib/libglib-1.1.so.0.0
@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 da95cb33a5a0..a50ccf36dc73 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -1,6 +1,6 @@
--- Makefile.in.orig Mon Jul 27 13:33:53 1998
-+++ Makefile.in Tue Jul 28 23:02:07 1998
-@@ -77,17 +77,15 @@
++++ Makefile.in Thu Jul 30 12:43:21 1998
+@@ -77,8 +77,6 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -9,18 +9,7 @@
bin_SCRIPTS=glib-config
EXTRA_DIST = \
- glib.m4 \
- glib.spec
-
--lib_LTLIBRARIES = libglib-1.1.la
-+lib_LTLIBRARIES = libglib.la
-
--libglib_1_1_la_SOURCES = \
-+libglib_la_SOURCES = \
- garray.c \
- gcache.c \
- gcompletion.c \
-@@ -108,17 +106,15 @@
+@@ -108,9 +106,7 @@
gutils.c
include_HEADERS = \
@@ -30,37 +19,7 @@
+ glib.h \
glibconfig.h
--libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libglib_la_LDFLAGS = -version-info 1:5:0
-
- INCLUDES = -I$(top_srcdir)
-
- noinst_PROGRAMS = testglib
--testglib_LDADD = libglib-@LT_RELEASE@.la
-+testglib_LDADD = libglib.la
-
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
-@@ -133,8 +129,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 \
-+libglib_la_LIBADD =
-+libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gprimes.lo gslist.lo \
- gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo \
- gutils.lo
-@@ -142,7 +138,7 @@
-
- testglib_SOURCES = testglib.c
- testglib_OBJECTS = testglib.o
--testglib_DEPENDENCIES = libglib-@LT_RELEASE@.la
-+testglib_DEPENDENCIES = libglib.la
- testglib_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
-
+ libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -150,7 +146,7 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -70,28 +29,6 @@
HEADERS = $(include_HEADERS)
-@@ -164,8 +160,8 @@
-
- TAR = tar
- GZIP = --best
--SOURCES = $(libglib_1_1_la_SOURCES) testglib.c
--OBJECTS = $(libglib_1_1_la_OBJECTS) testglib.o
-+SOURCES = $(libglib_la_SOURCES) testglib.c
-+OBJECTS = $(libglib_la_OBJECTS) testglib.o
-
- all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) glibconfig.h
-
-@@ -272,8 +268,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)
-+libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-
- mostlyclean-noinstPROGRAMS:
-
@@ -307,25 +303,6 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index 65de9d66b061..0f0106903b02 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -1,10 +1,10 @@
bin/glib-config
include/glib.h
include/glibconfig.h
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so
-lib/libglib.so.1.5
+lib/libglib-1.1.a
+lib/libglib-1.1.la
+lib/libglib-1.1.so
+lib/libglib-1.1.so.0.0
@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 da95cb33a5a0..a50ccf36dc73 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,6 +1,6 @@
--- Makefile.in.orig Mon Jul 27 13:33:53 1998
-+++ Makefile.in Tue Jul 28 23:02:07 1998
-@@ -77,17 +77,15 @@
++++ Makefile.in Thu Jul 30 12:43:21 1998
+@@ -77,8 +77,6 @@
RANLIB = @RANLIB@
VERSION = @VERSION@
@@ -9,18 +9,7 @@
bin_SCRIPTS=glib-config
EXTRA_DIST = \
- glib.m4 \
- glib.spec
-
--lib_LTLIBRARIES = libglib-1.1.la
-+lib_LTLIBRARIES = libglib.la
-
--libglib_1_1_la_SOURCES = \
-+libglib_la_SOURCES = \
- garray.c \
- gcache.c \
- gcompletion.c \
-@@ -108,17 +106,15 @@
+@@ -108,9 +106,7 @@
gutils.c
include_HEADERS = \
@@ -30,37 +19,7 @@
+ glib.h \
glibconfig.h
--libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libglib_la_LDFLAGS = -version-info 1:5:0
-
- INCLUDES = -I$(top_srcdir)
-
- noinst_PROGRAMS = testglib
--testglib_LDADD = libglib-@LT_RELEASE@.la
-+testglib_LDADD = libglib.la
-
- m4datadir = $(datadir)/aclocal
- m4data_DATA = glib.m4
-@@ -133,8 +129,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 \
-+libglib_la_LIBADD =
-+libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gprimes.lo gslist.lo \
- gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo gscanner.lo \
- gutils.lo
-@@ -142,7 +138,7 @@
-
- testglib_SOURCES = testglib.c
- testglib_OBJECTS = testglib.o
--testglib_DEPENDENCIES = libglib-@LT_RELEASE@.la
-+testglib_DEPENDENCIES = libglib.la
- testglib_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
-
+ libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -150,7 +146,7 @@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -70,28 +29,6 @@
HEADERS = $(include_HEADERS)
-@@ -164,8 +160,8 @@
-
- TAR = tar
- GZIP = --best
--SOURCES = $(libglib_1_1_la_SOURCES) testglib.c
--OBJECTS = $(libglib_1_1_la_OBJECTS) testglib.o
-+SOURCES = $(libglib_la_SOURCES) testglib.c
-+OBJECTS = $(libglib_la_OBJECTS) testglib.o
-
- all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) glibconfig.h
-
-@@ -272,8 +268,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)
-+libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-
- mostlyclean-noinstPROGRAMS:
-
@@ -307,25 +303,6 @@
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
done
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 65de9d66b061..0f0106903b02 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,10 +1,10 @@
bin/glib-config
include/glib.h
include/glibconfig.h
-lib/libglib.a
-lib/libglib.la
-lib/libglib.so
-lib/libglib.so.1.5
+lib/libglib-1.1.a
+lib/libglib-1.1.la
+lib/libglib-1.1.so
+lib/libglib-1.1.so.0.0
@unexec /sbin/ldconfig -R
@exec /sbin/ldconfig -m %D/lib
share/aclocal/glib.m4