From owner-freebsd-ports Sat May 22 15:50:40 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 1A9E714C97 for ; Sat, 22 May 1999 15:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id PAA61247; Sat, 22 May 1999 15:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (Postfix) with ESMTP id C92A614C3D for ; Sat, 22 May 1999 15:46:19 -0700 (PDT) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by shale.csir.co.za (8.9.3/8.9.3) id AAA38748; Sun, 23 May 1999 00:46:17 +0200 (SAT) (envelope-from reg) Message-Id: <199905222246.AAA38748@shale.csir.co.za> Date: Sun, 23 May 1999 00:46:17 +0200 (SAT) From: reg@shale.csir.co.za Reply-To: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/11841: Port update: devel/glib12 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 11841 >Category: ports >Synopsis: Port update: devel/glib12 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat May 22 15:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 4.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports collection. >Description: Update GLib to 1.2.3, and bump the shlib numbers. Update ports which depend on glib12, and fix them up. Major changes to GLib: - USE_LIBTOOL: Means about half the patching is required. - Only use thread flags for libgthread. Stops all GTK+ apps linking in libc_r. - Should work again on a.out systems. Other ports: mostly fix to USE_LIBTOOL. >How-To-Repeat: >Fix: devel/glib12: Upgrade from 1.2.2 to 1.2.3 Changes: Makefile files/md5 patches/patch-ab patches/patch-ac patches/patch-ad patches/patch-ae pkg/PLIST Adds : Removes: japanese/libicq: Changes: Makefile Adds : Removes: misc/xdelta: Changes: Makefile pkg/PLIST Adds : Removes: patches/patch-aa net/libicq: Changes: Makefile pkg/PLIST Adds : Removes: patches/patch-aa patches/patch-ab patches/patch-ac net/xferstats: Changes: Makefile Adds : Removes: --- /usr/ports.ref/devel/glib12/Makefile Fri May 7 02:05:12 1999 +++ devel/glib12/Makefile Sat May 15 18:31:49 1999 @@ -1,12 +1,12 @@ # New ports collection makefile for: glib12 -# Version required: 1.2.2 +# Version required: 1.2.3 # Date Created: 28 July 1998 # Whom: Vanilla I. Shu # # $Id: Makefile,v 1.21 1999/05/06 19:59:12 mharo Exp $ # -DISTNAME= glib-1.2.2 +DISTNAME= glib-1.2.3 CATEGORIES= devel MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ @@ -14,11 +14,9 @@ MAINTAINER= vanilla@FreeBSD.ORG -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12 -MAN1= glib12-config.1 -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +MAN1= glib12-config.1 .include --- /usr/ports.ref/devel/glib12/files/md5 Mon May 3 14:09:05 1999 +++ devel/glib12/files/md5 Sat May 15 18:33:39 1999 @@ -1 +1 @@ -MD5 (glib-1.2.2.tar.gz) = 1ecec788b21ae0b6b6debbe5ff9d5c65 +MD5 (glib-1.2.3.tar.gz) = 56944969be7a7cefdd25171ef4a01c2a --- /usr/ports.ref/devel/glib12/patches/patch-ab Sat Mar 27 13:35:39 1999 +++ devel/glib12/patches/patch-ab Sun May 23 00:30:30 1999 @@ -1,6 +1,6 @@ ---- Makefile.in.orig Thu Jan 28 22:53:35 1999 -+++ Makefile.in Thu Jan 28 22:59:44 1999 -@@ -89,11 +89,11 @@ +--- Makefile.in.orig Tue May 11 05:06:36 1999 ++++ Makefile.in Mon May 17 22:28:24 1999 +@@ -95,11 +95,11 @@ AUTOMAKE_OPTIONS = 1.4 @@ -11,83 +11,29 @@ +configincludedir = $(includedir) -bin_SCRIPTS = glib-config -+bin_SCRIPTS = glib12-config ++bin_SCRIPTS = glib@LT_RELEASE@-config BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h -@@ -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 = 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 - -@@ -113,20 +113,20 @@ - configinclude_DATA = glibconfig.h - - --libglib_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+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 = libglib12.la -+testgdate_LDADD = libglib12.la -+testgdateparser_LDADD = libglib12.la - - m4datadir = $(datadir)/aclocal - m4data_DATA = glib.m4 +@@ -132,7 +132,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = glib.spec glibconfig.h.win32 glib-config -+CONFIG_CLEAN_FILES = glib12-config +-CONFIG_CLEAN_FILES = glib.spec glib-config ++CONFIG_CLEAN_FILES = glib.spec glib@LT_RELEASE@-config LTLIBRARIES = $(lib_LTLIBRARIES) -@@ -144,15 +144,15 @@ - - testglib_SOURCES = testglib.c - testglib_OBJECTS = testglib.o --testglib_DEPENDENCIES = libglib.la -+testglib_DEPENDENCIES = libglib12.la - testglib_LDFLAGS = - testgdate_SOURCES = testgdate.c - testgdate_OBJECTS = testgdate.o --testgdate_DEPENDENCIES = libglib.la -+testgdate_DEPENDENCIES = libglib12.la - testgdate_LDFLAGS = - testgdateparser_SOURCES = testgdateparser.c - testgdateparser_OBJECTS = testgdateparser.o --testgdateparser_DEPENDENCIES = libglib.la -+testgdateparser_DEPENDENCIES = libglib12.la - testgdateparser_LDFLAGS = - SCRIPTS = $(bin_SCRIPTS) - -@@ -226,7 +226,7 @@ +@@ -232,7 +232,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 -+glib12-config: $(top_builddir)/config.status glib12-config.in ++glib@LT_RELEASE@-config: $(top_builddir)/config.status glib@LT_RELEASE@-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status mostlyclean-libLTLIBRARIES: -@@ -292,7 +292,7 @@ - - maintainer-clean-libtool: - --libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) -+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 @@ +@@ -541,7 +541,6 @@ || exit 1; \ fi; \ done @@ -95,7 +41,7 @@ info-am: info: info-recursive -@@ -562,7 +561,7 @@ +@@ -568,7 +567,7 @@ uninstall-configincludeDATA uninstall-m4dataDATA \ uninstall-includeHEADERS uninstall: uninstall-recursive @@ -104,70 +50,19 @@ $(HEADERS) config.h all-redirect: all-recursive-am install-strip: -@@ -640,7 +639,8 @@ +@@ -646,7 +645,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 ++glib@LT_RELEASE@-config.in: glib-config.in ++ cp glib-config.in glib@LT_RELEASE@-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,12 +98,12 @@ - include_HEADERS = gmodule.h - - --libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib12.la # -lglib - --lib_LTLIBRARIES = libgmodule.la libgplugin_a.la libgplugin_b.la -+lib_LTLIBRARIES = libgmodule12.la libgplugin12_a.la libgplugin12_b.la - - libgmodule_la_SOURCES = gmodule.c --libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgmodule_la_LDFLAGS = @G_MODULE_LDFLAGS@ -version-info 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 = libgmodule12.la $(libglib) @G_MODULE_LIBS@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = gmoduleconf.h -@@ -141,7 +141,7 @@ - - testgmodule_SOURCES = testgmodule.c - testgmodule_OBJECTS = testgmodule.o --testgmodule_DEPENDENCIES = libgmodule.la $(top_builddir)/libglib.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) -@@ -226,13 +226,13 @@ - - maintainer-clean-libtool: - --libgmodule.la: $(libgmodule_la_OBJECTS) $(libgmodule_la_DEPENDENCIES) -+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) -+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) -+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 @@ +--- gmodule/Makefile.in.orig Tue May 11 05:06:37 1999 ++++ gmodule/Makefile.in Mon May 17 22:28:24 1999 +@@ -333,7 +333,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS uninstall: uninstall-am @@ -176,63 +71,18 @@ all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -@@ -398,10 +398,10 @@ - echo $$p; \ - done - --install-libLTLIBRARIES: libgmodule.la -+install-libLTLIBRARIES: libgmodule12.la - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) -- @list='libgmodule.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; \ ---- gthread/Makefile.in.orig Thu Jan 28 23:07:14 1999 -+++ gthread/Makefile.in Thu Jan 28 23:09:35 1999 -@@ -92,18 +92,18 @@ - EXTRA_DIST = gthread-posix.c gthread-solaris.c gthread-nspr.c gthread-none.c gthread.def - - --libglib = $(top_builddir)/libglib.la # -lglib -+libglib = $(top_builddir)/libglib12.la # -lglib - --lib_LTLIBRARIES = libgthread.la -+lib_LTLIBRARIES = libgthread12.la - - libgthread_la_SOURCES = gthread.c --libgthread_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -+libgthread_la_LDFLAGS = -version-info 1:0:0 - - - libgthread_la_LIBADD = @G_THREAD_LIBS@ - - noinst_PROGRAMS = testgthread --testgthread_LDADD = ../libglib.la libgthread.la -+testgthread_LDADD = ../libglib12.la libgthread12.la - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = -@@ -120,7 +120,7 @@ - - testgthread_SOURCES = testgthread.c +--- gthread/Makefile.in.orig Tue May 11 05:06:39 1999 ++++ gthread/Makefile.in Mon May 17 22:28:24 1999 +@@ -128,7 +128,7 @@ testgthread_OBJECTS = testgthread.o --testgthread_DEPENDENCIES = ../libglib.la libgthread.la -+testgthread_DEPENDENCIES = ../libglib12.la libgthread12.la + testgthread_DEPENDENCIES = ../libglib.la libgthread.la testgthread_LDFLAGS = - CFLAGS = @CFLAGS@ +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ @G_THREAD_CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -211,7 +211,7 @@ - - maintainer-clean-libtool: - --libgthread.la: $(libgthread_la_OBJECTS) $(libgthread_la_DEPENDENCIES) -+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 @@ + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +@@ -297,7 +297,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall: uninstall-am @@ -241,116 +91,26 @@ 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 @@ +--- docs/Makefile.in.orig Tue May 11 05:06:40 1999 ++++ docs/Makefile.in Mon May 17 22:28:24 1999 +@@ -95,9 +95,9 @@ info_TEXINFOS = glib.texi -man_MANS = glib-config.1 -+man_MANS = glib12-config.1 ++man_MANS = glib@LT_RELEASE@-config.1 -EXTRA_DIST = glib-config.1.in glib.html glib_toc.html -+EXTRA_DIST = glib12-config.1.in glib.html glib_toc.html ++EXTRA_DIST = glib@LT_RELEASE@-config.1.in glib.html glib_toc.html mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h -@@ -125,6 +125,8 @@ +@@ -133,6 +133,8 @@ glib.info: glib.texi glib.dvi: glib.texi -+glib12-config.1: glib-config.1 -+ cp glib-config.1 glib12-config.1 ++glib@LT_RELEASE@-config.1: glib-config.1 ++ cp glib-config.1 glib@LT_RELEASE@-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) --- /usr/ports.ref/devel/glib12/patches/patch-ac Tue Mar 9 03:08:52 1999 +++ devel/glib12/patches/patch-ac Sun May 23 00:30:49 1999 @@ -5,7 +5,7 @@ { cat <&6 - echo "configure:3765: checking for $ac_func" >&5 -@@ -4610,6 +4610,9 @@ + echo "configure:3479: checking for $ac_func" >&5 +@@ -4365,6 +4365,12 @@ linux*) G_MODULE_LDFLAGS='-rdynamic' ;; + freebsd*) -+ G_MODULE_LDFLAGS='-Wl,-E' ++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` ++ if test $objformat = "elf"; then ++ G_MODULE_LDFLAGS='-Wl,-E' ++ fi + ;; esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" -@@ -5302,11 +5305,13 @@ +@@ -5057,11 +5063,14 @@ G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads" fi ;; @@ -28,9 +46,10 @@ - - # 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" ++ G_THREAD_CFLAGS="-D_THREAD_SAFE" ++ G_THREAD_LIBS="-pthread" + have_poll=no + else + G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS" @@ -38,7 +57,17 @@ ;; esac -@@ -5623,6 +5628,63 @@ +@@ -5349,9 +5358,6 @@ + + + +-CFLAGS="$CFLAGS $G_THREAD_CFLAGS" +- +- + case "$mutex_has_default" in + "yes") + echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6 +@@ -5448,6 +5454,63 @@ --- /usr/ports.ref/devel/glib12/pkg/PLIST Fri May 7 02:05:13 1999 +++ devel/glib12/pkg/PLIST Mon May 10 17:48:31 1999 @@ -6,18 +6,16 @@ info/glib.info @exec install-info %D/info/glib.info %D/info/dir lib/libglib12.a -lib/libglib12.la lib/libglib12.so -lib/libglib12.so.1 +lib/libglib12.so.2 lib/libgmodule12.a -lib/libgmodule12.la lib/libgmodule12.so -lib/libgmodule12.so.1 +lib/libgmodule12.so.2 lib/libgthread12.a -lib/libgthread12.la lib/libgthread12.so -lib/libgthread12.so.1 +lib/libgthread12.so.2 @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/glib12 +@unexec rmdir %D/share/aclocal 2>/dev/null || true --- /usr/ports.ref/japanese/libicq/Makefile Sat May 8 16:25:21 1999 +++ japanese/libicq/Makefile Sat May 8 15:59:29 1999 @@ -18,10 +18,12 @@ MAINTAINER= flathill@FreeBSD.ORG -LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 +LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GLIB_CONFIG="${PREFIX}/bin/glib12-config" +CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib --- /usr/ports.ref/misc/xdelta/Makefile Mon May 3 14:21:21 1999 +++ misc/xdelta/Makefile Sun May 23 00:33:25 1999 @@ -13,20 +13,15 @@ MAINTAINER= jmacd@FreeBSD.ORG BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm -LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 +LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 -GNU_CONFIGURE= yes +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config + +USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS=-L${LOCALBASE}/lib \ - INSTALL_SCRIPT='$${INSTALL} -m 755' \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" + GLIB_CONFIG="${GLIB_CONFIG}" MAN1= xdelta.1 - -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi .include --- /usr/ports.ref/misc/xdelta/patches/patch-aa Thu Jan 28 23:31:41 1999 +++ misc/xdelta/patches/patch-aa Sun May 23 00:33:09 1999 @@ -1,44 +0,0 @@ ---- ltmain.sh.orig Sat Jul 4 19:47:32 1998 -+++ ltmain.sh Wed Sep 23 00:17:07 1998 -@@ -967,6 +967,16 @@ - versuffix="$current.$revision" - ;; - -+ freebsd) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ if [ $PORTOBJFORMAT = elf ]; then -+ versuffix="$current"; -+ else -+ versuffix="$current.$revision"; -+ fi -+ ;; -+ - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 ---- ltconfig.orig Sat Jul 4 19:47:31 1998 -+++ ltconfig Wed Sep 23 00:17:07 1998 -@@ -1123,10 +1123,21 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - --freebsd2* | freebsd3*) -+freebsd2*) - version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix $libname.so' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd3* | freebsd4*) -+ version_type=freebsd -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' -+ if [ $PORTOBJFORMAT = elf ]; then -+ finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir' -+ else -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ fi - shlibpath_var=LD_LIBRARY_PATH - ;; - --- /usr/ports.ref/misc/xdelta/pkg/PLIST Sun Feb 21 15:36:15 1999 +++ misc/xdelta/pkg/PLIST Sun May 23 00:34:32 1999 @@ -5,12 +5,11 @@ include/xdser.h @unexec install-info --delete %D/info/xdelta.info %D/info/dir info/xdelta.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/xdelta.info %D/info/dir lib/libxdelta.a -lib/libxdelta.la lib/libxdelta.so lib/libxdelta.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/xdelta.m4 +@unexec rmdir %D/share/aclocal 2>/dev/null || true --- /usr/ports.ref/net/libicq/Makefile Sat May 8 16:31:50 1999 +++ net/libicq/Makefile Mon May 17 02:27:04 1999 @@ -13,9 +13,11 @@ MAINTAINER= flathill@FreeBSD.ORG -LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 +LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 -GNU_CONFIGURE= yes -CONFIGURE_ENV= GLIB_CONFIG="${PREFIX}/bin/glib12-config" +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config + +USE_LIBTOOL= yes +CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" .include --- /usr/ports.ref/net/libicq/patches/patch-aa Mon Mar 15 21:59:22 1999 +++ net/libicq/patches/patch-aa Mon May 17 02:27:36 1999 @@ -1,710 +0,0 @@ ---- ltconfig.orig Mon Mar 15 13:14:36 1999 -+++ ltconfig Mon Mar 15 13:14:36 1999 -@@ -25,57 +25,30 @@ - - # A lot of this script is taken from autoconf-2.10. - --# Check that we are running under the correct shell. --SHELL=${CONFIG_SHELL-/bin/sh} --echo=echo --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell. -- exec "$SHELL" "$0" --no-reexec ${1+"$@"} --fi -- - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. - if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi - --if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then -- # The Solaris, AIX, and Digital Unix default echo programs unquote -- # backslashes. This makes it impossible to quote backslashes using -+echo=echo -+if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : -+else -+ # The Solaris and AIX default echo program unquotes backslashes. -+ # This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' -- # -- # So, first we look for a working echo in the user's PATH. -- IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" -- for dir in $PATH /usr/ucb; do -- if test -f $dir/echo && test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t'; then -- echo="$dir/echo" -- break -- fi -- done -- IFS="$save_ifs" -- -- if test "X$echo" = Xecho; then -- # We didn't find a better echo, so look for alternatives. -- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t'; then -- # This shell has a builtin print -r that does the trick. -- echo='print -r' -- elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then -- # If we have ksh, try running ltconfig again with it. -- CONFIG_SHELL=/bin/ksh -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"} -- else -- # Try using printf. -- echo='printf %s\n' -- if test "X`($echo '\t') 2>/dev/null`" != 'X\t'; then -- # Oops. We lost completely, so just stick with echo. -- echo=echo -+ # So, we emulate echo with printf '%s\n' -+ echo="printf %s\\n" -+ if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : -+ else -+ # Oops. We have no working printf. Try to find a not-so-buggy echo. -+ echo=echo -+ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" -+ for dir in $PATH /usr/ucb; do -+ if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then -+ echo="$dir/echo" -+ break - fi -- fi -+ done -+ IFS="$save_ifs" - fi - fi - -@@ -93,7 +66,7 @@ - # Constants: - PROGRAM=ltconfig - PACKAGE=libtool --VERSION=1.2b -+VERSION=1.2 - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' - rm="rm -f" -@@ -101,7 +74,6 @@ - help="Try \`$progname --help' for more information." - - # Global variables: --default_ofile=libtool - can_build_shared=yes - enable_shared=yes - # All known linkers require a `.a' archive for static linking. -@@ -113,7 +85,6 @@ - ac_config_sub= - host= - nonopt= --ofile="$default_ofile" - verify_host=yes - with_gcc=no - with_gnu_ld=no -@@ -150,12 +121,10 @@ - - Generate a system-specific libtool script. - -- --debug enable verbose shell tracing - --disable-shared do not build shared libraries - --disable-static do not build static libraries - --help display this help and exit - --no-verify do not verify that HOST is a valid host type ---o, --output=FILE specify the output file [default=$default_ofile] - --quiet same as \`--silent' - --silent do not print informational messages - --srcdir=DIR find \`config.guess' in DIR -@@ -171,11 +140,6 @@ - exit 0 - ;; - -- --debug) -- echo "$progname: enabling shell trace mode" -- set -x -- ;; -- - --disable-shared) enable_shared=no ;; - - --disable-static) enable_static=no ;; -@@ -187,9 +151,6 @@ - - --no-verify) verify_host=no ;; - -- --output | -o) prev=ofile ;; -- --output=*) ofile="$optarg" ;; -- - --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;; - - --with-gcc) with_gcc=yes ;; -@@ -224,7 +185,8 @@ - exit 1 - fi - --if test ! -f "$ltmain"; then -+if test -f "$ltmain"; then : -+else - echo "$progname: \`$ltmain' does not exist" 1>&2 - echo "$help" 1>&2 - exit 1 -@@ -302,7 +264,7 @@ - ac_config_sub=$ac_aux_dir/config.sub - - # Make sure we can run config.sub. -- if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then : -+ if $ac_config_sub sun4 >/dev/null 2>&1; then : - else - echo "$progname: cannot run $ac_config_sub" 1>&2 - echo "$help" 1>&2 -@@ -314,14 +276,14 @@ - host_alias=$host - case "$host_alias" in - "") -- if host_alias=`$SHELL $ac_config_guess`; then : -+ if host_alias=`$ac_config_guess`; then : - else - echo "$progname: cannot guess host type; you must specify one" 1>&2 - echo "$help" 1>&2 - exit 1 - fi ;; - esac -- host=`$SHELL $ac_config_sub $host_alias` -+ host=`$ac_config_sub $host_alias` - echo "$ac_t$host" 1>&6 - - # Make sure the host verified. -@@ -459,7 +421,7 @@ - # Now see if the compiler is really GCC. - with_gcc=no - echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6 -- echo "$progname:462: checking whether we are using GNU C" >&5 -+ echo "$progname:424: checking whether we are using GNU C" >&5 - - $rm conftest.c - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - with_gcc=yes - fi - $rm conftest.c -@@ -515,7 +477,7 @@ - link_static_flag='-bnso -bI:/lib/syscalls.exp' - ;; - -- hpux9* | hpux10* | hpux11*) -+ hpux9* | hpux10*) - # Is there a better link_static_flag that works with the bundled CC? - wl='-Wl,' - link_static_flag="${wl}-a ${wl}archive" -@@ -579,11 +541,11 @@ - # Check to make sure the pic_flag actually works. - echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6 - $rm conftest* -- echo "int some_variable = 0;" > conftest.c -+ echo > conftest.c - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $pic_flag -DPIC" -- echo "$progname:585: checking if $compiler PIC flag $pic_flag works" >&5 -- if { (eval echo $progname:586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then -+ echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5 -+ if { (eval echo $progname:548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then - # Append any warnings to the config.log. - cat conftest.err 1>&5 - -@@ -626,8 +588,8 @@ - echo 'main(){return(0);}' > conftest.c - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $link_static_flag" --echo "$progname:629: checking if $compiler static flag $link_static_flag works" >&5 --if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+echo "$progname:591: checking if $compiler static flag $link_static_flag works" >&5 -+if { (eval echo $progname:592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - echo "$ac_t$link_static_flag" 1>&6 - else - echo "$ac_t"none 1>&6 -@@ -659,11 +621,11 @@ - if test "$with_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6 -- echo "$progname:662: checking for ld used by GCC" >&5 -+ echo "$progname:624: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. -- /* | [A-Za-z]:[/\\]*) -+ /* | [A-Za-z]:\\*) - test -z "$LD" && LD="$ac_prog" - ;; - "") -@@ -677,10 +639,10 @@ - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld... $ac_c" 1>&6 -- echo "$progname:680: checking for GNU ld" >&5 -+ echo "$progname:642: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -- echo "$progname:683: checking for non-GNU ld" >&5 -+ echo "$progname:645: checking for non-GNU ld" >&5 - fi - - if test -z "$LD"; then -@@ -732,7 +694,6 @@ - archive_cmds= - old_archive_from_new_cmds= - export_dynamic_flag_spec= --whole_archive_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_direct=no -@@ -740,38 +701,31 @@ - hardcode_shlibpath_var=unsupported - runpath_var= - -+case "$host_os" in -+amigaos* | sunos4*) -+ # On these operating systems, we should treat GNU ld like the system ld. -+ gnu_ld_acts_native=yes -+ ;; -+*) -+ gnu_ld_acts_native=no -+ ;; -+esac -+ - ld_shlibs=yes --if test "$with_gnu_ld" = yes; then -+if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then - - # See if GNU ld supports shared libraries. -- case "$host_os" in -- amigaos*) -- archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)' -- hardcode_libdir_flag_spec='-L$libdir' -- hardcode_minus_L=yes -- ;; -- -- sunos4*) -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs' -- hardcode_direct=yes -- hardcode_minus_L=yes -- hardcode_shlibpath_var=no -- ;; -- -- *) -- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -- archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' -- else -- ld_shlibs=no -- fi -- ;; -- esac -+ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then -+ archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs' -+ runpath_var=LD_RUN_PATH -+ ld_shlibs=yes -+ else -+ ld_shlibs=no -+ fi - - if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' -- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -823,11 +777,11 @@ - ;; - - # FreeBSD 3, at last, uses gcc -shared to do shared libraries. -- freebsd3*) -+ freebsd*) - archive_cmds='$CC -shared -o $lib$libobjs' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -- hardcode_minus_L=no -+ hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - -@@ -839,7 +793,7 @@ - export_dynamic_flag_spec='${wl}-E' - ;; - -- hpux10* | hpux11*) -+ hpux10*) - archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs' - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_direct=yes -@@ -848,11 +802,7 @@ - ;; - - irix5* | irix6*) -- if test "$with_gcc" = yes; then -- archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs' -- else -- archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs' -- fi -+ archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - ;; - -@@ -906,7 +856,15 @@ - ;; - - sunos4*) -- archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs' -+ if test "$with_gcc" = yes; then -+ archive_cmds='$CC -shared -o $lib$libobjs' -+ else -+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs' -+ fi -+ -+ if test "$with_gnu_ld" = yes; then -+ export_dynamic_flag_spec='${wl}-export-dynamic' -+ fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes -@@ -932,7 +890,7 @@ - if test -z "$NM"; then - echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6 - case "$NM" in -- /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path. -+ /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path. - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do -@@ -1010,11 +968,11 @@ - main(){nm_test_var='a';nm_test_func();return(0);} - EOF - --echo "$progname:1013: checking if global_symbol_pipe works" >&5 --if { (eval echo $progname:1014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then -+echo "$progname:971: checking if global_symbol_pipe works" >&5 -+if { (eval echo $progname:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { echo "$progname:1017: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then -+ if { echo "$progname:975: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then - - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then -@@ -1072,7 +1030,7 @@ - save_CFLAGS="$CFLAGS" - LIBS='conftestm.o' - CFLAGS="$CFLAGS$no_builtin_flag" -- if { (eval echo $progname:1075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ if { (eval echo $progname:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - pipe_works=yes - else - echo "$progname: failed program was:" >&5 -@@ -1115,20 +1073,25 @@ - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi --else -- # We cannot hardcode anything, or else we can only hardcode existing -- # directories. -+elif test "$hardcode_direct" != yes && \ -+ test "$hardcode_minus_L" != yes && \ -+ test "$hardcode_shlibpath_var" != yes; then -+ # We cannot hardcode anything. - hardcode_action=unsupported -+else -+ # We can only hardcode existing directories. -+ hardcode_action=relink - fi - echo "$ac_t$hardcode_action" 1>&6 -+test "$hardcode_action" = unsupported && can_build_shared=no - - - reload_flag= - reload_cmds='$LD$reload_flag -o $output$reload_objs' - echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6 - reload_flag='-r' --echo "$ac_t$reload_flag" 1>&6 -+echo "$ac_t$reload_flag" - test -n "$reload_flag" && reload_flag=" $reload_flag" - - # PORTME Fill in your ld.so characteristics -@@ -1147,11 +1110,11 @@ - case "$host_os" in - aix3* | aix4*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix $libname.a' -+ library_names_spec='${libname}${release}.so.$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}.so$major' -+ soname_spec='${libname}${release}.so.$major' - ;; - - amigaos*) -@@ -1160,27 +1123,28 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' - ;; - --freebsd2* | freebsd3*) -- version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix $libname.so' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+freebsd*) -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ version_type=freebsd-$objformat -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' -+ finish_cmds="PATH=\"\$PATH:/sbin\" OBJFORMAT=$objformat ldconfig -m \$libdir" - shlibpath_var=LD_LIBRARY_PATH - ;; - - gnu*) -- version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}.so' -+ version_type=sunos -+ library_names_spec='${libname}${release}.so.$versuffix' - shlibpath_var=LD_LIBRARY_PATH - ;; - --hpux9* | hpux10* | hpux11*) -+hpux9* | hpux10*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - shlibpath_var=SHLIB_PATH -- library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' -- soname_spec='${libname}${release}.sl$major' -+ library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl' -+ soname_spec='${libname}${release}.sl.$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; -@@ -1188,7 +1152,7 @@ - irix5* | irix6*) - version_type=osf - soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix $libname.so' -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1200,9 +1164,9 @@ - # This must be Linux ELF. - linux-gnu*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' -+ soname_spec='${libname}${release}.so.$major' -+ finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - - if test -f /lib/ld.so.1; then -@@ -1218,8 +1182,8 @@ - - netbsd* | openbsd*) - version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix' -- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ library_names_spec='${libname}${release}.so.$versuffix' -+ finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1233,44 +1197,42 @@ - osf3* | osf4*) - version_type=osf - soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so$versuffix $libname.so' -+ library_names_spec='${libname}${release}.so.$versuffix $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - - sco3.2v5*) - version_type=osf -- soname_spec='${libname}${release}.so$major' -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -+ soname_spec='${libname}${release}.so.$major' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - - solaris2*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' -+ soname_spec='${libname}${release}.so.$major' - shlibpath_var=LD_LIBRARY_PATH -- # ldd complains unless libraries are executable -- postinstall_cmds='chmod +x $lib' - ;; - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}.so$versuffix' -- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ library_names_spec='${libname}${release}.so.$versuffix' -+ finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - ;; - - sysv4.2uw2*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' -+ soname_spec='${libname}${release}.so.$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - - uts4*) - version_type=linux -- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' -- soname_spec='${libname}${release}.so$major' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so' -+ soname_spec='${libname}${release}.so.$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1326,7 +1288,7 @@ - for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \ - old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \ - link_static_flag no_builtin_flag export_dynamic_flag_spec \ -- whole_archive_flag_spec libname_spec library_names_spec soname_spec RANLIB \ -+ libname_spec library_names_spec soname_spec RANLIB \ - old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ - old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \ - allow_undefined_flag no_undefined_flag \ -@@ -1346,13 +1308,14 @@ - esac - done - --trap "$rm \"$ofile\"; exit 1" 1 2 15 --echo "creating $ofile" --$rm "$ofile" --cat < "$ofile" --#! $SHELL -+ofile=libtool -+trap "$rm $ofile; exit 1" 1 2 15 -+echo creating $ofile -+$rm $ofile -+cat < $ofile -+#! /bin/sh - --# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# libtool - Provide generalized library-building support services. - # Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION - # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh. - # -@@ -1378,15 +1341,8 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="sed -e s/^X//" -- --# The HP-UX ksh and POSIX shell print the target directory to stdout --# if CDPATH is set. --if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi -- --### BEGIN LIBTOOL CONFIG --# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# This program was configured as follows, -+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # - # CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\ - # LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\ -@@ -1395,25 +1351,32 @@ - # Compiler and other test output produced by $progname, useful for - # debugging $progname, is in ./config.log if it exists. - -+# Sed that helps us avoid accidentally triggering echo(1) options like -n. -+Xsed="sed -e s/^X//" -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi -+ -+# An echo program that does not interpret backslashes. -+echo="$ltecho" -+ - # The version of $progname that generated this script. - LTCONFIG_VERSION="$VERSION" - - # Shell to use when invoking shell scripts. --SHELL="$SHELL" -+SHELL=${CONFIG_SHELL-/bin/sh} - --# Whether or not to build shared libraries. -+# Whether or not to build libtool libraries. - build_libtool_libs=$enable_shared - --# Whether or not to build static libraries. -+# Whether or not to build old-style libraries. - build_old_libs=$enable_static - - # The host system. - host_alias="$host_alias" - host="$host" - --# An echo program that does not interpret backslashes. --echo="$ltecho" -- - # The archiver. - AR="$AR" - -@@ -1451,9 +1414,6 @@ - # Compiler flag to allow reflexive dlopens. - export_dynamic_flag_spec="$export_dynamic_flag_spec" - --# Compiler flag to generate shared objects directly from archives. --whole_archive_flag_spec="$whole_archive_flag_spec" -- - # Library versioning type. - version_type=$version_type - -@@ -1523,12 +1483,12 @@ - # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into - # the resulting binary. - hardcode_shlibpath_var=$hardcode_shlibpath_var -+ - EOF - - case "$host_os" in - aix3*) -- cat <<\EOF >> "$ofile" -- -+ cat <<\EOF >> $ofile - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. -@@ -1536,17 +1496,15 @@ - COLLECT_NAMES= - export COLLECT_NAMES - fi -+ - EOF - ;; - esac - --echo '### END LIBTOOL CONFIG' >> "$ofile" --echo >> "$ofile" -- - # Append the ltmain.sh script. --cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1) -+cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1) - --chmod +x "$ofile" -+chmod +x $ofile - exit 0 - - # Local Variables: --- /usr/ports.ref/net/libicq/patches/patch-ab Mon Mar 15 21:59:22 1999 +++ net/libicq/patches/patch-ab Mon May 17 02:27:27 1999 @@ -1,1180 +0,0 @@ ---- ltmain.sh.orig Mon Mar 15 13:14:36 1999 -+++ ltmain.sh Mon Mar 15 13:14:36 1999 -@@ -23,18 +23,6 @@ - # configuration script generated by Autoconf, you may include it under - # the same distribution terms that you use for the rest of that program. - --# Check that we have a working $echo. --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then -- # Yippee, $echo works! -- : --else -- # Restart under the correct shell, and then maybe $echo will work. -- exec $SHELL "$0" --no-reexec ${1+"$@"} --fi -- - # The name of this program. - progname=`$echo "$0" | sed 's%^.*/%%'` - modename="$progname" -@@ -42,7 +30,7 @@ - # Constants. - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.2b -+VERSION=1.2 - - default_mode= - help="Try \`$progname --help' for more information." -@@ -60,13 +48,8 @@ - # Only set LANG and LC_ALL to C if already set. - # These must not be set unconditionally because not all systems understand - # e.g. LANG=C (notably SCO). --# We save the old values to restore during execute mode. --if test "${LC_ALL+set}" = set; then -- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL --fi --if test "${LANG+set}" = set; then -- save_LANG="$LANG"; LANG=C; export LANG --fi -+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -+if test "${LANG+set}" = set; then LANG=C; export LANG; fi - - if test "$LTCONFIG_VERSION" != "$VERSION"; then - echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2 -@@ -128,16 +111,6 @@ - exit 0 - ;; - -- --config) -- sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0 -- exit 0 -- ;; -- -- --debug) -- echo "$progname: enabling shell trace mode" -- set -x -- ;; -- - --dry-run | -n) - run=: - ;; -@@ -207,7 +180,7 @@ - esac - done - ;; -- *db | *dbx | *strace | *truss) -+ *db | *dbx) - mode=execute - ;; - *install*|cp|mv) -@@ -265,6 +238,7 @@ - ;; - - -static) -+ build_libtool_libs=no - build_old_libs=yes - continue - ;; -@@ -363,7 +337,7 @@ - - # Just move the object, then go on to compile the next one - $show "$mv $obj $libobj" -- $run $mv $obj $libobj || exit $? -+ $run $mv $obj $libobj || exit 1 - - # Allow error messages only from the first compilation. - suppress_output=' >/dev/null 2>&1' -@@ -400,13 +374,10 @@ - - compile_shlibpath= - finalize_shlibpath= -- convenience= -- old_convenience= - deplibs= - dlfiles= - dlprefiles= - export_dynamic=no -- generated= - hardcode_libdirs= - libobjs= - link_against_libtool_libs= -@@ -439,10 +410,8 @@ - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. -- while test $# -gt 0; do -- arg="$1" -- shift -- -+ for arg -+ do - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case "$prev" in -@@ -526,7 +495,7 @@ - -L*) - dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'` - case "$dir" in -- /* | [A-Za-z]:[/\\]*) -+ /* | [A-Za-z]:\\*) - # Add the corresponding hardcode_libdir_flag, if it is not identical. - ;; - *) -@@ -602,7 +571,7 @@ - - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/.o/'` -+ dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'` - prev= - fi - libobjs="$libobjs $arg" -@@ -617,7 +586,7 @@ - old_library= - - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2 - exit 1 -@@ -629,6 +598,11 @@ - *) . ./$arg ;; - esac - -+ if test -z "$libdir"; then -+ $echo "$modename: \`$arg' contains no -rpath information" 1>&2 -+ exit 1 -+ fi -+ - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do -@@ -649,15 +623,6 @@ - dir="$dir/$objdir" - fi - -- if test -z "$libdir"; then -- # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $dir/$old_library"l -- old_convenience="$old_convenience $dir/$old_library" -- compile_command="$compile_command $dir/$old_library" -- finalize_command="$finalize_command $dir/$old_library" -- continue -- fi -- - # This library was specified with -dlopen. - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" -@@ -731,9 +696,8 @@ - fi - - -- lib_linked=yes - case "$hardcode_action" in -- immediate | unsupported) -+ immediate) - if test "$hardcode_direct" = no; then - compile_command="$compile_command $dir/$linklib" - elif test "$hardcode_minus_L" = no; then -@@ -741,15 +705,13 @@ - elif test "$hardcode_shlibpath_var" = no; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" -- else -- lib_linked=no - fi - ;; - - relink) - # We need an absolute path. - case "$dir" in -- /* | [A-Za-z]:[/\\]*) ;; -+ /* | [A-Za-z]:\\*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then -@@ -767,21 +729,15 @@ - elif test "$hardcode_shlibpath_var" = yes; then - compile_shlibpath="$compile_shlibpath$dir:" - compile_command="$compile_command -l$name" -- else -- lib_linked=no - fi - ;; - -- *) -- lib_linked=no -- ;; -+ *) -+ $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2 -+ exit 1 -+ ;; - esac - -- if test "$lib_linked" != yes; then -- $echo "$modename: configuration error: unsupported hardcode properties" -- exit 1 -- fi -- - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - finalize_command="$finalize_command $libdir/$linklib" -@@ -846,7 +802,14 @@ - exit 1 - fi - -- oldlibs= -+ if test -n "$vinfo" && test -n "$release"; then -+ $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi -+ -+ oldlib= -+ oldobjs= - case "$output" in - "") - $echo "$modename: you must specify an output file" 1>&2 -@@ -856,39 +819,16 @@ - - */* | *\\*) - $echo "$modename: output file \`$output' must have no directory components" 1>&2 -- $echo "$help" 1>&2 - exit 1 - ;; - - *.a) -- if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link libtool libraries into archives" 1>&2 -- exit 1 -- fi -- -- if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 -- fi -- -- if test -n "$dlfiles$dlprefiles"; then -- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 -- fi -- -- if test -n "$rpath"; then -- $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 -- fi -- -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 -- fi -- -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 -- fi -- - # Now set the variables for building old libraries. - build_libtool_libs=no -- oldlibs="$output" -+ build_old_libs=yes -+ oldlib="$output" -+ $show "$rm $oldlib" -+ $run $rm $oldlib - ;; - - *.la) -@@ -896,7 +836,7 @@ - case "$output" in - lib*) ;; - *) -- $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 -+ $echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; -@@ -909,6 +849,9 @@ - library_names= - old_library= - dlname= -+ current=0 -+ revision=0 -+ age=0 - - if test -n "$objs"; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1 -@@ -917,12 +860,21 @@ - - # How the heck are we supposed to write a wrapper for a shared library? - if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2 -+ $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2 - exit 1 - fi - - if test -n "$dlfiles$dlprefiles"; then -- $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2 -+ $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2 -+ # Nullify the symbol file. -+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ fi -+ -+ if test -z "$rpath"; then -+ $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 - fi - - set dummy $rpath -@@ -931,250 +883,215 @@ - fi - install_libdir="$2" - -- # Now set the variables for building old libraries. -- oldlibs="$objdir/$libname.a" -- if test -z "$rpath"; then -- # Building a libtool convenience library. -- oldlibs="$objdir/$libname.al $oldlibs" -- build_libtool_libs=convenience -- -- if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 -- fi -- -- if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 -- fi -- else -- -- # Parse the version information argument. -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' -- set dummy $vinfo 0 0 0 -- IFS="$save_ifs" -- -- if test -n "$8"; then -- $echo "$modename: too many parameters to \`-version-info'" 1>&2 -- $echo "$help" 1>&2 -- exit 1 -- fi -- -- current="$2" -- revision="$3" -- age="$4" -- -- # Check that each of the things are valid numbers. -- case "$current" in -- 0 | [1-9] | [1-9][0-9]*) ;; -- *) -- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -- ;; -- esac -+ # Parse the version information argument. -+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=':' -+ set dummy $vinfo -+ IFS="$save_ifs" - -- case "$revision" in -- 0 | [1-9] | [1-9][0-9]*) ;; -- *) -- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -- ;; -- esac -+ if test -n "$5"; then -+ $echo "$modename: too many parameters to \`-version-info'" 1>&2 -+ $echo "$help" 1>&2 -+ exit 1 -+ fi - -- case "$age" in -- 0 | [1-9] | [1-9][0-9]*) ;; -- *) -- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -- ;; -- esac -+ test -n "$2" && current="$2" -+ test -n "$3" && revision="$3" -+ test -n "$4" && age="$4" -+ -+ # Check that each of the things are valid numbers. -+ case "$current" in -+ 0 | [1-9] | [1-9][0-9]*) ;; -+ *) -+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ ;; -+ esac - -- if test $age -gt $current; then -- $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 -- $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -- exit 1 -- fi -+ case "$revision" in -+ 0 | [1-9] | [1-9][0-9]*) ;; -+ *) -+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ ;; -+ esac - -- # Calculate the version variables. -- major= -- versuffix= -- verstring= -- case "$version_type" in -- none) ;; -- -- linux) -- major=.`expr $current - $age` -- versuffix="$major.$age.$revision" -- ;; -+ case "$age" in -+ 0 | [1-9] | [1-9][0-9]*) ;; -+ *) -+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ ;; -+ esac - -- osf) -- major=`expr $current - $age` -- versuffix=".$current.$age.$revision" -- verstring="$current.$age.$revision" -- -- # Add in all the interfaces that we are compatible with. -- loop=$age -- while test $loop != 0; do -- iface=`expr $current - $loop` -- loop=`expr $loop - 1` -- verstring="$verstring:${iface}.0" -- done -+ if test $age -gt $current; then -+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 -+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -+ exit 1 -+ fi - -- # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -- ;; -+ # Calculate the version variables. -+ version_vars="version_type current age revision" -+ case "$version_type" in -+ none) ;; -+ -+ linux) -+ version_vars="$version_vars major versuffix" -+ major=`expr $current - $age` -+ versuffix="$major.$age.$revision" -+ ;; -+ -+ osf) -+ version_vars="$version_vars versuffix verstring" -+ major=`expr $current - $age` -+ versuffix="$current.$age.$revision" -+ verstring="$versuffix" -+ -+ # Add in all the interfaces that we are compatible with. -+ loop=$age -+ while test $loop != 0; do -+ iface=`expr $current - $loop` -+ loop=`expr $loop - 1` -+ verstring="$verstring:${iface}.0" -+ done - -- sunos) -- major=".$current" -- versuffix=".$current.$revision" -- ;; -+ # Make executables depend on our current version. -+ verstring="$verstring:${current}.0" -+ ;; - -- *) -- $echo "$modename: unknown library version type \`$version_type'" 1>&2 -- echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -- exit 1 -- ;; -- esac -+ sunos) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ versuffix="$current.$revision" -+ ;; - -- # Clear the version info if we defaulted, and they specified a release. -- if test -z "$vinfo" && test -n "$release"; then -- major= -- versuffix= -- verstring="0.0" -- fi -+ freebsd-aout) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ versuffix="$current.$revision"; -+ ;; - -- # Check to see if the archive will have undefined symbols. -- if test "$allow_undefined" = yes; then -- if test "$allow_undefined_flag" = unsupported; then -- $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 -- build_libtool_libs=no -- build_old_libs=yes -- fi -- else -- # Don't allow undefined symbols. -- allow_undefined_flag="$no_undefined_flag" -- fi -+ freebsd-elf) -+ version_vars="$version_vars major versuffix" -+ major="$current" -+ versuffix="$current"; -+ ;; - -- # Add libc to deplibs on all systems. -- dependency_libs="$deplibs" -- deplibs="$deplibs -lc" -- fi -+ *) -+ $echo "$modename: unknown library version type \`$version_type'" 1>&2 -+ echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 -+ exit 1 -+ ;; -+ esac - - # Create the output directory, or remove our outputs if we need to. - if test -d $objdir; then -- $show "${rm}r $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*" -- $run ${rm}r $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.* -+ $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*" -+ $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.* - else - $show "$mkdir $objdir" - $run $mkdir $objdir -- status=$? -- if test $status -ne 0 && test ! -d $objdir; then -- exit $status -+ status=$? -+ if test $status -eq 0 || test -d $objdir; then : -+ else -+ exit $status -+ fi -+ fi -+ -+ # Check to see if the archive will have undefined symbols. -+ if test "$allow_undefined" = yes; then -+ if test "$allow_undefined_flag" = unsupported; then -+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 -+ build_libtool_libs=no -+ build_old_libs=yes - fi -+ else -+ # Don't allow undefined symbols. -+ allow_undefined_flag="$no_undefined_flag" - fi - -+ # Add libc to deplibs on all systems. -+ dependency_libs="$deplibs" -+ deplibs="$deplibs -lc" -+ - if test "$build_libtool_libs" = yes; then -- # Get the real and link names of the library. -- eval library_names=\"$library_names_spec\" -- set dummy $library_names -- realname="$2" -- shift; shift -+ # Get the real and link names of the library. -+ eval library_names=\"$library_names_spec\" -+ set dummy $library_names -+ realname="$2" -+ shift; shift - -- if test -n "$soname_spec"; then -- eval soname=\"$soname_spec\" -- else -- soname="$realname" -- fi -+ if test -n "$soname_spec"; then -+ eval soname=\"$soname_spec\" -+ else -+ soname="$realname" -+ fi - -- lib="$objdir/$realname" -+ lib="$objdir/$realname" - for link - do - linknames="$linknames $link" - done - -- # Use standard objects if they are PIC. -- test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` -- -- # Transform .lo files to .o files. -- test "$build_old_libs" = yes && oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` -+ # Use standard objects if they are PIC. -+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'` - -- if test -n "$whole_archive_flag_spec"; then -- if test -n "$convenience"; then -- eval libobjs=\"\$libobjs $whole_archive_flag_spec\" -- fi -- else -- for xlib in $convenience; do -- # Extract the objects. -- xdir="$xlib"x -- generated="$generated $xdir" -- xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'` -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x ../$xlib)" -- $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $? -- -- libobjs="$libobjs `echo $xdir/*`" -- done -- fi -- -- # Do each of the archive commands. -- eval cmds=\"$archive_cmds\" -- IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' -- for cmd in $cmds; do -- IFS="$save_ifs" -- $show "$cmd" -- $run eval "$cmd" || exit $? -- done -- IFS="$save_ifs" -+ # Do each of the archive commands. -+ eval cmds=\"$archive_cmds\" -+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=';' -+ for cmd in $cmds; do -+ IFS="$save_ifs" -+ $show "$cmd" -+ $run eval "$cmd" || exit $? -+ done -+ IFS="$save_ifs" - -- # Create links to the real library. -- for linkname in $linknames; do -- if test "$realname" != "$linkname"; then -- $show "(cd $objdir && $LN_S $realname $linkname)" -- $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $? -- fi -- done -+ # Create links to the real library. -+ for linkname in $linknames; do -+ $show "(cd $objdir && $LN_S $realname $linkname)" -+ $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $? -+ done - -- # If -export-dynamic was specified, set the dlname. -- if test "$export_dynamic" = yes; then -- # On all known operating systems, these are identical. -- dlname="$soname" -- fi -+ # If -export-dynamic was specified, set the dlname. -+ if test "$export_dynamic" = yes; then -+ # On all known operating systems, these are identical. -+ dlname="$soname" -+ fi - fi -+ -+ # Now set the variables for building old libraries. -+ oldlib="$objdir/$libname.a" - ;; - - *.lo | *.o) - if test -n "$link_against_libtool_libs"; then -- $echo "$modename: error: cannot link libtool libraries into objects" 1>&2 -+ $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2 - exit 1 - fi - - if test -n "$deplibs"; then -- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 -+ $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles"; then -- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 -+ $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2 -+ # Nullify the symbol file. -+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test -n "$rpath"; then -- $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 -+ $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2 - fi - - if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 -+ $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2 - fi - - if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 -+ $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 - fi - - case "$output" in -@@ -1234,7 +1151,7 @@ - else - # Just create a symlink. - $show "$LN_S $obj $libobj" -- $run $LN_S $obj $libobj || exit $? -+ $run $LN_S $obj $libobj || exit 1 - fi - - exit 0 -@@ -1242,11 +1159,11 @@ - - *) - if test -n "$vinfo"; then -- $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 -+ $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2 - fi - - if test -n "$release"; then -- $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 -+ $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2 - fi - - if test -n "$rpath"; then -@@ -1318,7 +1235,8 @@ - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? -- if test $status -ne 0 && test ! -d $objdir; then -+ if test $status -eq 0 || test -d $objdir; then : -+ else - exit $status - fi - fi -@@ -1449,11 +1367,13 @@ - finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'` - - # Create the binary in the object directory, then wrap it. -- if test ! -d $objdir; then -+ if test -d $objdir; then : -+ else - $show "$mkdir $objdir" - $run $mkdir $objdir - status=$? -- if test $status -ne 0 && test ! -d $objdir; then -+ if test $status -eq 0 || test -d $objdir; then : -+ else - exit $status - fi - fi -@@ -1463,7 +1383,7 @@ - rpath= - for dir in $temp_rpath; do - case "$dir" in -- /* | [A-Za-z]:[/\\]*) -+ /* | [A-Za-z]:\\*) - # Absolute path. - rpath="$rpath$dir:" - ;; -@@ -1496,11 +1416,13 @@ - finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command" - fi - -- if test "$hardcode_action" = relink; then -+ case "$hardcode_action" in -+ relink) - # AGH! Flame the AIX and HP-UX people for me, will ya? - $echo "$modename: warning: using a buggy system linker" 1>&2 - $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2 -- fi -+ ;; -+ esac - - $show "$compile_command" - $run eval "$compile_command" || exit $? -@@ -1520,10 +1442,10 @@ - trap "$rm $output; exit 1" 1 2 15 - - $echo > $output "\ --#! $SHELL -+#! /bin/sh - - # $output - temporary wrapper script for $objdir/$output --# Generated by $PROGRAM - GNU $PACKAGE $VERSION -+# Generated by ltmain.sh - GNU $PACKAGE $VERSION - # - # The $output program cannot be directly executed until all the libtool - # libraries that it depends on are installed. -@@ -1547,20 +1469,10 @@ - finalize_command=\"$finalize_command\" - else - # When we are sourced in execute mode, \$file and \$echo are already set. -- if test \"\$libtool_execute_magic\" != \"$magic\"; then -+ if test \"\$libtool_execute_magic\" = \"$magic\"; then : -+ else - echo=\"$qecho\" - file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$echo works! -- : -- else -- # Restart under the correct shell, and then maybe \$echo will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -- fi - fi\ - " - $echo >> $output "\ -@@ -1577,7 +1489,7 @@ - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in -- /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;; -+ /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi -@@ -1637,36 +1549,9 @@ - esac - - # See if we need to build an old-fashioned archive. -- for oldlib in $oldlibs; do -- -- if test "$build_libtool_libs" = convenience; then -- oldobjs="$libobjs" -- addlibs="$convenience" -- build_libtool_libs=no -- else -- addlibs="$old_convenience" -- fi -- -- # Add in members from convenience archives. -- for xlib in $addlibs; do -- # Extract the objects. -- xdir="$xlib"x -- generated="$generated $xdir" -- xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'` -- -- $show "${rm}r $xdir" -- $run ${rm}r "$xdir" -- $show "mkdir $xdir" -- $run mkdir "$xdir" -- status=$? -- if test $status -ne 0 && test ! -d "$xdir"; then -- exit $status -- fi -- $show "(cd $xdir && $AR x ../$xlib)" -- $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $? -- -- oldobjs="$oldobjs `echo $xdir/*`" -- done -+ if test "$build_old_libs" = "yes"; then -+ # Transform .lo files to .o files. -+ oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^ ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'` - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then -@@ -1681,11 +1566,6 @@ - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" -- done -- -- if test -n "$generated"; then -- $show "${rm}r$generated" -- $run ${rm}r$generated - fi - - # Now create the libtool archive. -@@ -1693,13 +1573,14 @@ - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.a" -+ - $show "creating $output" - - # Only create the output if not a dry run. - if test -z "$run"; then - $echo > $output "\ - # $output - a libtool library file --# Generated by $PROGRAM - GNU $PACKAGE $VERSION -+# Generated by ltmain.sh - GNU $PACKAGE $VERSION - - # The name that we can dlopen(3). - dlname='$dlname' -@@ -1726,7 +1607,7 @@ - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $objdir && $LN_S ../$output $output)" -- $run eval "(cd $objdir && $LN_S ../$output $output)" || exit $? -+ $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1 - ;; - esac - exit 0 -@@ -1736,7 +1617,7 @@ - install) - modename="$modename: install" - -- # There may be an optional sh(1) argument at the beginning of -+ # There may be an optional /bin/sh argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL"; then - # Aesthetically quote it. -@@ -1770,7 +1651,7 @@ - opts= - prev= - install_type= -- isdir=no -+ isdir= - stripme= - for arg - do -@@ -1840,7 +1721,7 @@ - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes -- if test "$isdir" = yes; then -+ if test -n "$isdir"; then - destdir="$dest" - destname= - else -@@ -1857,7 +1738,7 @@ - fi - fi - case "$destdir" in -- /* | [A-Za-z]:[/\\]*) ;; -+ /* | [A-Za-z]:\\*) ;; - *) - for file in $files; do - case "$file" in -@@ -1890,7 +1771,7 @@ - - *.la) - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -@@ -1995,7 +1876,7 @@ - # Deduce the name of the destination old-style object file. - case "$destfile" in - *.lo) -- staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/.o/'` -+ staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'` - ;; - *.o) - staticdest="$destfile" -@@ -2017,7 +1898,7 @@ - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. -- staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/.o/'` -+ staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? -@@ -2026,16 +1907,8 @@ - ;; - - *) -- # Figure out destination file name, if it wasn't already specified. -- if test -n "$destname"; then -- destfile="$destdir/$destname" -- else -- destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` -- destfile="$destdir/$destfile" -- fi -- - # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - link_against_libtool_libs= - finalize_command= - -@@ -2063,7 +1936,10 @@ - esac - fi - libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" -- if test -n "$libdir" && test ! -f "$libfile"; then -+ if test -z "$libdir"; then -+ $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2 -+ elif test -f "$libfile"; then : -+ else - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi -@@ -2088,8 +1964,8 @@ - fi - fi - -- $show "$install_prog$stripme $file $destfile" -- $run eval "$install_prog\$stripme \$file \$destfile" || exit $? -+ $show "$install_prog$stripme $file $dest" -+ $run eval "$install_prog\$stripme \$file \$dest" || exit $? - ;; - esac - done -@@ -2132,7 +2008,6 @@ - finish) - modename="$modename: finish" - libdirs="$nonopt" -- admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir -@@ -2148,21 +2023,19 @@ - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" -- $run eval "$cmd" || admincmds="$admincmds -- $cmd" -+ $run eval "$cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $run eval "$cmds" || admincmds="$admincmds -- $cmds" -+ $run eval "$cmds" - fi - done - fi - -- echo "----------------------------------------------------------------------" -+ echo "------------------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" -@@ -2171,7 +2044,7 @@ - echo "To link against installed libraries in a given directory, LIBDIR," - echo "you must use the \`-LLIBDIR' flag during linking." - echo -- echo " You will also need to do at least one of the following:" -+ echo " You will also need to do one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" -@@ -2186,16 +2059,13 @@ - - echo " - use the \`$flag' linker flag" - fi -- if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" -- fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." -- echo "----------------------------------------------------------------------" -+ echo "------------------------------------------------------------------------------" - exit 0 - ;; - -@@ -2213,7 +2083,8 @@ - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do -- if test ! -f "$file"; then -+ if test -f "$file"; then : -+ else - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit 1 -@@ -2223,7 +2094,7 @@ - case "$file" in - *.la) - # Check to see that this really is a libtool archive. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : -+ if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 -@@ -2294,7 +2165,7 @@ - -*) ;; - *) - # Do a test to see if this is really a libtool program. -- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - # If there is no directory component, then add one. - case "$file" in - */* | *\\*) . $file ;; -@@ -2315,14 +2186,6 @@ - # Export the shlibpath_var. - eval "export $shlibpath_var" - -- # Restore saved enviroment variables -- if test "${save_LC_ALL+set}" = set; then -- LC_ALL="$save_LC_ALL"; export LC_ALL -- fi -- if test "${save_LANG+set}" = set; then -- LANG="$save_LANG"; export LANG -- fi -- - # Now actually exec the command. - eval "exec \$cmd$args" - -@@ -2367,7 +2230,7 @@ - case "$name" in - *.la) - # Possibly a libtool archive, so verify it. -- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then -+ if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. -@@ -2411,7 +2274,7 @@ - - *.lo) - if test "$build_old_libs" = yes; then -- oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/.o/'` -+ oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'` - rmfiles="$rmfiles $dir/$oldobj" - fi - $show "$rm $rmfiles" -@@ -2446,10 +2309,8 @@ - - Provide generalized library-building support services. - -- --config show all configuration variables -- --debug enable verbose shell tracing - -n, --dry-run display commands without modifying any files -- --features display basic configuration information and exit -+ --features display configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] -@@ -2476,10 +2337,6 @@ - "Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - - Compile a source file into a libtool library object. -- --This mode accepts the following additional options: -- -- -static always build a \`.o' file suitable for static linking - - COMPILE-COMMAND is a command to be used in creating a \`standard' object file - from the given SOURCEFILE. --- /usr/ports.ref/net/libicq/patches/patch-ac Mon Mar 15 21:59:22 1999 +++ net/libicq/patches/patch-ac Mon May 17 02:27:30 1999 @@ -1,11 +0,0 @@ ---- configure.orig Mon Mar 15 13:17:51 1999 -+++ configure Mon Mar 15 13:17:59 1999 -@@ -1300,7 +1300,7 @@ - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - --- /usr/ports.ref/net/libicq/pkg/PLIST Mon Mar 15 21:59:23 1999 +++ net/libicq/pkg/PLIST Mon May 17 02:30:12 1999 @@ -1,6 +1,5 @@ include/libicq.h lib/libicq.a -lib/libicq.la lib/libicq.so lib/libicq.so.0.3 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B --- /usr/ports.ref/net/xferstats/Makefile Tue Mar 9 12:46:34 1999 +++ net/xferstats/Makefile Thu Apr 29 12:17:25 1999 @@ -14,14 +14,17 @@ MAINTAINER= dima@Chg.RU -LIB_DEPENDS= glib11.0:${PORTSDIR}/devel/glib11 +LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config WRKSRC= ${WRKDIR}/xferstats GNU_CONFIGURE= yes +CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" + MAN8= xferstats.8 do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/xferstats ${PREFIX}/bin @ ${INSTALL_MAN} ${WRKSRC}/xferstats.8 ${MAN8PREFIX}/man/man8 @ ${INSTALL_DATA} ${WRKSRC}/xferstats.cfg ${PREFIX}/etc/xferstats.cfg.sample >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message