aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>1999-03-09 01:13:40 +0000
committerJacques Vidrine <nectar@FreeBSD.org>1999-03-09 01:13:40 +0000
commitf4442a7aa7d134c8de8574845b26edddcac65935 (patch)
tree0f55c576fb88ce09083373c32ab8312529d29dc5 /devel
parentf642b1eef53afa46d333b0f0cb5bf670d5bd8df1 (diff)
downloadports-f4442a7aa7d134c8de8574845b26edddcac65935.tar.gz
ports-f4442a7aa7d134c8de8574845b26edddcac65935.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile3
-rw-r--r--devel/ORBit/Makefile10
-rw-r--r--devel/ORBit/distinfo2
-rw-r--r--devel/ORBit/files/patch-ac48
-rw-r--r--devel/ORBit/files/patch-ad8
-rw-r--r--devel/ORBit/files/patch-ae13
-rw-r--r--devel/ORBit/pkg-plist3
-rw-r--r--devel/ORBit2/Makefile10
-rw-r--r--devel/ORBit2/distinfo2
-rw-r--r--devel/ORBit2/files/patch-ac48
-rw-r--r--devel/ORBit2/files/patch-ad8
-rw-r--r--devel/ORBit2/files/patch-ae13
-rw-r--r--devel/ORBit2/pkg-plist3
-rw-r--r--devel/gettext-devel/Makefile9
-rw-r--r--devel/gettext-devel/files/patch-ae13
-rw-r--r--devel/gettext-devel/files/patch-ah11
-rw-r--r--devel/gettext-devel/pkg-plist33
-rw-r--r--devel/gettext-old/Makefile9
-rw-r--r--devel/gettext-old/files/patch-ae13
-rw-r--r--devel/gettext-old/files/patch-ah11
-rw-r--r--devel/gettext-old/pkg-plist33
-rw-r--r--devel/gettext/Makefile9
-rw-r--r--devel/gettext/files/patch-ae13
-rw-r--r--devel/gettext/files/patch-ah11
-rw-r--r--devel/gettext/pkg-plist33
-rw-r--r--devel/glib12/Makefile18
-rw-r--r--devel/glib12/distinfo2
-rw-r--r--devel/glib12/files/patch-ab345
-rw-r--r--devel/glib12/files/patch-ac8
-rw-r--r--devel/glib12/files/patch-ad20
-rw-r--r--devel/glib12/files/patch-ae213
-rw-r--r--devel/glib12/pkg-descr5
-rw-r--r--devel/glib12/pkg-plist34
-rw-r--r--devel/glib13/Makefile18
-rw-r--r--devel/glib13/distinfo2
-rw-r--r--devel/glib13/files/patch-ab345
-rw-r--r--devel/glib13/files/patch-ae213
-rw-r--r--devel/glib13/pkg-descr5
-rw-r--r--devel/glib13/pkg-plist34
-rw-r--r--devel/glib20/Makefile18
-rw-r--r--devel/glib20/distinfo2
-rw-r--r--devel/glib20/files/patch-ab345
-rw-r--r--devel/glib20/files/patch-ae213
-rw-r--r--devel/glib20/pkg-descr5
-rw-r--r--devel/glib20/pkg-plist34
-rw-r--r--devel/libgtop/Makefile15
-rw-r--r--devel/libgtop/distinfo2
-rw-r--r--devel/libgtop/files/patch-ab101
-rw-r--r--devel/libgtop/files/patch-ac45
-rw-r--r--devel/libgtop2/Makefile15
-rw-r--r--devel/libgtop2/distinfo2
-rw-r--r--devel/libgtop2/files/patch-ab101
-rw-r--r--devel/libgtop2/files/patch-ac45
53 files changed, 997 insertions, 1577 deletions
diff --git a/devel/Makefile b/devel/Makefile
index fa621058898f..cdac0fe44b13 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.158 1999/02/10 15:56:10 billf Exp $
+# $Id: Makefile,v 1.159 1999/03/02 01:54:57 steve Exp $
#
SUBDIR += ElectricFence
@@ -44,6 +44,7 @@
SUBDIR += glade
SUBDIR += glib11
SUBDIR += glib11-devel
+ SUBDIR += glib12
SUBDIR += gmake
SUBDIR += id-utils
SUBDIR += ilu
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index d7371d88bfa6..7317e7015572 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -1,24 +1,24 @@
# New ports collection makefile for: orbit
-# Version required: 0.3.98
+# Version required: 0.4.0
# Date Created: 16 Aug 1998
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
-# $Id: Makefile,v 1.13 1999/01/31 16:57:13 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $
#
-DISTNAME= ORBit-0.3.98
+DISTNAME= ORBit-0.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= ORBit
MAINTAINER= clkao@CirX.ORG
-LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel
+LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
CONFIGURE_ARGS= --disable-indent
pre-install:
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index 70fa965d9807..cc28ec485663 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
+MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index 97e231005bab..a4ebc3344f61 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -42,41 +42,41 @@
INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@
---- libIDL/Makefile.in.orig Mon Feb 15 12:59:56 1999
-+++ libIDL/Makefile.in Thu Feb 18 22:55:15 1999
-@@ -50,7 +50,7 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
-
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_PROGRAM@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -76,7 +76,7 @@
- LEX = @LEX@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+--- libIDL/Makefile.in.orig Thu Feb 25 17:17:07 1999
++++ libIDL/Makefile.in Mon Mar 1 18:54:57 1999
+@@ -89,7 +89,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
-@@ -101,7 +101,7 @@
+@@ -120,7 +120,7 @@
libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h
--libIDL_la_LDFLAGS = -version-info 5:9:5
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libIDL_la_LDFLAGS = -version-info 1:0:0
- tstidl_SOURCES = tstidl.c
+
+ m4datadir = $(datadir)/aclocal
+@@ -130,7 +130,7 @@
tstidl_LDFLAGS = -static
-@@ -478,7 +478,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-info \
- uninstall-pkgincludeHEADERS
+ tstidl_LDADD = libIDL.la
+
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = libIDLConf.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -580,7 +580,7 @@
+ uninstall-info uninstall-confexecDATA \
+ uninstall-m4dataDATA uninstall-pkgincludeHEADERS
uninstall: uninstall-am
--all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS)
+-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
+ $(DATA) $(HEADERS)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/devel/ORBit/files/patch-ad b/devel/ORBit/files/patch-ad
index 44689977d4f7..bc0a5f58b9c9 100644
--- a/devel/ORBit/files/patch-ad
+++ b/devel/ORBit/files/patch-ad
@@ -6,8 +6,8 @@
- client (calls glib-config)
- server (calls glib-config)
-+ client (calls glib11d-config)
-+ server (calls glib11d-config)
++ client (calls glib12-config)
++ server (calls glib12-config)
EOF
exit $1
@@ -17,8 +17,8 @@
client|server)
- the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
- the_flags="$the_flags `glib-config --cflags` -I@includedir@"
-+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib11d-config --libs` @LIBS@ -lm"
-+ the_flags="$the_flags `glib11d-config --cflags` -I@includedir@"
++ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm"
++ the_flags="$the_flags `glib12-config --cflags` -I@includedir@"
;;
--use-service=*)
diff --git a/devel/ORBit/files/patch-ae b/devel/ORBit/files/patch-ae
new file mode 100644
index 000000000000..1468b8fed6bd
--- /dev/null
+++ b/devel/ORBit/files/patch-ae
@@ -0,0 +1,13 @@
+--- configure.orig Fri Feb 19 00:50:06 1999
++++ configure Fri Feb 19 00:50:21 1999
+@@ -5288,10 +5288,6 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index 453ddbaa26dc..f1424dd5e314 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -1,3 +1,4 @@
+bin/libIDL-config
bin/name-client
bin/old-name-server
bin/orbit-config
@@ -5,6 +6,7 @@ bin/orbit-event-server
bin/orbit-idl
bin/orbit-ird
bin/orbit-name-server
+etc/libIDLConf.sh
include/IIOP/IIOP-config.h
include/IIOP/IIOP-types.h
include/IIOP/IIOP.h
@@ -90,6 +92,7 @@ lib/libORBitutil.so.1
lib/libname-server.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libIDL.m4
@dirrm include/IIOP
@dirrm include/ORBitservices
@dirrm include/ORBitutil
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index d7371d88bfa6..7317e7015572 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -1,24 +1,24 @@
# New ports collection makefile for: orbit
-# Version required: 0.3.98
+# Version required: 0.4.0
# Date Created: 16 Aug 1998
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
-# $Id: Makefile,v 1.13 1999/01/31 16:57:13 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $
#
-DISTNAME= ORBit-0.3.98
+DISTNAME= ORBit-0.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= ORBit
MAINTAINER= clkao@CirX.ORG
-LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel
+LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
CONFIGURE_ARGS= --disable-indent
pre-install:
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 70fa965d9807..cc28ec485663 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
+MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac
index 97e231005bab..a4ebc3344f61 100644
--- a/devel/ORBit2/files/patch-ac
+++ b/devel/ORBit2/files/patch-ac
@@ -42,41 +42,41 @@
INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@
---- libIDL/Makefile.in.orig Mon Feb 15 12:59:56 1999
-+++ libIDL/Makefile.in Thu Feb 18 22:55:15 1999
-@@ -50,7 +50,7 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
-
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_PROGRAM@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -76,7 +76,7 @@
- LEX = @LEX@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+--- libIDL/Makefile.in.orig Thu Feb 25 17:17:07 1999
++++ libIDL/Makefile.in Mon Mar 1 18:54:57 1999
+@@ -89,7 +89,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
-@@ -101,7 +101,7 @@
+@@ -120,7 +120,7 @@
libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h
--libIDL_la_LDFLAGS = -version-info 5:9:5
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libIDL_la_LDFLAGS = -version-info 1:0:0
- tstidl_SOURCES = tstidl.c
+
+ m4datadir = $(datadir)/aclocal
+@@ -130,7 +130,7 @@
tstidl_LDFLAGS = -static
-@@ -478,7 +478,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-info \
- uninstall-pkgincludeHEADERS
+ tstidl_LDADD = libIDL.la
+
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = libIDLConf.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -580,7 +580,7 @@
+ uninstall-info uninstall-confexecDATA \
+ uninstall-m4dataDATA uninstall-pkgincludeHEADERS
uninstall: uninstall-am
--all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS)
+-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
+ $(DATA) $(HEADERS)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/devel/ORBit2/files/patch-ad b/devel/ORBit2/files/patch-ad
index 44689977d4f7..bc0a5f58b9c9 100644
--- a/devel/ORBit2/files/patch-ad
+++ b/devel/ORBit2/files/patch-ad
@@ -6,8 +6,8 @@
- client (calls glib-config)
- server (calls glib-config)
-+ client (calls glib11d-config)
-+ server (calls glib11d-config)
++ client (calls glib12-config)
++ server (calls glib12-config)
EOF
exit $1
@@ -17,8 +17,8 @@
client|server)
- the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
- the_flags="$the_flags `glib-config --cflags` -I@includedir@"
-+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib11d-config --libs` @LIBS@ -lm"
-+ the_flags="$the_flags `glib11d-config --cflags` -I@includedir@"
++ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm"
++ the_flags="$the_flags `glib12-config --cflags` -I@includedir@"
;;
--use-service=*)
diff --git a/devel/ORBit2/files/patch-ae b/devel/ORBit2/files/patch-ae
new file mode 100644
index 000000000000..1468b8fed6bd
--- /dev/null
+++ b/devel/ORBit2/files/patch-ae
@@ -0,0 +1,13 @@
+--- configure.orig Fri Feb 19 00:50:06 1999
++++ configure Fri Feb 19 00:50:21 1999
+@@ -5288,10 +5288,6 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index 453ddbaa26dc..f1424dd5e314 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -1,3 +1,4 @@
+bin/libIDL-config
bin/name-client
bin/old-name-server
bin/orbit-config
@@ -5,6 +6,7 @@ bin/orbit-event-server
bin/orbit-idl
bin/orbit-ird
bin/orbit-name-server
+etc/libIDLConf.sh
include/IIOP/IIOP-config.h
include/IIOP/IIOP-types.h
include/IIOP/IIOP.h
@@ -90,6 +92,7 @@ lib/libORBitutil.so.1
lib/libname-server.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libIDL.m4
@dirrm include/IIOP
@dirrm include/ORBitservices
@dirrm include/ORBitutil
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 05c902bd6683..2631f2db3c05 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -3,17 +3,19 @@
# Date created: 16 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $
#
DISTNAME= gettext-0.10.35
CATEGORIES= devel
-MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/
+MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \
+ ftp://alpha.gnu.org/pub/gnu
MAINTAINER= nacai@iname.com
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gnu-gettext
+
+PLIST_SUB= X11BASE=${X11BASE}
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
@@ -25,5 +27,6 @@ post-install:
@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
${PREFIX}/share/gettext/po-mode.el
+ ${MKDIR} ${X11BASE}/share/locale
.include <bsd.port.mk>
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
index 29dad1ad6f74..73bde596d6c4 100644
--- a/devel/gettext-devel/files/patch-ae
+++ b/devel/gettext-devel/files/patch-ae
@@ -1,5 +1,14 @@
---- configure.orig Fri May 1 13:48:25 1998
-+++ configure Thu Dec 3 20:11:52 1998
+--- configure.orig Fri May 1 07:48:25 1998
++++ configure Wed Feb 17 02:05:55 1999
+@@ -3958,7 +3958,7 @@
+ fi
+
+
+- l=
++ l=l
+
+
+ test -d po || mkdir po
@@ -4004,7 +4004,7 @@
;;
esac
diff --git a/devel/gettext-devel/files/patch-ah b/devel/gettext-devel/files/patch-ah
new file mode 100644
index 000000000000..a45dc903c3b9
--- /dev/null
+++ b/devel/gettext-devel/files/patch-ah
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999
++++ intl/Makefile.in Wed Feb 17 02:30:13 1999
+@@ -119,7 +119,7 @@
+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ fi; \
+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ else \
+ : ; \
+ fi
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
index 4899dd242253..6d3c89b44981 100644
--- a/devel/gettext-devel/pkg-plist
+++ b/devel/gettext-devel/pkg-plist
@@ -12,6 +12,11 @@ info/gettext.info
@exec install-info %D/info/gettext.info %D/info/dir
include/libintl.h
lib/libintl.a
+lib/libintl.la
+lib/libintl.so
+lib/libintl.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/aclocal/gettext.m4
share/aclocal/lcmessage.m4
share/aclocal/progtest.m4
@@ -57,28 +62,6 @@ share/locale/locale.alias
@dirrm share/gettext/intl
@dirrm share/gettext/po
@dirrm share/gettext
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale
+@unexec rm -r %D/share/locale
+@exec mkdir -p %%X11BASE%%/share/locale
+@unexec rm -r %%X11BASE%%/share/locale
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index 05c902bd6683..2631f2db3c05 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -3,17 +3,19 @@
# Date created: 16 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $
#
DISTNAME= gettext-0.10.35
CATEGORIES= devel
-MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/
+MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \
+ ftp://alpha.gnu.org/pub/gnu
MAINTAINER= nacai@iname.com
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gnu-gettext
+
+PLIST_SUB= X11BASE=${X11BASE}
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
@@ -25,5 +27,6 @@ post-install:
@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
${PREFIX}/share/gettext/po-mode.el
+ ${MKDIR} ${X11BASE}/share/locale
.include <bsd.port.mk>
diff --git a/devel/gettext-old/files/patch-ae b/devel/gettext-old/files/patch-ae
index 29dad1ad6f74..73bde596d6c4 100644
--- a/devel/gettext-old/files/patch-ae
+++ b/devel/gettext-old/files/patch-ae
@@ -1,5 +1,14 @@
---- configure.orig Fri May 1 13:48:25 1998
-+++ configure Thu Dec 3 20:11:52 1998
+--- configure.orig Fri May 1 07:48:25 1998
++++ configure Wed Feb 17 02:05:55 1999
+@@ -3958,7 +3958,7 @@
+ fi
+
+
+- l=
++ l=l
+
+
+ test -d po || mkdir po
@@ -4004,7 +4004,7 @@
;;
esac
diff --git a/devel/gettext-old/files/patch-ah b/devel/gettext-old/files/patch-ah
new file mode 100644
index 000000000000..a45dc903c3b9
--- /dev/null
+++ b/devel/gettext-old/files/patch-ah
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999
++++ intl/Makefile.in Wed Feb 17 02:30:13 1999
+@@ -119,7 +119,7 @@
+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ fi; \
+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ else \
+ : ; \
+ fi
diff --git a/devel/gettext-old/pkg-plist b/devel/gettext-old/pkg-plist
index 4899dd242253..6d3c89b44981 100644
--- a/devel/gettext-old/pkg-plist
+++ b/devel/gettext-old/pkg-plist
@@ -12,6 +12,11 @@ info/gettext.info
@exec install-info %D/info/gettext.info %D/info/dir
include/libintl.h
lib/libintl.a
+lib/libintl.la
+lib/libintl.so
+lib/libintl.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/aclocal/gettext.m4
share/aclocal/lcmessage.m4
share/aclocal/progtest.m4
@@ -57,28 +62,6 @@ share/locale/locale.alias
@dirrm share/gettext/intl
@dirrm share/gettext/po
@dirrm share/gettext
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale
+@unexec rm -r %D/share/locale
+@exec mkdir -p %%X11BASE%%/share/locale
+@unexec rm -r %%X11BASE%%/share/locale
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 05c902bd6683..2631f2db3c05 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -3,17 +3,19 @@
# Date created: 16 March 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
-# $Id: Makefile,v 1.6 1999/01/12 16:50:26 vanilla Exp $
+# $Id: Makefile,v 1.7 1999/03/08 07:28:22 asami Exp $
#
DISTNAME= gettext-0.10.35
CATEGORIES= devel
-MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/
+MASTER_SITES= ftp://alpha.gnu.ai.mit.edu/gnu/ \
+ ftp://alpha.gnu.org/pub/gnu
MAINTAINER= nacai@iname.com
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-gnu-gettext
+
+PLIST_SUB= X11BASE=${X11BASE}
pre-configure:
${RM} ${WRKSRC}/doc/gettext.info*
@@ -25,5 +27,6 @@ post-install:
@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
${PREFIX}/share/gettext/po-mode.el
+ ${MKDIR} ${X11BASE}/share/locale
.include <bsd.port.mk>
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index 29dad1ad6f74..73bde596d6c4 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,5 +1,14 @@
---- configure.orig Fri May 1 13:48:25 1998
-+++ configure Thu Dec 3 20:11:52 1998
+--- configure.orig Fri May 1 07:48:25 1998
++++ configure Wed Feb 17 02:05:55 1999
+@@ -3958,7 +3958,7 @@
+ fi
+
+
+- l=
++ l=l
+
+
+ test -d po || mkdir po
@@ -4004,7 +4004,7 @@
;;
esac
diff --git a/devel/gettext/files/patch-ah b/devel/gettext/files/patch-ah
new file mode 100644
index 000000000000..a45dc903c3b9
--- /dev/null
+++ b/devel/gettext/files/patch-ah
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999
++++ intl/Makefile.in Wed Feb 17 02:30:13 1999
+@@ -119,7 +119,7 @@
+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ fi; \
+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
++ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+ else \
+ : ; \
+ fi
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 4899dd242253..6d3c89b44981 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -12,6 +12,11 @@ info/gettext.info
@exec install-info %D/info/gettext.info %D/info/dir
include/libintl.h
lib/libintl.a
+lib/libintl.la
+lib/libintl.so
+lib/libintl.so.1
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
share/aclocal/gettext.m4
share/aclocal/lcmessage.m4
share/aclocal/progtest.m4
@@ -57,28 +62,6 @@ share/locale/locale.alias
@dirrm share/gettext/intl
@dirrm share/gettext/po
@dirrm share/gettext
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale
+@unexec rm -r %D/share/locale
+@exec mkdir -p %%X11BASE%%/share/locale
+@unexec rm -r %%X11BASE%%/share/locale
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 7343c701a67b..7992787f2356 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,24 +1,24 @@
-# New ports collection makefile for: glib11-devel
-# Version required: 1.1.16
+# New ports collection makefile for: glib12
+# Version required: 1.2.0
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $
+# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
#
-DISTNAME= glib-1.1.16
+DISTNAME= glib-1.2.0
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
- ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
- http://www.ameth.org/gimp/gtk/v1.1/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+ http://www.ameth.org/gimp/gtk/v1.2/
MAINTAINER= vanilla@FreeBSD.ORG
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib11d
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-MAN1= glib-config.1
+MAN1= glib12-config.1
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index 84c47db10e06..3339035c5518 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
+MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index df40e4bbf003..0ae004d00c11 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -11,113 +11,91 @@
+configincludedir = $(includedir)
-bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib11d-config
++bin_SCRIPTS = glib12-config
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-@@ -102,9 +102,9 @@
- EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
+@@ -102,7 +102,7 @@
+ EXTRA_DIST = glib.m4 glib.spec.in acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
-lib_LTLIBRARIES = libglib.la
-+lib_LTLIBRARIES = libglib11d.la
++lib_LTLIBRARIES = libglib12.la
--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
-+libglib11d_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
+ 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
@@ -113,20 +113,20 @@
configinclude_DATA = glibconfig.h
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libglib11d_la_LDFLAGS = -version-info 2:1:0
++libglib_la_LDFLAGS = -version-info 1:0:0
noinst_PROGRAMS = testglib testgdate testgdateparser
-testglib_LDADD = libglib.la
-testgdate_LDADD = libglib.la
-testgdateparser_LDADD = libglib.la
-+testglib_LDADD = libglib11d.la
-+testgdate_LDADD = libglib11d.la
-+testgdateparser_LDADD = libglib11d.la
++testglib_LDADD = libglib12.la
++testgdate_LDADD = libglib12.la
++testgdateparser_LDADD = libglib12.la
m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib-config
-+CONFIG_CLEAN_FILES = glib11d-config
+-CONFIG_CLEAN_FILES = glib.spec glib-config
++CONFIG_CLEAN_FILES = glib12-config
LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -134,8 +134,8 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libglib_la_LIBADD =
--libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
-+libglib11d_la_LIBADD =
-+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
- gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
- gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
@@ -144,15 +144,15 @@
testglib_SOURCES = testglib.c
testglib_OBJECTS = testglib.o
-testglib_DEPENDENCIES = libglib.la
-+testglib_DEPENDENCIES = libglib11d.la
++testglib_DEPENDENCIES = libglib12.la
testglib_LDFLAGS =
testgdate_SOURCES = testgdate.c
testgdate_OBJECTS = testgdate.o
-testgdate_DEPENDENCIES = libglib.la
-+testgdate_DEPENDENCIES = libglib11d.la
++testgdate_DEPENDENCIES = libglib12.la
testgdate_LDFLAGS =
testgdateparser_SOURCES = testgdateparser.c
testgdateparser_OBJECTS = testgdateparser.o
-testgdateparser_DEPENDENCIES = libglib.la
-+testgdateparser_DEPENDENCIES = libglib11d.la
++testgdateparser_DEPENDENCIES = libglib12.la
testgdateparser_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
-@@ -175,8 +175,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
--OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c
-+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -223,7 +223,10 @@
- -rm -f config.h
-
+@@ -226,7 +226,7 @@
maintainer-clean-hdr:
+ glib.spec: $(top_builddir)/config.status glib.spec.in
+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-glib-config: $(top_builddir)/config.status glib-config.in
-+glib11d-config.in: glib-config.in
-+ cp glib-config.in glib11d-config.in
-+
-+glib11d-config: $(top_builddir)/config.status glib11d-config.in
++glib12-config: $(top_builddir)/config.status glib12-config.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-libLTLIBRARIES:
-@@ -289,8 +292,8 @@
+@@ -292,7 +292,7 @@
maintainer-clean-libtool:
-libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS)
++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
+@@ -535,7 +535,6 @@
+ || exit 1; \
+ fi; \
+ done
+- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-@@ -558,7 +561,7 @@
+ info-am:
+ info: info-recursive
+@@ -562,7 +561,7 @@
uninstall-configincludeDATA uninstall-m4dataDATA \
uninstall-includeHEADERS
uninstall: uninstall-recursive
@@ -126,114 +104,69 @@
$(HEADERS) config.h
all-redirect: all-recursive-am
install-strip:
+@@ -640,7 +639,8 @@
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+-glib-config: glib-config.in
++glib12-config.in: glib-config.in
++ cp glib-config.in glib12-config.in
+
+ configure: configure.in acglib.m4
+ glibconfig.h: stamp-gc-h
--- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999
+++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999
-@@ -98,29 +98,29 @@
+@@ -98,12 +98,12 @@
include_HEADERS = gmodule.h
-libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
-lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la
++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
--libgmodule_la_SOURCES = gmodule.c
+ libgmodule_la_SOURCES = gmodule.c
-libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgmodule11d_la_SOURCES = gmodule.c
-+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0
-
-
--libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
- # we should really depend on $(libglib) for libgmodule.la, but libtool has a
- # problem with this ;(
-
--libgplugin_a_la_SOURCES = libgplugin_a.c
--libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
--
--libgplugin_b_la_SOURCES = libgplugin_b.c
--libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgplugin11d_a_la_SOURCES = libgplugin_a.c
-+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+
-+libgplugin11d_b_la_SOURCES = libgplugin_b.c
-+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0:0
+
+
+ libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+@@ -120,7 +120,7 @@
noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
-+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@
++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = gmoduleconf.h
-@@ -131,22 +131,22 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgmodule_la_DEPENDENCIES =
--libgmodule_la_OBJECTS = gmodule.lo
--libgplugin_a_la_DEPENDENCIES =
--libgplugin_a_la_OBJECTS = libgplugin_a.lo
--libgplugin_b_la_DEPENDENCIES =
--libgplugin_b_la_OBJECTS = libgplugin_b.lo
-+libgmodule11d_la_DEPENDENCIES =
-+libgmodule11d_la_OBJECTS = gmodule.lo
-+libgplugin11d_a_la_DEPENDENCIES =
-+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo
-+libgplugin11d_b_la_DEPENDENCIES =
-+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo
- PROGRAMS = $(noinst_PROGRAMS)
+@@ -141,7 +141,7 @@
testgmodule_SOURCES = testgmodule.c
testgmodule_OBJECTS = testgmodule.o
-testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la
-+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la
++testgmodule_DEPENDENCIES = libgmodule12.la $(top_builddir)/libglib12.la
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
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 $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS = $(include_HEADERS)
-
- DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
-@@ -157,8 +157,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
--OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
-+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c
-+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -226,14 +226,14 @@
+@@ -226,13 +226,13 @@
maintainer-clean-libtool:
-libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS)
++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS)
++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
-+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS)
++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
-
@@ -327,7 +327,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
@@ -248,11 +181,11 @@
done
-install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule11d.la
++install-libLTLIBRARIES: libgmodule12.la
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
- @list='libgmodule.la'; for p in $$list; do \
-+ @list='libgmodule11d.la'; for p in $$list; do \
++ @list='libgmodule12.la'; for p in $$list; do \
if test -f $$p; then \
echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -263,65 +196,42 @@
-libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
-lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread11d.la
++lib_LTLIBRARIES = libgthread12.la
--libgthread_la_SOURCES = gthread.c
+ libgthread_la_SOURCES = gthread.c
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgthread11d_la_SOURCES = gthread.c
-+libgthread11d_la_LDFLAGS = -version-info 2:1:0
++libgthread_la_LDFLAGS = -version-info 1:0:0
--libgthread_la_LIBADD = @G_THREAD_LIBS@
-+libgthread11d_la_LIBADD = @G_THREAD_LIBS@
+ libgthread_la_LIBADD = @G_THREAD_LIBS@
noinst_PROGRAMS = testgthread
-testgthread_LDADD = ../libglib.la libgthread.la
-+testgthread_LDADD = ../libglib11d.la libgthread11d.la
++testgthread_LDADD = ../libglib12.la libgthread12.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-@@ -114,13 +114,13 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgthread_la_DEPENDENCIES =
--libgthread_la_OBJECTS = gthread.lo
-+libgthread11d_la_DEPENDENCIES =
-+libgthread11d_la_OBJECTS = gthread.lo
- PROGRAMS = $(noinst_PROGRAMS)
+@@ -120,7 +120,7 @@
testgthread_SOURCES = testgthread.c
testgthread_OBJECTS = testgthread.o
-testgthread_DEPENDENCIES = ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la
++testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la
testgthread_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -134,8 +134,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgthread_la_SOURCES) testgthread.c
--OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
-+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c
-+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -211,8 +211,8 @@
+@@ -211,7 +211,7 @@
maintainer-clean-libtool:
-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
-+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS)
++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
-
@@ -291,7 +291,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES
@@ -331,3 +241,116 @@
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+--- docs/Makefile.in.orig Tue Mar 2 10:39:11 1999
++++ docs/Makefile.in Tue Mar 2 10:40:18 1999
+@@ -89,9 +89,9 @@
+
+ info_TEXINFOS = glib.texi
+
+-man_MANS = glib-config.1
++man_MANS = glib12-config.1
+
+-EXTRA_DIST = glib-config.1 glib.html glib_toc.html
++EXTRA_DIST = glib12-config.1 glib.html glib_toc.html
+
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -125,6 +125,8 @@
+ glib.info: glib.texi
+ glib.dvi: glib.texi
+
++glib12-config.1: glib-config.1
++ cp glib-config.1 glib12-config.1
+
+ DVIPS = dvips
+
+--- tests/Makefile.in.orig Tue Mar 2 10:42:05 1999
++++ tests/Makefile.in Tue Mar 2 10:42:39 1999
+@@ -94,17 +94,17 @@
+
+ noinst_PROGRAMS = $(TESTS)
+
+-array_test_LDADD = $(top_builddir)/libglib.la
+-dirname_test_LDADD = $(top_builddir)/libglib.la
+-hash_test_LDADD = $(top_builddir)/libglib.la
+-list_test_LDADD = $(top_builddir)/libglib.la
+-node_test_LDADD = $(top_builddir)/libglib.la
+-relation_test_LDADD = $(top_builddir)/libglib.la
+-slist_test_LDADD = $(top_builddir)/libglib.la
+-string_test_LDADD = $(top_builddir)/libglib.la
+-strfunc_test_LDADD = $(top_builddir)/libglib.la
+-tree_test_LDADD = $(top_builddir)/libglib.la
+-type_test_LDADD = $(top_builddir)/libglib.la
++array_test_LDADD = $(top_builddir)/libglib12.la
++dirname_test_LDADD = $(top_builddir)/libglib12.la
++hash_test_LDADD = $(top_builddir)/libglib12.la
++list_test_LDADD = $(top_builddir)/libglib12.la
++node_test_LDADD = $(top_builddir)/libglib12.la
++relation_test_LDADD = $(top_builddir)/libglib12.la
++slist_test_LDADD = $(top_builddir)/libglib12.la
++string_test_LDADD = $(top_builddir)/libglib12.la
++strfunc_test_LDADD = $(top_builddir)/libglib12.la
++tree_test_LDADD = $(top_builddir)/libglib12.la
++type_test_LDADD = $(top_builddir)/libglib12.la
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+@@ -117,47 +117,47 @@
+ LIBS = @LIBS@
+ array_test_SOURCES = array-test.c
+ array_test_OBJECTS = array-test.o
+-array_test_DEPENDENCIES = $(top_builddir)/libglib.la
++array_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ array_test_LDFLAGS =
+ dirname_test_SOURCES = dirname-test.c
+ dirname_test_OBJECTS = dirname-test.o
+-dirname_test_DEPENDENCIES = $(top_builddir)/libglib.la
++dirname_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ dirname_test_LDFLAGS =
+ hash_test_SOURCES = hash-test.c
+ hash_test_OBJECTS = hash-test.o
+-hash_test_DEPENDENCIES = $(top_builddir)/libglib.la
++hash_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ hash_test_LDFLAGS =
+ list_test_SOURCES = list-test.c
+ list_test_OBJECTS = list-test.o
+-list_test_DEPENDENCIES = $(top_builddir)/libglib.la
++list_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ list_test_LDFLAGS =
+ node_test_SOURCES = node-test.c
+ node_test_OBJECTS = node-test.o
+-node_test_DEPENDENCIES = $(top_builddir)/libglib.la
++node_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ node_test_LDFLAGS =
+ relation_test_SOURCES = relation-test.c
+ relation_test_OBJECTS = relation-test.o
+-relation_test_DEPENDENCIES = $(top_builddir)/libglib.la
++relation_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ relation_test_LDFLAGS =
+ slist_test_SOURCES = slist-test.c
+ slist_test_OBJECTS = slist-test.o
+-slist_test_DEPENDENCIES = $(top_builddir)/libglib.la
++slist_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ slist_test_LDFLAGS =
+ string_test_SOURCES = string-test.c
+ string_test_OBJECTS = string-test.o
+-string_test_DEPENDENCIES = $(top_builddir)/libglib.la
++string_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ string_test_LDFLAGS =
+ strfunc_test_SOURCES = strfunc-test.c
+ strfunc_test_OBJECTS = strfunc-test.o
+-strfunc_test_DEPENDENCIES = $(top_builddir)/libglib.la
++strfunc_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ strfunc_test_LDFLAGS =
+ tree_test_SOURCES = tree-test.c
+ tree_test_OBJECTS = tree-test.o
+-tree_test_DEPENDENCIES = $(top_builddir)/libglib.la
++tree_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ tree_test_LDFLAGS =
+ type_test_SOURCES = type-test.c
+ type_test_OBJECTS = type-test.o
+-type_test_DEPENDENCIES = $(top_builddir)/libglib.la
++type_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ type_test_LDFLAGS =
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/glib12/files/patch-ac b/devel/glib12/files/patch-ac
index 3570ed47a9dc..1532d62c6f74 100644
--- a/devel/glib12/files/patch-ac
+++ b/devel/glib12/files/patch-ac
@@ -5,7 +5,7 @@
{
cat <<EOF
-Usage: glib-config [OPTIONS] [LIBRARIES]
-+Usage: glib11d-config [OPTIONS] [LIBRARIES]
++Usage: glib12-config [OPTIONS] [LIBRARIES]
Options:
[--prefix[=DIR]]
[--exec-prefix[=DIR]]
@@ -21,16 +21,16 @@
libsa=""
if test "$lib_glib" = "yes"; then
- libsp="$libsp -lglib"
-+ libsp="$libsp -lglib11d"
++ libsp="$libsp -lglib12"
fi
if test "$lib_gthread" = "yes"; then
- libsp="-lgthread $libsp"
-+ libsp="-rdynamic -lgthread11d $libsp"
++ libsp="-lgthread12 $libsp"
libsa="$libsa @G_THREAD_LIBS@"
fi
if test "$lib_gmodule" = "yes"; then
- libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp"
-+ libsp="@G_MODULE_LDFLAGS@ -lgmodule11d $libsp"
++ libsp="@G_MODULE_LDFLAGS@ -lgmodule12 $libsp"
libsa="$libsa @G_MODULE_LIBS@"
fi
echo -L@libdir@ $libsp $libsa
diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad
index 6ad303c7ab4b..f373a5042242 100644
--- a/devel/glib12/files/patch-ad
+++ b/devel/glib12/files/patch-ad
@@ -1,6 +1,6 @@
--- configure.in.orig Thu Jan 28 09:59:01 1999
+++ configure.in Thu Jan 28 23:13:01 1999
-@@ -250,7 +250,7 @@
+@@ -268,7 +268,7 @@
AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
# Check for some functions
@@ -9,7 +9,17 @@
# Check for sys_errlist
AC_MSG_CHECKING(for sys_errlist)
-@@ -732,11 +732,13 @@
+@@ -507,6 +507,9 @@
+ linux*)
+ G_MODULE_LDFLAGS='-rdynamic'
+ ;;
++ freebsd*)
++ G_MODULE_LDFLAGS='-Wl,-E'
++ ;;
+ esac
+ LIBS_orig="$LIBS"
+ LDFLAGS_orig="$LDFLAGS"
+@@ -716,11 +719,13 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
@@ -18,17 +28,17 @@
-
- # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
- # -mthreads flag.
-+ *-*-freebsd2.2* | *-*-freebsd3* | *-*-freebsd4*)
++ *-*-freebsd*)
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ have_poll=no
+ else
-+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
;;
esac
-@@ -785,6 +788,9 @@
+@@ -834,6 +839,9 @@
dnl ****************************************
dnl *** GLib POLL* compatibility defines ***
dnl ****************************************
diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae
index fcb74bc9edae..32343d705d05 100644
--- a/devel/glib12/files/patch-ae
+++ b/devel/glib12/files/patch-ae
@@ -9,7 +9,17 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3765: checking for $ac_func" >&5
-@@ -5302,11 +5302,13 @@
+@@ -4610,6 +4610,9 @@
+ linux*)
+ G_MODULE_LDFLAGS='-rdynamic'
+ ;;
++ freebsd*)
++ G_MODULE_LDFLAGS='-Wl,-E'
++ ;;
+ esac
+ LIBS_orig="$LIBS"
+ LDFLAGS_orig="$LDFLAGS"
+@@ -5302,11 +5305,13 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
@@ -23,180 +33,12 @@
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ have_poll=no
+ else
-+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
;;
esac
-@@ -5315,7 +5317,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
- cat > conftest.$ac_ext <<EOF
--#line 5319 "configure"
-+#line 5321 "configure"
- #include "confdefs.h"
- #include <time.h>
- EOF
-@@ -5332,7 +5334,7 @@
- CPPFLAGS=$old_CPPFLAGS
-
- echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
--echo "configure:5336: checking necessary compiler options" >&5
-+echo "configure:5338: checking necessary compiler options" >&5
-
- echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
- else
-@@ -5350,12 +5352,12 @@
- for ac_func in localtime_r rand_r
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5354: checking for $ac_func" >&5
-+echo "configure:5356: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5359 "configure"
-+#line 5361 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -5378,7 +5380,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5404,7 +5406,7 @@
-
- if test "$ac_cv_header_pwd_h" = "yes"; then
- echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6
--echo "configure:5408: checking for getpwuid_r" >&5
-+echo "configure:5410: checking for getpwuid_r" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5412,7 +5414,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5416 "configure"
-+#line 5418 "configure"
- #include "confdefs.h"
- #include <errno.h>
- int main () { char buffer[10000], *pointer;
-@@ -5423,7 +5425,7 @@
- sizeof (buffer), &pointer);
- return errno == ENOSYS;}
- EOF
--if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_func_getpwuid_r=yes
- else
-@@ -5448,20 +5450,20 @@
- fi
- if test "$ac_cv_func_getpwuid_r" = "yes"; then
- echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6
--echo "configure:5452: checking whether getpwuid_r is posix like" >&5
-+echo "configure:5454: checking whether getpwuid_r is posix like" >&5
- # getpwuid_r(0, NULL, NULL, 0) is the signature on
- # solaris, if that is not found, the prog below won't
- # compile, then the posix signature is assumed as
- # the default.
- cat > conftest.$ac_ext <<EOF
--#line 5458 "configure"
-+#line 5460 "configure"
- #include "confdefs.h"
- #include <pwd.h>
- int main() {
- getpwuid_r(0, NULL, NULL, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
- else
-@@ -5479,17 +5481,17 @@
- fi
- if test x"$have_threads" = xposix; then
- echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6
--echo "configure:5483: checking whether pthread_getspecific is posix like" >&5
-+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5
- # PCThreads has pthread_getspecific(pthread_key_t, void **);
- cat > conftest.$ac_ext <<EOF
--#line 5486 "configure"
-+#line 5488 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- int main() {
- pthread_getspecific(0,NULL);
- ; return 0; }
- EOF
--if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
- else
-@@ -5530,7 +5532,7 @@
- case "$mutex_has_default" in
- "yes")
- echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5534: checking size of $mutex_default_type" >&5
-+echo "configure:5536: checking size of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5538,7 +5540,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5542 "configure"
-+#line 5544 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5550,7 +5552,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- glib_cv_sizeof_gmutex=`cat conftestval`
- else
-@@ -5570,7 +5572,7 @@
-
-
- echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5574: checking byte contents of $mutex_default_type" >&5
-+echo "configure:5576: checking byte contents of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5578,7 +5580,7 @@
- glib_cv_byte_contents_gmutex=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 5582 "configure"
-+#line 5584 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5595,7 +5597,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- glib_cv_byte_contents_gmutex=`cat conftestval`
- else
-@@ -5623,6 +5625,63 @@
+@@ -5623,6 +5628,63 @@
@@ -204,12 +46,12 @@
+ for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5633: checking for $ac_func" >&5
++echo "configure:5636: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
-+#line 5638 "configure"
++#line 5641 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
@@ -232,7 +74,7 @@
+
+; return 0; }
+EOF
-+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
@@ -260,26 +102,3 @@
glib_sysdefso="glibconfig-sysdefs.h"
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -5631,7 +5690,7 @@
- glib_nl='\n'
- fi
- echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
--echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5
-+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5
- cat >confrun.c <<_______EOF
- #include <stdio.h>
- #include <sys/types.h>
-@@ -5658,11 +5717,11 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5662 "configure"
-+#line 5721 "configure"
- #include "confdefs.h"
- `cat confrun.c`
- EOF
--if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- echo "$ac_t""done" 1>&6
- else
diff --git a/devel/glib12/pkg-descr b/devel/glib12/pkg-descr
index 469154423427..65e7944cba86 100644
--- a/devel/glib12/pkg-descr
+++ b/devel/glib12/pkg-descr
@@ -1,10 +1,7 @@
-This is GLib version 1.1. GLib, is a library which includes support
+This is GLib version 1.2. GLib, is a library which includes support
routines for C such as lists, trees, hashes, memory allocation, and
many other things.
-Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0
-and earlier.
-
The official ftp site is:
ftp://ftp.gtk.org/pub/gtk
diff --git a/devel/glib12/pkg-plist b/devel/glib12/pkg-plist
index a2c5ff7fd2f2..85ba872ce363 100644
--- a/devel/glib12/pkg-plist
+++ b/devel/glib12/pkg-plist
@@ -1,24 +1,24 @@
-bin/glib11d-config
-include/glib11d/glib.h
-include/glib11d/glibconfig.h
-include/glib11d/gmodule.h
+bin/glib12-config
+include/glib12/glib.h
+include/glib12/glibconfig.h
+include/glib12/gmodule.h
@unexec install-info --delete %D/info/glib.info %D/info/dir
info/glib.info
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@exec install-info %D/info/glib.info %D/info/dir
-lib/libglib11d.a
-lib/libglib11d.la
-lib/libglib11d.so
-lib/libglib11d.so.2.1
-lib/libgmodule11d.a
-lib/libgmodule11d.la
-lib/libgmodule11d.so
-lib/libgmodule11d.so.2.1
-lib/libgthread11d.a
-lib/libgthread11d.la
-lib/libgthread11d.so
-lib/libgthread11d.so.2.1
+lib/libglib12.a
+lib/libglib12.la
+lib/libglib12.so
+lib/libglib12.so.1
+lib/libgmodule12.a
+lib/libgmodule12.la
+lib/libgmodule12.so
+lib/libgmodule12.so.1
+lib/libgthread12.a
+lib/libgthread12.la
+lib/libgthread12.so
+lib/libgthread12.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
share/aclocal/glib.m4
-@dirrm include/glib11d
+@dirrm include/glib12
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 7343c701a67b..7992787f2356 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -1,24 +1,24 @@
-# New ports collection makefile for: glib11-devel
-# Version required: 1.1.16
+# New ports collection makefile for: glib12
+# Version required: 1.2.0
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $
+# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
#
-DISTNAME= glib-1.1.16
+DISTNAME= glib-1.2.0
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
- ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
- http://www.ameth.org/gimp/gtk/v1.1/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+ http://www.ameth.org/gimp/gtk/v1.2/
MAINTAINER= vanilla@FreeBSD.ORG
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib11d
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-MAN1= glib-config.1
+MAN1= glib12-config.1
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index 84c47db10e06..3339035c5518 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
+MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
diff --git a/devel/glib13/files/patch-ab b/devel/glib13/files/patch-ab
index df40e4bbf003..0ae004d00c11 100644
--- a/devel/glib13/files/patch-ab
+++ b/devel/glib13/files/patch-ab
@@ -11,113 +11,91 @@
+configincludedir = $(includedir)
-bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib11d-config
++bin_SCRIPTS = glib12-config
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-@@ -102,9 +102,9 @@
- EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
+@@ -102,7 +102,7 @@
+ EXTRA_DIST = glib.m4 glib.spec.in acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
-lib_LTLIBRARIES = libglib.la
-+lib_LTLIBRARIES = libglib11d.la
++lib_LTLIBRARIES = libglib12.la
--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
-+libglib11d_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
+ 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
@@ -113,20 +113,20 @@
configinclude_DATA = glibconfig.h
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libglib11d_la_LDFLAGS = -version-info 2:1:0
++libglib_la_LDFLAGS = -version-info 1:0:0
noinst_PROGRAMS = testglib testgdate testgdateparser
-testglib_LDADD = libglib.la
-testgdate_LDADD = libglib.la
-testgdateparser_LDADD = libglib.la
-+testglib_LDADD = libglib11d.la
-+testgdate_LDADD = libglib11d.la
-+testgdateparser_LDADD = libglib11d.la
++testglib_LDADD = libglib12.la
++testgdate_LDADD = libglib12.la
++testgdateparser_LDADD = libglib12.la
m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib-config
-+CONFIG_CLEAN_FILES = glib11d-config
+-CONFIG_CLEAN_FILES = glib.spec glib-config
++CONFIG_CLEAN_FILES = glib12-config
LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -134,8 +134,8 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libglib_la_LIBADD =
--libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
-+libglib11d_la_LIBADD =
-+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
- gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
- gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
@@ -144,15 +144,15 @@
testglib_SOURCES = testglib.c
testglib_OBJECTS = testglib.o
-testglib_DEPENDENCIES = libglib.la
-+testglib_DEPENDENCIES = libglib11d.la
++testglib_DEPENDENCIES = libglib12.la
testglib_LDFLAGS =
testgdate_SOURCES = testgdate.c
testgdate_OBJECTS = testgdate.o
-testgdate_DEPENDENCIES = libglib.la
-+testgdate_DEPENDENCIES = libglib11d.la
++testgdate_DEPENDENCIES = libglib12.la
testgdate_LDFLAGS =
testgdateparser_SOURCES = testgdateparser.c
testgdateparser_OBJECTS = testgdateparser.o
-testgdateparser_DEPENDENCIES = libglib.la
-+testgdateparser_DEPENDENCIES = libglib11d.la
++testgdateparser_DEPENDENCIES = libglib12.la
testgdateparser_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
-@@ -175,8 +175,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
--OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c
-+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -223,7 +223,10 @@
- -rm -f config.h
-
+@@ -226,7 +226,7 @@
maintainer-clean-hdr:
+ glib.spec: $(top_builddir)/config.status glib.spec.in
+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-glib-config: $(top_builddir)/config.status glib-config.in
-+glib11d-config.in: glib-config.in
-+ cp glib-config.in glib11d-config.in
-+
-+glib11d-config: $(top_builddir)/config.status glib11d-config.in
++glib12-config: $(top_builddir)/config.status glib12-config.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-libLTLIBRARIES:
-@@ -289,8 +292,8 @@
+@@ -292,7 +292,7 @@
maintainer-clean-libtool:
-libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS)
++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
+@@ -535,7 +535,6 @@
+ || exit 1; \
+ fi; \
+ done
+- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-@@ -558,7 +561,7 @@
+ info-am:
+ info: info-recursive
+@@ -562,7 +561,7 @@
uninstall-configincludeDATA uninstall-m4dataDATA \
uninstall-includeHEADERS
uninstall: uninstall-recursive
@@ -126,114 +104,69 @@
$(HEADERS) config.h
all-redirect: all-recursive-am
install-strip:
+@@ -640,7 +639,8 @@
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+-glib-config: glib-config.in
++glib12-config.in: glib-config.in
++ cp glib-config.in glib12-config.in
+
+ configure: configure.in acglib.m4
+ glibconfig.h: stamp-gc-h
--- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999
+++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999
-@@ -98,29 +98,29 @@
+@@ -98,12 +98,12 @@
include_HEADERS = gmodule.h
-libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
-lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la
++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
--libgmodule_la_SOURCES = gmodule.c
+ libgmodule_la_SOURCES = gmodule.c
-libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgmodule11d_la_SOURCES = gmodule.c
-+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0
-
-
--libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
- # we should really depend on $(libglib) for libgmodule.la, but libtool has a
- # problem with this ;(
-
--libgplugin_a_la_SOURCES = libgplugin_a.c
--libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
--
--libgplugin_b_la_SOURCES = libgplugin_b.c
--libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgplugin11d_a_la_SOURCES = libgplugin_a.c
-+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+
-+libgplugin11d_b_la_SOURCES = libgplugin_b.c
-+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0:0
+
+
+ libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+@@ -120,7 +120,7 @@
noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
-+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@
++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = gmoduleconf.h
-@@ -131,22 +131,22 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgmodule_la_DEPENDENCIES =
--libgmodule_la_OBJECTS = gmodule.lo
--libgplugin_a_la_DEPENDENCIES =
--libgplugin_a_la_OBJECTS = libgplugin_a.lo
--libgplugin_b_la_DEPENDENCIES =
--libgplugin_b_la_OBJECTS = libgplugin_b.lo
-+libgmodule11d_la_DEPENDENCIES =
-+libgmodule11d_la_OBJECTS = gmodule.lo
-+libgplugin11d_a_la_DEPENDENCIES =
-+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo
-+libgplugin11d_b_la_DEPENDENCIES =
-+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo
- PROGRAMS = $(noinst_PROGRAMS)
+@@ -141,7 +141,7 @@
testgmodule_SOURCES = testgmodule.c
testgmodule_OBJECTS = testgmodule.o
-testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la
-+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la
++testgmodule_DEPENDENCIES = libgmodule12.la $(top_builddir)/libglib12.la
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
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 $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS = $(include_HEADERS)
-
- DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
-@@ -157,8 +157,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
--OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
-+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c
-+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -226,14 +226,14 @@
+@@ -226,13 +226,13 @@
maintainer-clean-libtool:
-libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS)
++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS)
++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
-+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS)
++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
-
@@ -327,7 +327,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
@@ -248,11 +181,11 @@
done
-install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule11d.la
++install-libLTLIBRARIES: libgmodule12.la
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
- @list='libgmodule.la'; for p in $$list; do \
-+ @list='libgmodule11d.la'; for p in $$list; do \
++ @list='libgmodule12.la'; for p in $$list; do \
if test -f $$p; then \
echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -263,65 +196,42 @@
-libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
-lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread11d.la
++lib_LTLIBRARIES = libgthread12.la
--libgthread_la_SOURCES = gthread.c
+ libgthread_la_SOURCES = gthread.c
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgthread11d_la_SOURCES = gthread.c
-+libgthread11d_la_LDFLAGS = -version-info 2:1:0
++libgthread_la_LDFLAGS = -version-info 1:0:0
--libgthread_la_LIBADD = @G_THREAD_LIBS@
-+libgthread11d_la_LIBADD = @G_THREAD_LIBS@
+ libgthread_la_LIBADD = @G_THREAD_LIBS@
noinst_PROGRAMS = testgthread
-testgthread_LDADD = ../libglib.la libgthread.la
-+testgthread_LDADD = ../libglib11d.la libgthread11d.la
++testgthread_LDADD = ../libglib12.la libgthread12.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-@@ -114,13 +114,13 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgthread_la_DEPENDENCIES =
--libgthread_la_OBJECTS = gthread.lo
-+libgthread11d_la_DEPENDENCIES =
-+libgthread11d_la_OBJECTS = gthread.lo
- PROGRAMS = $(noinst_PROGRAMS)
+@@ -120,7 +120,7 @@
testgthread_SOURCES = testgthread.c
testgthread_OBJECTS = testgthread.o
-testgthread_DEPENDENCIES = ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la
++testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la
testgthread_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -134,8 +134,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgthread_la_SOURCES) testgthread.c
--OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
-+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c
-+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -211,8 +211,8 @@
+@@ -211,7 +211,7 @@
maintainer-clean-libtool:
-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
-+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS)
++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
-
@@ -291,7 +291,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES
@@ -331,3 +241,116 @@
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+--- docs/Makefile.in.orig Tue Mar 2 10:39:11 1999
++++ docs/Makefile.in Tue Mar 2 10:40:18 1999
+@@ -89,9 +89,9 @@
+
+ info_TEXINFOS = glib.texi
+
+-man_MANS = glib-config.1
++man_MANS = glib12-config.1
+
+-EXTRA_DIST = glib-config.1 glib.html glib_toc.html
++EXTRA_DIST = glib12-config.1 glib.html glib_toc.html
+
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -125,6 +125,8 @@
+ glib.info: glib.texi
+ glib.dvi: glib.texi
+
++glib12-config.1: glib-config.1
++ cp glib-config.1 glib12-config.1
+
+ DVIPS = dvips
+
+--- tests/Makefile.in.orig Tue Mar 2 10:42:05 1999
++++ tests/Makefile.in Tue Mar 2 10:42:39 1999
+@@ -94,17 +94,17 @@
+
+ noinst_PROGRAMS = $(TESTS)
+
+-array_test_LDADD = $(top_builddir)/libglib.la
+-dirname_test_LDADD = $(top_builddir)/libglib.la
+-hash_test_LDADD = $(top_builddir)/libglib.la
+-list_test_LDADD = $(top_builddir)/libglib.la
+-node_test_LDADD = $(top_builddir)/libglib.la
+-relation_test_LDADD = $(top_builddir)/libglib.la
+-slist_test_LDADD = $(top_builddir)/libglib.la
+-string_test_LDADD = $(top_builddir)/libglib.la
+-strfunc_test_LDADD = $(top_builddir)/libglib.la
+-tree_test_LDADD = $(top_builddir)/libglib.la
+-type_test_LDADD = $(top_builddir)/libglib.la
++array_test_LDADD = $(top_builddir)/libglib12.la
++dirname_test_LDADD = $(top_builddir)/libglib12.la
++hash_test_LDADD = $(top_builddir)/libglib12.la
++list_test_LDADD = $(top_builddir)/libglib12.la
++node_test_LDADD = $(top_builddir)/libglib12.la
++relation_test_LDADD = $(top_builddir)/libglib12.la
++slist_test_LDADD = $(top_builddir)/libglib12.la
++string_test_LDADD = $(top_builddir)/libglib12.la
++strfunc_test_LDADD = $(top_builddir)/libglib12.la
++tree_test_LDADD = $(top_builddir)/libglib12.la
++type_test_LDADD = $(top_builddir)/libglib12.la
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+@@ -117,47 +117,47 @@
+ LIBS = @LIBS@
+ array_test_SOURCES = array-test.c
+ array_test_OBJECTS = array-test.o
+-array_test_DEPENDENCIES = $(top_builddir)/libglib.la
++array_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ array_test_LDFLAGS =
+ dirname_test_SOURCES = dirname-test.c
+ dirname_test_OBJECTS = dirname-test.o
+-dirname_test_DEPENDENCIES = $(top_builddir)/libglib.la
++dirname_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ dirname_test_LDFLAGS =
+ hash_test_SOURCES = hash-test.c
+ hash_test_OBJECTS = hash-test.o
+-hash_test_DEPENDENCIES = $(top_builddir)/libglib.la
++hash_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ hash_test_LDFLAGS =
+ list_test_SOURCES = list-test.c
+ list_test_OBJECTS = list-test.o
+-list_test_DEPENDENCIES = $(top_builddir)/libglib.la
++list_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ list_test_LDFLAGS =
+ node_test_SOURCES = node-test.c
+ node_test_OBJECTS = node-test.o
+-node_test_DEPENDENCIES = $(top_builddir)/libglib.la
++node_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ node_test_LDFLAGS =
+ relation_test_SOURCES = relation-test.c
+ relation_test_OBJECTS = relation-test.o
+-relation_test_DEPENDENCIES = $(top_builddir)/libglib.la
++relation_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ relation_test_LDFLAGS =
+ slist_test_SOURCES = slist-test.c
+ slist_test_OBJECTS = slist-test.o
+-slist_test_DEPENDENCIES = $(top_builddir)/libglib.la
++slist_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ slist_test_LDFLAGS =
+ string_test_SOURCES = string-test.c
+ string_test_OBJECTS = string-test.o
+-string_test_DEPENDENCIES = $(top_builddir)/libglib.la
++string_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ string_test_LDFLAGS =
+ strfunc_test_SOURCES = strfunc-test.c
+ strfunc_test_OBJECTS = strfunc-test.o
+-strfunc_test_DEPENDENCIES = $(top_builddir)/libglib.la
++strfunc_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ strfunc_test_LDFLAGS =
+ tree_test_SOURCES = tree-test.c
+ tree_test_OBJECTS = tree-test.o
+-tree_test_DEPENDENCIES = $(top_builddir)/libglib.la
++tree_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ tree_test_LDFLAGS =
+ type_test_SOURCES = type-test.c
+ type_test_OBJECTS = type-test.o
+-type_test_DEPENDENCIES = $(top_builddir)/libglib.la
++type_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ type_test_LDFLAGS =
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/glib13/files/patch-ae b/devel/glib13/files/patch-ae
index fcb74bc9edae..32343d705d05 100644
--- a/devel/glib13/files/patch-ae
+++ b/devel/glib13/files/patch-ae
@@ -9,7 +9,17 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3765: checking for $ac_func" >&5
-@@ -5302,11 +5302,13 @@
+@@ -4610,6 +4610,9 @@
+ linux*)
+ G_MODULE_LDFLAGS='-rdynamic'
+ ;;
++ freebsd*)
++ G_MODULE_LDFLAGS='-Wl,-E'
++ ;;
+ esac
+ LIBS_orig="$LIBS"
+ LDFLAGS_orig="$LDFLAGS"
+@@ -5302,11 +5305,13 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
@@ -23,180 +33,12 @@
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ have_poll=no
+ else
-+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
;;
esac
-@@ -5315,7 +5317,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
- cat > conftest.$ac_ext <<EOF
--#line 5319 "configure"
-+#line 5321 "configure"
- #include "confdefs.h"
- #include <time.h>
- EOF
-@@ -5332,7 +5334,7 @@
- CPPFLAGS=$old_CPPFLAGS
-
- echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
--echo "configure:5336: checking necessary compiler options" >&5
-+echo "configure:5338: checking necessary compiler options" >&5
-
- echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
- else
-@@ -5350,12 +5352,12 @@
- for ac_func in localtime_r rand_r
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5354: checking for $ac_func" >&5
-+echo "configure:5356: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5359 "configure"
-+#line 5361 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -5378,7 +5380,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5404,7 +5406,7 @@
-
- if test "$ac_cv_header_pwd_h" = "yes"; then
- echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6
--echo "configure:5408: checking for getpwuid_r" >&5
-+echo "configure:5410: checking for getpwuid_r" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5412,7 +5414,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5416 "configure"
-+#line 5418 "configure"
- #include "confdefs.h"
- #include <errno.h>
- int main () { char buffer[10000], *pointer;
-@@ -5423,7 +5425,7 @@
- sizeof (buffer), &pointer);
- return errno == ENOSYS;}
- EOF
--if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_func_getpwuid_r=yes
- else
-@@ -5448,20 +5450,20 @@
- fi
- if test "$ac_cv_func_getpwuid_r" = "yes"; then
- echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6
--echo "configure:5452: checking whether getpwuid_r is posix like" >&5
-+echo "configure:5454: checking whether getpwuid_r is posix like" >&5
- # getpwuid_r(0, NULL, NULL, 0) is the signature on
- # solaris, if that is not found, the prog below won't
- # compile, then the posix signature is assumed as
- # the default.
- cat > conftest.$ac_ext <<EOF
--#line 5458 "configure"
-+#line 5460 "configure"
- #include "confdefs.h"
- #include <pwd.h>
- int main() {
- getpwuid_r(0, NULL, NULL, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
- else
-@@ -5479,17 +5481,17 @@
- fi
- if test x"$have_threads" = xposix; then
- echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6
--echo "configure:5483: checking whether pthread_getspecific is posix like" >&5
-+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5
- # PCThreads has pthread_getspecific(pthread_key_t, void **);
- cat > conftest.$ac_ext <<EOF
--#line 5486 "configure"
-+#line 5488 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- int main() {
- pthread_getspecific(0,NULL);
- ; return 0; }
- EOF
--if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
- else
-@@ -5530,7 +5532,7 @@
- case "$mutex_has_default" in
- "yes")
- echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5534: checking size of $mutex_default_type" >&5
-+echo "configure:5536: checking size of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5538,7 +5540,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5542 "configure"
-+#line 5544 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5550,7 +5552,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- glib_cv_sizeof_gmutex=`cat conftestval`
- else
-@@ -5570,7 +5572,7 @@
-
-
- echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5574: checking byte contents of $mutex_default_type" >&5
-+echo "configure:5576: checking byte contents of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5578,7 +5580,7 @@
- glib_cv_byte_contents_gmutex=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 5582 "configure"
-+#line 5584 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5595,7 +5597,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- glib_cv_byte_contents_gmutex=`cat conftestval`
- else
-@@ -5623,6 +5625,63 @@
+@@ -5623,6 +5628,63 @@
@@ -204,12 +46,12 @@
+ for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5633: checking for $ac_func" >&5
++echo "configure:5636: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
-+#line 5638 "configure"
++#line 5641 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
@@ -232,7 +74,7 @@
+
+; return 0; }
+EOF
-+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
@@ -260,26 +102,3 @@
glib_sysdefso="glibconfig-sysdefs.h"
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -5631,7 +5690,7 @@
- glib_nl='\n'
- fi
- echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
--echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5
-+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5
- cat >confrun.c <<_______EOF
- #include <stdio.h>
- #include <sys/types.h>
-@@ -5658,11 +5717,11 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5662 "configure"
-+#line 5721 "configure"
- #include "confdefs.h"
- `cat confrun.c`
- EOF
--if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- echo "$ac_t""done" 1>&6
- else
diff --git a/devel/glib13/pkg-descr b/devel/glib13/pkg-descr
index 469154423427..65e7944cba86 100644
--- a/devel/glib13/pkg-descr
+++ b/devel/glib13/pkg-descr
@@ -1,10 +1,7 @@
-This is GLib version 1.1. GLib, is a library which includes support
+This is GLib version 1.2. GLib, is a library which includes support
routines for C such as lists, trees, hashes, memory allocation, and
many other things.
-Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0
-and earlier.
-
The official ftp site is:
ftp://ftp.gtk.org/pub/gtk
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index a2c5ff7fd2f2..85ba872ce363 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -1,24 +1,24 @@
-bin/glib11d-config
-include/glib11d/glib.h
-include/glib11d/glibconfig.h
-include/glib11d/gmodule.h
+bin/glib12-config
+include/glib12/glib.h
+include/glib12/glibconfig.h
+include/glib12/gmodule.h
@unexec install-info --delete %D/info/glib.info %D/info/dir
info/glib.info
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@exec install-info %D/info/glib.info %D/info/dir
-lib/libglib11d.a
-lib/libglib11d.la
-lib/libglib11d.so
-lib/libglib11d.so.2.1
-lib/libgmodule11d.a
-lib/libgmodule11d.la
-lib/libgmodule11d.so
-lib/libgmodule11d.so.2.1
-lib/libgthread11d.a
-lib/libgthread11d.la
-lib/libgthread11d.so
-lib/libgthread11d.so.2.1
+lib/libglib12.a
+lib/libglib12.la
+lib/libglib12.so
+lib/libglib12.so.1
+lib/libgmodule12.a
+lib/libgmodule12.la
+lib/libgmodule12.so
+lib/libgmodule12.so.1
+lib/libgthread12.a
+lib/libgthread12.la
+lib/libgthread12.so
+lib/libgthread12.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
share/aclocal/glib.m4
-@dirrm include/glib11d
+@dirrm include/glib12
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 7343c701a67b..7992787f2356 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,24 +1,24 @@
-# New ports collection makefile for: glib11-devel
-# Version required: 1.1.16
+# New ports collection makefile for: glib12
+# Version required: 1.2.0
# Date Created: 28 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.16 1999/01/30 20:23:09 sada Exp $
+# $Id: Makefile,v 1.17 1999/02/17 18:12:08 vanilla Exp $
#
-DISTNAME= glib-1.1.16
+DISTNAME= glib-1.2.0
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \
- ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
- http://www.ameth.org/gimp/gtk/v1.1/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+ http://www.ameth.org/gimp/gtk/v1.2/
MAINTAINER= vanilla@FreeBSD.ORG
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib11d
+CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
-MAN1= glib-config.1
+MAN1= glib12-config.1
post-install:
@if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 84c47db10e06..3339035c5518 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.16.tar.gz) = f1b32a51becffdad18193b84656989b0
+MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index df40e4bbf003..0ae004d00c11 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -11,113 +11,91 @@
+configincludedir = $(includedir)
-bin_SCRIPTS = glib-config
-+bin_SCRIPTS = glib11d-config
++bin_SCRIPTS = glib12-config
BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
-@@ -102,9 +102,9 @@
- EXTRA_DIST = glib.m4 glib.spec acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
+@@ -102,7 +102,7 @@
+ EXTRA_DIST = glib.m4 glib.spec.in acglib.m4 sanity_check README.win32 glib.def makefile.msc giowin32.c glibconfig.h.win32 config.h.win32
-lib_LTLIBRARIES = libglib.la
-+lib_LTLIBRARIES = libglib11d.la
++lib_LTLIBRARIES = libglib12.la
--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
-+libglib11d_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
+ 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
@@ -113,20 +113,20 @@
configinclude_DATA = glibconfig.h
-libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libglib11d_la_LDFLAGS = -version-info 2:1:0
++libglib_la_LDFLAGS = -version-info 1:0:0
noinst_PROGRAMS = testglib testgdate testgdateparser
-testglib_LDADD = libglib.la
-testgdate_LDADD = libglib.la
-testgdateparser_LDADD = libglib.la
-+testglib_LDADD = libglib11d.la
-+testgdate_LDADD = libglib11d.la
-+testgdateparser_LDADD = libglib11d.la
++testglib_LDADD = libglib12.la
++testgdate_LDADD = libglib12.la
++testgdateparser_LDADD = libglib12.la
m4datadir = $(datadir)/aclocal
m4data_DATA = glib.m4
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = glib-config
-+CONFIG_CLEAN_FILES = glib11d-config
+-CONFIG_CLEAN_FILES = glib.spec glib-config
++CONFIG_CLEAN_FILES = glib12-config
LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -134,8 +134,8 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libglib_la_LIBADD =
--libglib_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
-+libglib11d_la_LIBADD =
-+libglib11d_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
- gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
- gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
- gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
@@ -144,15 +144,15 @@
testglib_SOURCES = testglib.c
testglib_OBJECTS = testglib.o
-testglib_DEPENDENCIES = libglib.la
-+testglib_DEPENDENCIES = libglib11d.la
++testglib_DEPENDENCIES = libglib12.la
testglib_LDFLAGS =
testgdate_SOURCES = testgdate.c
testgdate_OBJECTS = testgdate.o
-testgdate_DEPENDENCIES = libglib.la
-+testgdate_DEPENDENCIES = libglib11d.la
++testgdate_DEPENDENCIES = libglib12.la
testgdate_LDFLAGS =
testgdateparser_SOURCES = testgdateparser.c
testgdateparser_OBJECTS = testgdateparser.o
-testgdateparser_DEPENDENCIES = libglib.la
-+testgdateparser_DEPENDENCIES = libglib11d.la
++testgdateparser_DEPENDENCIES = libglib12.la
testgdateparser_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
-@@ -175,8 +175,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
--OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-+SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c
-+OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -223,7 +223,10 @@
- -rm -f config.h
-
+@@ -226,7 +226,7 @@
maintainer-clean-hdr:
+ glib.spec: $(top_builddir)/config.status glib.spec.in
+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-glib-config: $(top_builddir)/config.status glib-config.in
-+glib11d-config.in: glib-config.in
-+ cp glib-config.in glib11d-config.in
-+
-+glib11d-config: $(top_builddir)/config.status glib11d-config.in
++glib12-config: $(top_builddir)/config.status glib12-config.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-libLTLIBRARIES:
-@@ -289,8 +292,8 @@
+@@ -292,7 +292,7 @@
maintainer-clean-libtool:
-libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
-+libglib11d.la: $(libglib11d_la_OBJECTS) $(libglib11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libglib11d_la_LDFLAGS) $(libglib11d_la_OBJECTS) $(libglib11d_la_LIBADD) $(LIBS)
++libglib12.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
+@@ -535,7 +535,6 @@
+ || exit 1; \
+ fi; \
+ done
+- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-@@ -558,7 +561,7 @@
+ info-am:
+ info: info-recursive
+@@ -562,7 +561,7 @@
uninstall-configincludeDATA uninstall-m4dataDATA \
uninstall-includeHEADERS
uninstall: uninstall-recursive
@@ -126,114 +104,69 @@
$(HEADERS) config.h
all-redirect: all-recursive-am
install-strip:
+@@ -640,7 +639,8 @@
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+-glib-config: glib-config.in
++glib12-config.in: glib-config.in
++ cp glib-config.in glib12-config.in
+
+ configure: configure.in acglib.m4
+ glibconfig.h: stamp-gc-h
--- gmodule/Makefile.in.orig Thu Jan 28 23:01:00 1999
+++ gmodule/Makefile.in Thu Jan 28 23:06:56 1999
-@@ -98,29 +98,29 @@
+@@ -98,12 +98,12 @@
include_HEADERS = gmodule.h
-libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
-lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la
-+lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la
++lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la
--libgmodule_la_SOURCES = gmodule.c
+ libgmodule_la_SOURCES = gmodule.c
-libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgmodule11d_la_SOURCES = gmodule.c
-+libgmodule11d_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 2:1:0
-
-
--libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
- # we should really depend on $(libglib) for libgmodule.la, but libtool has a
- # problem with this ;(
-
--libgplugin_a_la_SOURCES = libgplugin_a.c
--libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
--
--libgplugin_b_la_SOURCES = libgplugin_b.c
--libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
--libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+libgplugin11d_a_la_SOURCES = libgplugin_a.c
-+libgplugin11d_a_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
-+
-+libgplugin11d_b_la_SOURCES = libgplugin_b.c
-+libgplugin11d_b_la_LDFLAGS = @G_MODULE_LDFLAGS@
-+libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
++libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 1:0:0
+
+
+ libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+@@ -120,7 +120,7 @@
noinst_PROGRAMS = testgmodule
testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
-+testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@
++testgmodule_LDADD = libgmodule12.la $(libglib) @G_MODULE_LIBS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES = gmoduleconf.h
-@@ -131,22 +131,22 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgmodule_la_DEPENDENCIES =
--libgmodule_la_OBJECTS = gmodule.lo
--libgplugin_a_la_DEPENDENCIES =
--libgplugin_a_la_OBJECTS = libgplugin_a.lo
--libgplugin_b_la_DEPENDENCIES =
--libgplugin_b_la_OBJECTS = libgplugin_b.lo
-+libgmodule11d_la_DEPENDENCIES =
-+libgmodule11d_la_OBJECTS = gmodule.lo
-+libgplugin11d_a_la_DEPENDENCIES =
-+libgplugin11d_a_la_OBJECTS = libgplugin_a.lo
-+libgplugin11d_b_la_DEPENDENCIES =
-+libgplugin11d_b_la_OBJECTS = libgplugin_b.lo
- PROGRAMS = $(noinst_PROGRAMS)
+@@ -141,7 +141,7 @@
testgmodule_SOURCES = testgmodule.c
testgmodule_OBJECTS = testgmodule.o
-testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.la
-+testgmodule_DEPENDENCIES = libgmodule11d.la $(top_builddir)/libglib11d.la
++testgmodule_DEPENDENCIES = libgmodule12.la $(top_builddir)/libglib12.la
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
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 $@
-+LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS = $(include_HEADERS)
-
- DIST_COMMON = AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
-@@ -157,8 +157,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
--OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
-+SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c
-+OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -226,14 +226,14 @@
+@@ -226,13 +226,13 @@
maintainer-clean-libtool:
-libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-+libgmodule11d.la: $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgmodule11d_la_LDFLAGS) $(libgmodule11d_la_OBJECTS) $(libgmodule11d_la_LIBADD) $(LIBS)
++libgmodule12.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgmodule_la_LDFLAGS) $(libgmodule_la_OBJECTS) $(libgmodule_la_LIBADD) $(LIBS)
-libgplugin_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-+libgplugin11d_a.la: $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgplugin11d_a_la_LDFLAGS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_a_la_LIBADD) $(LIBS)
++libgplugin12_a.la: $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgplugin_a_la_LDFLAGS) $(libgplugin_a_la_OBJECTS) $(libgplugin_a_la_LIBADD) $(LIBS)
-libgplugin_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
-+libgplugin11d_b.la: $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgplugin11d_b_la_LDFLAGS) $(libgplugin11d_b_la_OBJECTS) $(libgplugin11d_b_la_LIBADD) $(LIBS)
++libgplugin12_b.la: $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgplugin_b_la_LDFLAGS) $(libgplugin_b_la_OBJECTS) $(libgplugin_b_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
-
@@ -327,7 +327,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
@@ -248,11 +181,11 @@
done
-install-libLTLIBRARIES: libgmodule.la
-+install-libLTLIBRARIES: libgmodule11d.la
++install-libLTLIBRARIES: libgmodule12.la
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
- @list='libgmodule.la'; for p in $$list; do \
-+ @list='libgmodule11d.la'; for p in $$list; do \
++ @list='libgmodule12.la'; for p in $$list; do \
if test -f $$p; then \
echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -263,65 +196,42 @@
-libglib = $(top_builddir)/libglib.la # -lglib
-+libglib = $(top_builddir)/libglib11d.la # -lglib
++libglib = $(top_builddir)/libglib12.la # -lglib
-lib_LTLIBRARIES = libgthread.la
-+lib_LTLIBRARIES = libgthread11d.la
++lib_LTLIBRARIES = libgthread12.la
--libgthread_la_SOURCES = gthread.c
+ libgthread_la_SOURCES = gthread.c
-libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgthread11d_la_SOURCES = gthread.c
-+libgthread11d_la_LDFLAGS = -version-info 2:1:0
++libgthread_la_LDFLAGS = -version-info 1:0:0
--libgthread_la_LIBADD = @G_THREAD_LIBS@
-+libgthread11d_la_LIBADD = @G_THREAD_LIBS@
+ libgthread_la_LIBADD = @G_THREAD_LIBS@
noinst_PROGRAMS = testgthread
-testgthread_LDADD = ../libglib.la libgthread.la
-+testgthread_LDADD = ../libglib11d.la libgthread11d.la
++testgthread_LDADD = ../libglib12.la libgthread12.la
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-@@ -114,13 +114,13 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgthread_la_DEPENDENCIES =
--libgthread_la_OBJECTS = gthread.lo
-+libgthread11d_la_DEPENDENCIES =
-+libgthread11d_la_OBJECTS = gthread.lo
- PROGRAMS = $(noinst_PROGRAMS)
+@@ -120,7 +120,7 @@
testgthread_SOURCES = testgthread.c
testgthread_OBJECTS = testgthread.o
-testgthread_DEPENDENCIES = ../libglib.la libgthread.la
-+testgthread_DEPENDENCIES = ../libglib11d.la libgthread11d.la
++testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la
testgthread_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -134,8 +134,8 @@
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libgthread_la_SOURCES) testgthread.c
--OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
-+SOURCES = $(libgthread11d_la_SOURCES) testgthread.c
-+OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o
-
- all: all-redirect
- .SUFFIXES:
-@@ -211,8 +211,8 @@
+@@ -211,7 +211,7 @@
maintainer-clean-libtool:
-libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
-- $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
-+libgthread11d.la: $(libgthread11d_la_OBJECTS) $(libgthread11d_la_DEPENDENCIES)
-+ $(LINK) -rpath $(libdir) $(libgthread11d_la_LDFLAGS) $(libgthread11d_la_OBJECTS) $(libgthread11d_la_LIBADD) $(LIBS)
++libgthread12.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libgthread_la_LDFLAGS) $(libgthread_la_OBJECTS) $(libgthread_la_LIBADD) $(LIBS)
mostlyclean-noinstPROGRAMS:
-
@@ -291,7 +291,7 @@
install: install-am
uninstall-am: uninstall-libLTLIBRARIES
@@ -331,3 +241,116 @@
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+--- docs/Makefile.in.orig Tue Mar 2 10:39:11 1999
++++ docs/Makefile.in Tue Mar 2 10:40:18 1999
+@@ -89,9 +89,9 @@
+
+ info_TEXINFOS = glib.texi
+
+-man_MANS = glib-config.1
++man_MANS = glib12-config.1
+
+-EXTRA_DIST = glib-config.1 glib.html glib_toc.html
++EXTRA_DIST = glib12-config.1 glib.html glib_toc.html
+
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+@@ -125,6 +125,8 @@
+ glib.info: glib.texi
+ glib.dvi: glib.texi
+
++glib12-config.1: glib-config.1
++ cp glib-config.1 glib12-config.1
+
+ DVIPS = dvips
+
+--- tests/Makefile.in.orig Tue Mar 2 10:42:05 1999
++++ tests/Makefile.in Tue Mar 2 10:42:39 1999
+@@ -94,17 +94,17 @@
+
+ noinst_PROGRAMS = $(TESTS)
+
+-array_test_LDADD = $(top_builddir)/libglib.la
+-dirname_test_LDADD = $(top_builddir)/libglib.la
+-hash_test_LDADD = $(top_builddir)/libglib.la
+-list_test_LDADD = $(top_builddir)/libglib.la
+-node_test_LDADD = $(top_builddir)/libglib.la
+-relation_test_LDADD = $(top_builddir)/libglib.la
+-slist_test_LDADD = $(top_builddir)/libglib.la
+-string_test_LDADD = $(top_builddir)/libglib.la
+-strfunc_test_LDADD = $(top_builddir)/libglib.la
+-tree_test_LDADD = $(top_builddir)/libglib.la
+-type_test_LDADD = $(top_builddir)/libglib.la
++array_test_LDADD = $(top_builddir)/libglib12.la
++dirname_test_LDADD = $(top_builddir)/libglib12.la
++hash_test_LDADD = $(top_builddir)/libglib12.la
++list_test_LDADD = $(top_builddir)/libglib12.la
++node_test_LDADD = $(top_builddir)/libglib12.la
++relation_test_LDADD = $(top_builddir)/libglib12.la
++slist_test_LDADD = $(top_builddir)/libglib12.la
++string_test_LDADD = $(top_builddir)/libglib12.la
++strfunc_test_LDADD = $(top_builddir)/libglib12.la
++tree_test_LDADD = $(top_builddir)/libglib12.la
++type_test_LDADD = $(top_builddir)/libglib12.la
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+@@ -117,47 +117,47 @@
+ LIBS = @LIBS@
+ array_test_SOURCES = array-test.c
+ array_test_OBJECTS = array-test.o
+-array_test_DEPENDENCIES = $(top_builddir)/libglib.la
++array_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ array_test_LDFLAGS =
+ dirname_test_SOURCES = dirname-test.c
+ dirname_test_OBJECTS = dirname-test.o
+-dirname_test_DEPENDENCIES = $(top_builddir)/libglib.la
++dirname_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ dirname_test_LDFLAGS =
+ hash_test_SOURCES = hash-test.c
+ hash_test_OBJECTS = hash-test.o
+-hash_test_DEPENDENCIES = $(top_builddir)/libglib.la
++hash_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ hash_test_LDFLAGS =
+ list_test_SOURCES = list-test.c
+ list_test_OBJECTS = list-test.o
+-list_test_DEPENDENCIES = $(top_builddir)/libglib.la
++list_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ list_test_LDFLAGS =
+ node_test_SOURCES = node-test.c
+ node_test_OBJECTS = node-test.o
+-node_test_DEPENDENCIES = $(top_builddir)/libglib.la
++node_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ node_test_LDFLAGS =
+ relation_test_SOURCES = relation-test.c
+ relation_test_OBJECTS = relation-test.o
+-relation_test_DEPENDENCIES = $(top_builddir)/libglib.la
++relation_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ relation_test_LDFLAGS =
+ slist_test_SOURCES = slist-test.c
+ slist_test_OBJECTS = slist-test.o
+-slist_test_DEPENDENCIES = $(top_builddir)/libglib.la
++slist_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ slist_test_LDFLAGS =
+ string_test_SOURCES = string-test.c
+ string_test_OBJECTS = string-test.o
+-string_test_DEPENDENCIES = $(top_builddir)/libglib.la
++string_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ string_test_LDFLAGS =
+ strfunc_test_SOURCES = strfunc-test.c
+ strfunc_test_OBJECTS = strfunc-test.o
+-strfunc_test_DEPENDENCIES = $(top_builddir)/libglib.la
++strfunc_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ strfunc_test_LDFLAGS =
+ tree_test_SOURCES = tree-test.c
+ tree_test_OBJECTS = tree-test.o
+-tree_test_DEPENDENCIES = $(top_builddir)/libglib.la
++tree_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ tree_test_LDFLAGS =
+ type_test_SOURCES = type-test.c
+ type_test_OBJECTS = type-test.o
+-type_test_DEPENDENCIES = $(top_builddir)/libglib.la
++type_test_DEPENDENCIES = $(top_builddir)/libglib12.la
+ type_test_LDFLAGS =
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index fcb74bc9edae..32343d705d05 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -9,7 +9,17 @@
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3765: checking for $ac_func" >&5
-@@ -5302,11 +5302,13 @@
+@@ -4610,6 +4610,9 @@
+ linux*)
+ G_MODULE_LDFLAGS='-rdynamic'
+ ;;
++ freebsd*)
++ G_MODULE_LDFLAGS='-Wl,-E'
++ ;;
+ esac
+ LIBS_orig="$LIBS"
+ LDFLAGS_orig="$LDFLAGS"
+@@ -5302,11 +5305,13 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
@@ -23,180 +33,12 @@
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ have_poll=no
+ else
-+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
++ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi
;;
esac
-@@ -5315,7 +5317,7 @@
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
- cat > conftest.$ac_ext <<EOF
--#line 5319 "configure"
-+#line 5321 "configure"
- #include "confdefs.h"
- #include <time.h>
- EOF
-@@ -5332,7 +5334,7 @@
- CPPFLAGS=$old_CPPFLAGS
-
- echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
--echo "configure:5336: checking necessary compiler options" >&5
-+echo "configure:5338: checking necessary compiler options" >&5
-
- echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
- else
-@@ -5350,12 +5352,12 @@
- for ac_func in localtime_r rand_r
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5354: checking for $ac_func" >&5
-+echo "configure:5356: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5359 "configure"
-+#line 5361 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -5378,7 +5380,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5404,7 +5406,7 @@
-
- if test "$ac_cv_header_pwd_h" = "yes"; then
- echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6
--echo "configure:5408: checking for getpwuid_r" >&5
-+echo "configure:5410: checking for getpwuid_r" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5412,7 +5414,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5416 "configure"
-+#line 5418 "configure"
- #include "confdefs.h"
- #include <errno.h>
- int main () { char buffer[10000], *pointer;
-@@ -5423,7 +5425,7 @@
- sizeof (buffer), &pointer);
- return errno == ENOSYS;}
- EOF
--if { (eval echo configure:5427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_func_getpwuid_r=yes
- else
-@@ -5448,20 +5450,20 @@
- fi
- if test "$ac_cv_func_getpwuid_r" = "yes"; then
- echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6
--echo "configure:5452: checking whether getpwuid_r is posix like" >&5
-+echo "configure:5454: checking whether getpwuid_r is posix like" >&5
- # getpwuid_r(0, NULL, NULL, 0) is the signature on
- # solaris, if that is not found, the prog below won't
- # compile, then the posix signature is assumed as
- # the default.
- cat > conftest.$ac_ext <<EOF
--#line 5458 "configure"
-+#line 5460 "configure"
- #include "confdefs.h"
- #include <pwd.h>
- int main() {
- getpwuid_r(0, NULL, NULL, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:5465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
- else
-@@ -5479,17 +5481,17 @@
- fi
- if test x"$have_threads" = xposix; then
- echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6
--echo "configure:5483: checking whether pthread_getspecific is posix like" >&5
-+echo "configure:5485: checking whether pthread_getspecific is posix like" >&5
- # PCThreads has pthread_getspecific(pthread_key_t, void **);
- cat > conftest.$ac_ext <<EOF
--#line 5486 "configure"
-+#line 5488 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- int main() {
- pthread_getspecific(0,NULL);
- ; return 0; }
- EOF
--if { (eval echo configure:5493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- echo "$ac_t""no" 1>&6
- else
-@@ -5530,7 +5532,7 @@
- case "$mutex_has_default" in
- "yes")
- echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5534: checking size of $mutex_default_type" >&5
-+echo "configure:5536: checking size of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5538,7 +5540,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5542 "configure"
-+#line 5544 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5550,7 +5552,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:5554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- glib_cv_sizeof_gmutex=`cat conftestval`
- else
-@@ -5570,7 +5572,7 @@
-
-
- echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
--echo "configure:5574: checking byte contents of $mutex_default_type" >&5
-+echo "configure:5576: checking byte contents of $mutex_default_type" >&5
- if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5578,7 +5580,7 @@
- glib_cv_byte_contents_gmutex=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 5582 "configure"
-+#line 5584 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <$mutex_header_file>
-@@ -5595,7 +5597,7 @@
- exit(0);
- }
- EOF
--if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- glib_cv_byte_contents_gmutex=`cat conftestval`
- else
-@@ -5623,6 +5625,63 @@
+@@ -5623,6 +5628,63 @@
@@ -204,12 +46,12 @@
+ for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5633: checking for $ac_func" >&5
++echo "configure:5636: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
-+#line 5638 "configure"
++#line 5641 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
@@ -232,7 +74,7 @@
+
+; return 0; }
+EOF
-+if { (eval echo configure:5661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+else
@@ -260,26 +102,3 @@
glib_sysdefso="glibconfig-sysdefs.h"
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -5631,7 +5690,7 @@
- glib_nl='\n'
- fi
- echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
--echo "configure:5635: checking system definitions for $glib_sysdef_msg" >&5
-+echo "configure:5694: checking system definitions for $glib_sysdef_msg" >&5
- cat >confrun.c <<_______EOF
- #include <stdio.h>
- #include <sys/types.h>
-@@ -5658,11 +5717,11 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 5662 "configure"
-+#line 5721 "configure"
- #include "confdefs.h"
- `cat confrun.c`
- EOF
--if { (eval echo configure:5666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- echo "$ac_t""done" 1>&6
- else
diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr
index 469154423427..65e7944cba86 100644
--- a/devel/glib20/pkg-descr
+++ b/devel/glib20/pkg-descr
@@ -1,10 +1,7 @@
-This is GLib version 1.1. GLib, is a library which includes support
+This is GLib version 1.2. GLib, is a library which includes support
routines for C such as lists, trees, hashes, memory allocation, and
many other things.
-Versions of GLib prior to 1.1.0 are distributed with GTK+ versions 1.1.0
-and earlier.
-
The official ftp site is:
ftp://ftp.gtk.org/pub/gtk
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index a2c5ff7fd2f2..85ba872ce363 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,24 +1,24 @@
-bin/glib11d-config
-include/glib11d/glib.h
-include/glib11d/glibconfig.h
-include/glib11d/gmodule.h
+bin/glib12-config
+include/glib12/glib.h
+include/glib12/glibconfig.h
+include/glib12/gmodule.h
@unexec install-info --delete %D/info/glib.info %D/info/dir
info/glib.info
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@exec install-info %D/info/glib.info %D/info/dir
-lib/libglib11d.a
-lib/libglib11d.la
-lib/libglib11d.so
-lib/libglib11d.so.2.1
-lib/libgmodule11d.a
-lib/libgmodule11d.la
-lib/libgmodule11d.so
-lib/libgmodule11d.so.2.1
-lib/libgthread11d.a
-lib/libgthread11d.la
-lib/libgthread11d.so
-lib/libgthread11d.so.2.1
+lib/libglib12.a
+lib/libglib12.la
+lib/libglib12.so
+lib/libglib12.so.1
+lib/libgmodule12.a
+lib/libgmodule12.la
+lib/libgmodule12.so
+lib/libgmodule12.so.1
+lib/libgthread12.a
+lib/libgthread12.la
+lib/libgthread12.so
+lib/libgthread12.so.1
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
share/aclocal/glib.m4
-@dirrm include/glib11d
+@dirrm include/glib12
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 5ec60bc94737..20c8a4d1930d 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libgtop
-# Version required: 0.99.8
+# Version required: 1.0.1
# Date Created: 26 Sep 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.15 1999/02/18 18:56:34 vanilla Exp $
+# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $
#
-DISTNAME= libgtop-0.99.8
+DISTNAME= libgtop-1.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= libgtop
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= nacai@iname.com
@@ -17,13 +17,14 @@ LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \
guile.4:${PORTSDIR}/lang/guile
# implicit dependencies:
-# gettext, glib11-devel
+# gettext, glib12
+USE_PERL5= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-USE_GMAKE= yes
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 896262b866c9..b94d8e687186 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4
+MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index 54c2bf09c267..54222f5d5c89 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -1,99 +1,16 @@
--- lib/Makefile.in.orig Wed Jan 6 03:54:31 1999
-+++ lib/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/common/Makefile.in.orig Wed Jan 6 03:53:49 1999
-+++ sysdeps/common/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/freebsd/Makefile.in.orig Wed Jan 6 03:54:24 1999
-+++ sysdeps/freebsd/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/names/Makefile.in.orig Wed Jan 6 03:54:09 1999
-+++ sysdeps/names/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/guile/Makefile.in.orig Fri Jan 8 11:23:00 1999
-+++ sysdeps/guile/Makefile.in Fri Jan 8 11:26:57 1999
-@@ -126,9 +126,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_CURRENT = 1
-+LT_RELEASE = 0
-+LT_REVISION = 0
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
---- sysdeps/guile/names/Makefile.in.orig Wed Jan 6 03:54:02 1999
-+++ sysdeps/guile/names/Makefile.in Fri Jan 8 11:27:22 1999
-@@ -126,9 +126,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_CURRENT = 1
-+LT_RELEASE = 0
-+LT_REVISION = 0
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
---- po/Makefile.in.in.orig Wed Jan 6 03:50:44 1999
-+++ po/Makefile.in.in Thu Jan 7 21:47:02 1999
-@@ -18,7 +18,7 @@
+--- src/daemon/Makefile.in.orig Tue Mar 2 18:48:38 1999
++++ src/daemon/Makefile.in Tue Mar 2 18:49:07 1999
+@@ -191,7 +191,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
---- Makefile.in.orig Wed Feb 17 18:34:29 1999
-+++ Makefile.in Fri Feb 19 01:58:32 1999
-@@ -174,7 +174,7 @@
-
- @BUILD_GNOME_SUPPORT_TRUE@support = support
--SUBDIRS = po intl $(support) macros misc include sysdeps lib src $(examples_SUBDIRS)
-+SUBDIRS = po intl macros misc include sysdeps lib src
+ libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
+-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@
++libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
- include_HEADERS = glibtop.h
+ EXTRA_DIST = server_config.h.in server_config.pl
+--- Makefile.in.orig Wed Feb 17 18:34:29 1999
++++ Makefile.in Fri Feb 19 01:58:32 1999
@@ -182,7 +182,7 @@
EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 RELNOTES-1.0 libgtop-sysdeps.m4 ANNOUNCE-0.25 ANNOUNCE-1.0 README NEWS.old libgtop-mirror.sh
diff --git a/devel/libgtop/files/patch-ac b/devel/libgtop/files/patch-ac
index aa98d434341a..4669680a3127 100644
--- a/devel/libgtop/files/patch-ac
+++ b/devel/libgtop/files/patch-ac
@@ -1,21 +1,24 @@
---- configure.orig Tue Feb 16 22:50:48 1999
-+++ configure Fri Feb 19 02:02:47 1999
-@@ -2982,13 +2982,13 @@
- fi
-
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:2987: checking for gnomeConf.sh file in $gnome_prefix" >&5
-- if test -f $gnome_prefix/gnomeConf.sh; then
-+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:2987: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+ if test -f $prefix/share/gnome/gnomeConf.sh; then
- echo "$ac_t""found" 1>&6
- echo "loading gnome configuration from" \
-- "$gnome_prefix/gnomeConf.sh"
-- . $gnome_prefix/gnomeConf.sh
-+ "$prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
- gnome_found=yes
- else
- echo "$ac_t""not found" 1>&6
+--- configure.orig Sun Feb 28 13:10:54 1999
++++ configure Tue Mar 2 18:33:43 1999
+@@ -965,9 +965,9 @@
+
+ # libtool versioning
+ LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
+-LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
+-LT_REVISION=$LIBGTOP_INTERFACE_AGE
+-LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
++LT_CURRENT=1
++LT_REVISION=0
++LT_AGE=0
+ LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
+
+
+@@ -7698,7 +7698,7 @@
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ fi
+ rm -f conftest*
+ INSTOBJEXT=.mo
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 5ec60bc94737..20c8a4d1930d 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libgtop
-# Version required: 0.99.8
+# Version required: 1.0.1
# Date Created: 26 Sep 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.15 1999/02/18 18:56:34 vanilla Exp $
+# $Id: Makefile,v 1.16 1999/02/25 01:17:23 asami Exp $
#
-DISTNAME= libgtop-0.99.8
+DISTNAME= libgtop-1.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= libgtop
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= nacai@iname.com
@@ -17,13 +17,14 @@ LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \
guile.4:${PORTSDIR}/lang/guile
# implicit dependencies:
-# gettext, glib11-devel
+# gettext, glib12
+USE_PERL5= yes
+USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-USE_GMAKE= yes
post-install:
@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 896262b866c9..b94d8e687186 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (libgtop-0.99.8.tar.gz) = 3cae59e8e94912483373561abf4937c4
+MD5 (libgtop-1.0.1.tar.gz) = f9b1c3c6f6eb178016a5213ab43a0219
diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
index 54c2bf09c267..54222f5d5c89 100644
--- a/devel/libgtop2/files/patch-ab
+++ b/devel/libgtop2/files/patch-ab
@@ -1,99 +1,16 @@
--- lib/Makefile.in.orig Wed Jan 6 03:54:31 1999
-+++ lib/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/common/Makefile.in.orig Wed Jan 6 03:53:49 1999
-+++ sysdeps/common/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/freebsd/Makefile.in.orig Wed Jan 6 03:54:24 1999
-+++ sysdeps/freebsd/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/names/Makefile.in.orig Wed Jan 6 03:54:09 1999
-+++ sysdeps/names/Makefile.in Thu Jan 7 21:47:02 1999
-@@ -129,7 +129,7 @@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
--LT_VERSION_INFO = @LT_VERSION_INFO@
-+LT_VERSION_INFO = -version-info 1:0:0
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
---- sysdeps/guile/Makefile.in.orig Fri Jan 8 11:23:00 1999
-+++ sysdeps/guile/Makefile.in Fri Jan 8 11:26:57 1999
-@@ -126,9 +126,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_CURRENT = 1
-+LT_RELEASE = 0
-+LT_REVISION = 0
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
---- sysdeps/guile/names/Makefile.in.orig Wed Jan 6 03:54:02 1999
-+++ sysdeps/guile/names/Makefile.in Fri Jan 8 11:27:22 1999
-@@ -126,9 +126,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
--LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_CURRENT = 1
-+LT_RELEASE = 0
-+LT_REVISION = 0
- LT_VERSION_INFO = @LT_VERSION_INFO@
- MAKEINFO = @MAKEINFO@
- MKINSTALLDIRS = @MKINSTALLDIRS@
---- po/Makefile.in.in.orig Wed Jan 6 03:50:44 1999
-+++ po/Makefile.in.in Thu Jan 7 21:47:02 1999
-@@ -18,7 +18,7 @@
+--- src/daemon/Makefile.in.orig Tue Mar 2 18:48:38 1999
++++ src/daemon/Makefile.in Tue Mar 2 18:49:07 1999
+@@ -191,7 +191,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = $(prefix)/share
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
---- Makefile.in.orig Wed Feb 17 18:34:29 1999
-+++ Makefile.in Fri Feb 19 01:58:32 1999
-@@ -174,7 +174,7 @@
-
- @BUILD_GNOME_SUPPORT_TRUE@support = support
--SUBDIRS = po intl $(support) macros misc include sysdeps lib src $(examples_SUBDIRS)
-+SUBDIRS = po intl macros misc include sysdeps lib src
+ libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
+-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@
++libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la $(top_builddir)/sysdeps/common/libgtop_suid_common.la @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
- include_HEADERS = glibtop.h
+ EXTRA_DIST = server_config.h.in server_config.pl
+--- Makefile.in.orig Wed Feb 17 18:34:29 1999
++++ Makefile.in Fri Feb 19 01:58:32 1999
@@ -182,7 +182,7 @@
EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 RELNOTES-1.0 libgtop-sysdeps.m4 ANNOUNCE-0.25 ANNOUNCE-1.0 README NEWS.old libgtop-mirror.sh
diff --git a/devel/libgtop2/files/patch-ac b/devel/libgtop2/files/patch-ac
index aa98d434341a..4669680a3127 100644
--- a/devel/libgtop2/files/patch-ac
+++ b/devel/libgtop2/files/patch-ac
@@ -1,21 +1,24 @@
---- configure.orig Tue Feb 16 22:50:48 1999
-+++ configure Fri Feb 19 02:02:47 1999
-@@ -2982,13 +2982,13 @@
- fi
-
- if test "$no_gnome_config" = "yes"; then
-- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:2987: checking for gnomeConf.sh file in $gnome_prefix" >&5
-- if test -f $gnome_prefix/gnomeConf.sh; then
-+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:2987: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+ if test -f $prefix/share/gnome/gnomeConf.sh; then
- echo "$ac_t""found" 1>&6
- echo "loading gnome configuration from" \
-- "$gnome_prefix/gnomeConf.sh"
-- . $gnome_prefix/gnomeConf.sh
-+ "$prefix/share/gnome/gnomeConf.sh"
-+ . $prefix/share/gnome/gnomeConf.sh
- gnome_found=yes
- else
- echo "$ac_t""not found" 1>&6
+--- configure.orig Sun Feb 28 13:10:54 1999
++++ configure Tue Mar 2 18:33:43 1999
+@@ -965,9 +965,9 @@
+
+ # libtool versioning
+ LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
+-LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
+-LT_REVISION=$LIBGTOP_INTERFACE_AGE
+-LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
++LT_CURRENT=1
++LT_REVISION=0
++LT_AGE=0
+ LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
+
+
+@@ -7698,7 +7698,7 @@
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ fi
+ rm -f conftest*
+ INSTOBJEXT=.mo