Date: Fri, 05 Oct 2001 17:21:15 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: gnome@FreeBSD.org Cc: ports@FreeBSD.org Subject: GNOME megaupdate [gal/gtkhtml/ORBit/bonobo-conf/librsvg/evolution/sodipodi] Message-ID: <3BBDC1DB.6D718ECA@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------BE28246A5B309813380CC1AA Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Hi Gnome'rs! Attached please find a patch that updates five core GNOME components and two applications included into GNOME metaport to the latest versions. Please test this patch and report any problems. If there are no serious problems I'm planning to commit it at the very beginning of the next week. As usually following is the correct procedure to test the patchset: 1. Remove old ORBit and all ports that depend on it: # pkg_delete `cat /var/db/pkg/ORBit-*/+REQUIRED_BY`; pkg_delete ORBit* (users of -current and very recent -stable can use "pkg_delete -r ORBit*" instead) 2. Patch your /usr/ports tree; # cd /usr/ports ; patch -p1 -s < /where/you/put/it/gnomeupdate.diff 3. Run build either of full GNOME metaport: # cd /usr/ports/x11/gnome-fifth-toe ; make clean ; make install clean or core GNOME components: # cd /usr/ports/x11/gnome ; make clean ; make install clean 4. Test it and report back any unusual problems. Thanks! -Maxim --------------BE28246A5B309813380CC1AA Content-Type: text/plain; charset=koi8-r; name="gnomeupdate.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gnomeupdate.diff" Index: gnomevfs/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v retrieving revision 1.21 diff -d -u -r1.21 Makefile --- gnomevfs/Makefile 2001/08/15 20:33:13 1.21 +++ gnomevfs/Makefile 2001/09/28 10:34:33 @@ -6,7 +6,7 @@ # PORTNAME= gnomevfs -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-vfs @@ -14,6 +14,7 @@ MAINTAINER= gnome@FreeBSD.org +BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf .if !exists(/usr/bin/bzip2) LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 @@ -22,20 +23,29 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOMELIBS= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LIBS="-L${LOCALBASE}/lib" \ + MSGFMT=${LOCALBASE}/bin/msgfmt-new \ + XGETTEXT=${LOCALBASE}/bin/xgettext-new MAN5= gnome-vfs-mime.5 pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' @find ${WRKSRC} -name 'xml-i18n-*' | xargs ${PERL} -pi -e \ 's|/usr/local/bin/perl|${PERL}|g' + +post-install: + @if [ -L ${PREFIX}/include/libgnomevfs ]; then \ + ${RM} -f ${PREFIX}/include/libgnomevfs; \ + fi + ${LN} -sf ${PREFIX}/include/gnome-vfs-1.0/libgnomevfs \ + ${PREFIX}/include/libgnomevfs .include <bsd.port.mk> Index: gnomevfs/distinfo =================================================================== RCS file: /home/ncvs/ports/devel/gnomevfs/distinfo,v retrieving revision 1.9 diff -d -u -r1.9 distinfo --- gnomevfs/distinfo 2001/05/10 19:33:59 1.9 +++ gnomevfs/distinfo 2001/09/28 10:34:33 @@ -1 +1 @@ -MD5 (gnome-vfs-1.0.1.tar.gz) = 86ec5a93e6378a2da038ecf28381ba89 +MD5 (gnome-vfs-1.0.2.tar.gz) = 226cbe6530c1ebdf689ff39f3033b492 Index: gnomevfs/pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/gnomevfs/pkg-plist,v retrieving revision 1.9 diff -d -u -r1.9 pkg-plist --- gnomevfs/pkg-plist 2001/05/10 19:34:00 1.9 +++ gnomevfs/pkg-plist 2001/09/28 10:34:33 @@ -2,49 +2,54 @@ etc/gnome-vfs-mime-magic etc/vfs/modules/default-modules.conf etc/vfsConf.sh -etc/vfspthreadConf.sh -include/libgnomevfs/gnome-vfs-application-registry.h -include/libgnomevfs/gnome-vfs-async-ops.h -include/libgnomevfs/gnome-vfs-backend.h -include/libgnomevfs/gnome-vfs-cancellable-ops.h -include/libgnomevfs/gnome-vfs-cancellation.h -include/libgnomevfs/gnome-vfs-configuration.h -include/libgnomevfs/gnome-vfs-constants.h -include/libgnomevfs/gnome-vfs-context.h -include/libgnomevfs/gnome-vfs-directory-filter.h -include/libgnomevfs/gnome-vfs-directory.h -include/libgnomevfs/gnome-vfs-file-info.h -include/libgnomevfs/gnome-vfs-file-size.h -include/libgnomevfs/gnome-vfs-find-directory.h -include/libgnomevfs/gnome-vfs-handle.h -include/libgnomevfs/gnome-vfs-inet-connection.h -include/libgnomevfs/gnome-vfs-init.h -include/libgnomevfs/gnome-vfs-iobuf.h -include/libgnomevfs/gnome-vfs-list-sort.h -include/libgnomevfs/gnome-vfs-messages.h -include/libgnomevfs/gnome-vfs-method.h -include/libgnomevfs/gnome-vfs-mime-handlers.h -include/libgnomevfs/gnome-vfs-mime-info.h -include/libgnomevfs/gnome-vfs-mime-magic.h -include/libgnomevfs/gnome-vfs-mime-monitor.h -include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h -include/libgnomevfs/gnome-vfs-mime.h -include/libgnomevfs/gnome-vfs-module-shared.h -include/libgnomevfs/gnome-vfs-module.h -include/libgnomevfs/gnome-vfs-ops.h -include/libgnomevfs/gnome-vfs-parse-ls.h -include/libgnomevfs/gnome-vfs-private-types.h -include/libgnomevfs/gnome-vfs-private-utils.h -include/libgnomevfs/gnome-vfs-private.h -include/libgnomevfs/gnome-vfs-regexp-filter.h -include/libgnomevfs/gnome-vfs-result.h -include/libgnomevfs/gnome-vfs-seekable.h -include/libgnomevfs/gnome-vfs-shellpattern-filter.h -include/libgnomevfs/gnome-vfs-types.h -include/libgnomevfs/gnome-vfs-uri.h -include/libgnomevfs/gnome-vfs-utils.h -include/libgnomevfs/gnome-vfs-xfer.h -include/libgnomevfs/gnome-vfs.h +include/libgnomevfs +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-async-ops.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-backend.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellable-ops.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellation.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-configuration.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-context.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory-filter.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-info.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-size.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-find-directory.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-handle.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-inet-connection.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-init.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-iobuf.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-messages.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-method.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-handlers.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-info.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-magic.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-monitor.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback-module-api.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-shared.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ops.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-parse-ls.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private-utils.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-regexp-filter.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-result.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-seekable.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-shellpattern-filter.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket-buffer.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl-private.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-standard-callbacks.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-transform.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-types.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h +include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h lib/libgnomevfs-pthread.a lib/libgnomevfs-pthread.so lib/libgnomevfs-pthread.so.0 @@ -68,16 +73,25 @@ lib/vfs/extfs/trpm lib/vfs/extfs/zip lib/vfs/extfs/zoo -lib/vfs/include/gnome-vfs-file-size.h +lib/vfs/modules/libbzip2.a lib/vfs/modules/libbzip2.so +lib/vfs/modules/libextfs.a lib/vfs/modules/libextfs.so +lib/vfs/modules/libfile.a lib/vfs/modules/libfile.so +lib/vfs/modules/libftp.a lib/vfs/modules/libftp.so +lib/vfs/modules/libgconf.a lib/vfs/modules/libgconf.so +lib/vfs/modules/libgzip.a lib/vfs/modules/libgzip.so +lib/vfs/modules/libhttp.a lib/vfs/modules/libhttp.so +lib/vfs/modules/libvfs-pipe.a lib/vfs/modules/libvfs-pipe.so +lib/vfs/modules/libvfs-test.a lib/vfs/modules/libvfs-test.so +lib/vfs/modules/libvfs-translate.a lib/vfs/modules/libvfs-translate.so share/gnome/application-registry/gnome-vfs.applications share/gnome/mime-info/gnome-vfs.keys @@ -108,13 +122,15 @@ share/locale/sl/LC_MESSAGES/gnome-vfs.mo share/locale/sv/LC_MESSAGES/gnome-vfs.mo share/locale/tr/LC_MESSAGES/gnome-vfs.mo -share/locale/uk/LC_MESSAGES/gnome-vfs.mo +share/locale/uk/LC_MESSAGES/gnome-vfs.mo share/locale/wa/LC_MESSAGES/gnome-vfs.mo +share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo +@dirrm share/gnome/gtk-doc/html/gnome-vfs @dirrm share/gnome/application-registry @dirrm lib/vfs/modules -@dirrm lib/vfs/include @dirrm lib/vfs/extfs @dirrm lib/vfs -@dirrm include/libgnomevfs +@dirrm include/gnome-vfs-1.0/libgnomevfs +@dirrm include/gnome-vfs-1.0 @dirrm etc/vfs/modules @dirrm etc/vfs Index: gnomevfs/files/patch-aa =================================================================== RCS file: /home/ncvs/ports/devel/gnomevfs/files/patch-aa,v retrieving revision 1.6 diff -d -u -r1.6 patch-aa --- gnomevfs/files/patch-aa 2001/05/10 19:34:03 1.6 +++ gnomevfs/files/patch-aa 2001/09/28 10:34:33 @@ -1,18 +1,31 @@ ---- configure.orig Mon May 7 18:12:27 2001 -+++ configure Thu May 10 13:24:14 2001 -@@ -2365,3 +2365,3 @@ - VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`" -- VFS_GLIB_CONFIG="glib-config" -+ VFS_GLIB_CONFIG="$GLIB_CONFIG" - else -@@ -6924,4 +6924,4 @@ + +$FreeBSD$ + +--- configure.orig Mon Sep 17 17:07:27 2001 ++++ configure Mon Sep 17 17:08:56 2001 +@@ -5868,7 +5868,7 @@ + VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`" + VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`" + VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`" +-VFS_GLIB_CONFIG="glib-config" ++VFS_GLIB_CONFIG="$GLIB_CONFIG" + + +@@ -10472,8 +10472,8 @@ + done + fi + -echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:6927: checking for bzCompressInit in -lbz2" >&5 +-echo "configure:10477: checking for bzCompressInit in -lbz2" >&5 +echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:6927: checking for BZ2_bzCompressInit in -lbz2" >&5 ++echo "configure:10477: checking for BZ2_bzCompressInit in -lbz2" >&5 ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` -@@ -6938,6 +6938,6 @@ + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -10486,10 +10486,10 @@ + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char bzCompressInit(); +char BZ2_bzCompressInit(); @@ -21,3 +34,5 @@ -bzCompressInit() +BZ2_bzCompressInit() ; return 0; } + EOF + if { (eval echo configure:10496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then Index: gnomevfs/files/patch-ab =================================================================== RCS file: /home/ncvs/ports/devel/gnomevfs/files/patch-ab,v retrieving revision 1.6 diff -d -u -r1.6 patch-ab --- gnomevfs/files/patch-ab 2001/05/10 19:34:03 1.6 +++ gnomevfs/files/patch-ab 2001/09/28 10:34:33 @@ -1,16 +1,40 @@ ---- Makefile.in.orig Mon May 7 18:12:50 2001 -+++ Makefile.in Thu May 10 13:25:48 2001 -@@ -174,3 +174,3 @@ + +$FreeBSD$ + +--- Makefile.in.orig Fri Sep 28 11:17:29 2001 ++++ Makefile.in Fri Sep 28 11:22:06 2001 +@@ -177,9 +177,9 @@ + l = @l@ + need_gnome_support = @need_gnome_support@ + @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = doc +-@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc test ++@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = doc -SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules data man devel-docs $(SUBDIRS_GNOME) po +SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules data man $(SUBDIRS_GNOME) po -@@ -182,3 +182,3 @@ + EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec vfsConf.sh.in xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in gnome-vfs-config.in +@@ -187,7 +187,7 @@ + + bin_SCRIPTS = $(top_builddir)/gnome-vfs-config + -confexecdir = $(libdir) +confexecdir = $(sysconfdir) - confexec_DATA = vfsConf.sh vfspthreadConf.sh -@@ -534,2 +534,3 @@ + confexec_DATA = vfsConf.sh + + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -526,11 +526,13 @@ + -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \ + -e 's?\@VERSION\@?$(VERSION)?g' \ + -e 's?\@VFS_LIBS\@?$(VFS_LIBS)?g' \ ++ -e 's?\@PTHREAD_LIB\@?$(PTHREAD_LIB)?g' \ + < $(srcdir)/vfsConf.sh.in > vfsConf.tmp \ + && mv vfsConf.tmp vfsConf.sh + + gnome-vfs-config: gnome-vfs-config.in Makefile sed -e 's?\@LIBDIR\@?$(libdir)?g' \ + -e 's?\@SYSCONFDIR\@?$(sysconfdir)?g' \ -e 's?\@VFS_LIBDIR\@?$(VFS_LIBDIR)?g' \ + -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \ + -e 's?\@VERSION\@?$(VERSION)?g' \ Index: gnomevfs/files/patch-libgnomevfs::Makefile.in =================================================================== RCS file: patch-libgnomevfs::Makefile.in diff -N patch-libgnomevfs::Makefile.in --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-libgnomevfs::Makefile.in Fri Sep 28 03:34:33 2001 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- libgnomevfs/Makefile.in 2001/09/17 14:32:27 1.1 ++++ libgnomevfs/Makefile.in 2001/09/17 14:33:02 +@@ -202,7 +202,7 @@ + + + # Platform specific includes +-libgnomevfsplatofrmincludedir = $(libdir)/gnome-vfs-1.0/include ++libgnomevfsplatofrmincludedir = $(includedir)/gnome-vfs-1.0/libgnomevfs + libgnomevfsplatofrminclude_HEADERS = gnome-vfs-file-size.h + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs Index: gnomevfs/files/patch-libgnomevfs::gnome-vfs-mime.h =================================================================== RCS file: patch-libgnomevfs::gnome-vfs-mime.h diff -N patch-libgnomevfs::gnome-vfs-mime.h --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-libgnomevfs::gnome-vfs-mime.h Fri Sep 28 03:34:33 2001 @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- libgnomevfs/gnome-vfs-mime.h 2001/09/17 14:13:01 1.1 ++++ libgnomevfs/gnome-vfs-mime.h 2001/09/17 14:13:16 +@@ -27,6 +27,7 @@ + #include <ctype.h> + #include <dirent.h> + #include <libgnomevfs/gnome-vfs-uri.h> ++#include <sys/types.h> + #include <regex.h> + #include <stdio.h> + #include <string.h> Index: gnomevfs/files/patch-ltmain.sh =================================================================== RCS file: patch-ltmain.sh diff -N patch-ltmain.sh --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-ltmain.sh Fri Sep 28 03:34:33 2001 @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/08/27 09:51:26 1.1 ++++ ltmain.sh 2001/08/27 09:51:42 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" Index: gnomevfs/files/patch-po::Makefile.in.in =================================================================== RCS file: patch-po::Makefile.in.in diff -N patch-po::Makefile.in.in --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-po::Makefile.in.in Fri Sep 28 03:34:33 2001 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/09/17 14:26:57 1.1 ++++ po/Makefile.in.in 2001/09/17 14:27:14 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ Index: gnomevfs/files/patch-vfsConf.sh.in =================================================================== RCS file: patch-vfsConf.sh.in diff -N patch-vfsConf.sh.in --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-vfsConf.sh.in Fri Sep 28 03:34:33 2001 @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- vfsConf.sh.in 2001/09/28 11:13:40 1.1 ++++ vfsConf.sh.in 2001/09/28 11:15:11 +@@ -2,6 +2,6 @@ + # Configuration file for using the gnome-vfs library + # + VFS_LIBDIR="@VFS_LIBDIR@" +-VFS_LIBS="@VFS_LIBS@" ++VFS_LIBS="@VFS_LIBS@ @PTHREAD_LIB@" + VFS_INCLUDEDIR="@VFS_INCLUDEDIR@" + MODULE_VERSION="gnome-vfs-@VERSION@" Index: gal/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/gal/Makefile,v retrieving revision 1.21 diff -d -u -r1.21 Makefile --- gal/Makefile 2001/08/27 11:41:07 1.21 +++ gal/Makefile 2001/09/28 10:34:33 @@ -6,7 +6,7 @@ # PORTNAME= gal -PORTVERSION= 0.11.2 +PORTVERSION= 0.12 CATEGORIES?= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gal Index: gal/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/gal/distinfo,v retrieving revision 1.15 diff -d -u -r1.15 distinfo --- gal/distinfo 2001/08/27 11:41:07 1.15 +++ gal/distinfo 2001/09/28 10:34:33 @@ -1 +1 @@ -MD5 (gal-0.11.2.tar.gz) = dc22c077c52208ac133df236e4c30480 +MD5 (gal-0.12.tar.gz) = c6ff4cbf9bb98dc79460898d41dece40 Index: gal/pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/gal/pkg-plist,v retrieving revision 1.12 diff -d -u -r1.12 pkg-plist --- gal/pkg-plist 2001/08/22 18:08:04 1.12 +++ gal/pkg-plist 2001/09/28 10:34:33 @@ -128,7 +128,8 @@ include/gal/widgets/widget-pixmap-combo.h lib/libgal.a lib/libgal.so -lib/libgal.so.11 +lib/libgal.so.12 +share/gnome/etable/%%VERSION%%/glade/e-table-config-no-group.glade share/gnome/etable/%%VERSION%%/glade/e-table-config.glade share/gnome/etable/%%VERSION%%/glade/e-table-field-chooser.glade share/gnome/etable/%%VERSION%%/glade/e-table-group.glade @@ -186,7 +187,7 @@ share/locale/ta/LC_MESSAGES/gal.mo share/locale/tr/LC_MESSAGES/gal.mo share/locale/uk/LC_MESSAGES/gal.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gal.mo +share/locale/zh_TW/LC_MESSAGES/gal.mo @dirrm share/gnome/pixmaps/gal/categories @dirrm share/gnome/pixmaps/gal @dirrm share/gnome/gal/html/gal Index: gal/files/patch-aa =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/gal/files/patch-aa,v retrieving revision 1.7 diff -d -u -r1.7 patch-aa --- gal/files/patch-aa 2001/07/13 01:53:17 1.7 +++ gal/files/patch-aa 2001/09/28 10:34:33 @@ -1,6 +1,11 @@ ---- configure.orig Mon May 21 11:10:07 2001 -+++ configure Mon May 21 11:10:59 2001 -@@ -5017,5 +5017,5 @@ + +$FreeBSD$ + +--- configure.orig Wed Sep 26 11:16:25 2001 ++++ configure Wed Sep 26 11:16:25 2001 +@@ -5075,9 +5075,9 @@ + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $ICONV_CFLAGS" -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 @@ -9,25 +14,32 @@ +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 +echo "configure:5081: checking for iconv in -lgiconv" >&5 if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then -@@ -5027,3 +5027,3 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5085,7 +5085,7 @@ + #line 5086 "configure" + #include "confdefs.h" -#include <iconv.h> +#include <giconv.h> -@@ -5050,3 +5050,3 @@ + int main() { + +@@ -5108,7 +5108,7 @@ + + echo "$ac_t""$ac_cv_libiconv" 1>&6 if test $ac_cv_libiconv = yes; then - ICONV_LIBS="$ICONV_LIBS -liconv" + ICONV_LIBS="$ICONV_LIBS -lgiconv" have_iconv=yes -@@ -5176,3 +5176,3 @@ + else + CFLAGS="$save_CFLAGS" +@@ -5234,7 +5234,7 @@ + #line 5235 "configure" + #include "confdefs.h" -#include <iconv.h> +#include <giconv.h> #include <stdlib.h> -@@ -5290,4 +5290,4 @@ - echo "configure:5291: checking for GTK >= 1.2.7" >&5 --if gtk-config --version > /dev/null 2>&1; then -- vers=`gtk-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -+if $GTK_CONFIG --version > /dev/null 2>&1; then -+ vers=`$GTK_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test "$vers" -ge 1002007; then + #include <string.h> + #ifdef HAVE_GNU_GET_LIBC_VERSION Index: gal/files/patch-ab =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/gal/files/patch-ab,v retrieving revision 1.1 diff -d -u -r1.1 patch-ab --- gal/files/patch-ab 2000/10/06 02:42:19 1.1 +++ gal/files/patch-ab 2001/09/28 10:34:33 @@ -1,7 +1,17 @@ ---- Makefile.in.orig Thu Oct 5 18:09:06 2000 -+++ Makefile.in Thu Oct 5 21:24:04 2000 -@@ -138,3 +138,3 @@ + +$FreeBSD$ + +--- Makefile.in.orig Fri Sep 28 12:30:28 2001 ++++ Makefile.in Fri Sep 28 12:37:31 2001 +@@ -141,9 +141,9 @@ + gnomelocaledir = @gnomelocaledir@ + l = @l@ + +-SUBDIRS = gal po intl tests docs art ++SUBDIRS = gal po intl docs art -confexecdir = $(libdir) +confexecdir = $(sysconfdir) confexec_DATA = galConf.sh + + EXTRA_DIST = gal.spec.in galConf.sh.in MAINTAINERS AUTHORS xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in Index: gtkhtml/Makefile =================================================================== RCS file: /home/ncvs/ports/www/gtkhtml/Makefile,v retrieving revision 1.33 diff -d -u -r1.33 Makefile --- gtkhtml/Makefile 2001/09/11 07:41:54 1.33 +++ gtkhtml/Makefile 2001/09/28 10:34:33 @@ -6,7 +6,7 @@ # PORTNAME= gtkhtml -PORTVERSION= 0.12.0 +PORTVERSION= 0.13.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gtkhtml @@ -15,7 +15,7 @@ LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww \ pspell.4:${PORTSDIR}/textproc/pspell \ - gal.11:${PORTSDIR}/x11-toolkits/gal \ + gal.12:${PORTSDIR}/x11-toolkits/gal \ ghttp.1:${PORTSDIR}/www/libghttp USE_X_PREFIX= yes Index: gtkhtml/distinfo =================================================================== RCS file: /home/ncvs/ports/www/gtkhtml/distinfo,v retrieving revision 1.11 diff -d -u -r1.11 distinfo --- gtkhtml/distinfo 2001/09/11 07:41:54 1.11 +++ gtkhtml/distinfo 2001/09/28 10:34:33 @@ -1 +1 @@ -MD5 (gtkhtml-0.12.0.tar.gz) = 7f456758bb635669e6eb576b7e02361c +MD5 (gtkhtml-0.13.0.tar.gz) = 259de4e0301095e9b31602e5f74a5be1 Index: gtkhtml/pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/gtkhtml/pkg-plist,v retrieving revision 1.13 diff -d -u -r1.13 pkg-plist --- gtkhtml/pkg-plist 2001/09/11 07:41:55 1.13 +++ gtkhtml/pkg-plist 2001/09/28 10:34:33 @@ -93,7 +93,7 @@ lib/bonobo/plugin/libstorage_http.so lib/libgtkhtml.a lib/libgtkhtml.so -lib/libgtkhtml.so.15 +lib/libgtkhtml.so.16 share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop share/gnome/control-center/Documents/gtkhtml-properties.desktop share/gnome/control-center/capplets/gtkhtml-properties.desktop @@ -120,6 +120,7 @@ share/gnome/gtkhtml/icons/insert-rule-24.png share/gnome/gtkhtml/icons/insert-table-16.png share/gnome/gtkhtml/icons/insert-table-24.png +share/gnome/gtkhtml/icons/properties-16.png share/gnome/gtkhtml/icons/redo-16.png share/gnome/gtkhtml/icons/redo-24.png share/gnome/gtkhtml/icons/rule-blue-center.png @@ -143,6 +144,14 @@ share/gnome/html/gtkhtml.hierarchy share/gnome/html/gtkhtml.sgml share/gnome/html/gtkhtml.types +share/gnome/html/gtkhtml/gtkhtml-gtkhtml-enums.html +share/gnome/html/gtkhtml/gtkhtml-gtkhtml-stream.html +share/gnome/html/gtkhtml/gtkhtml-gtkhtml-types.html +share/gnome/html/gtkhtml/gtkhtml-gtkhtmlembedded.html +share/gnome/html/gtkhtml/gtkhtml.html +share/gnome/html/gtkhtml/index.html +share/gnome/html/gtkhtml/license.html +share/gnome/html/gtkhtml/r27.html share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf share/gnome/oaf/GNOME_GtkHTML_Editor.oaf share/gnome/ui/GNOME_GtkHTML_Editor.xml @@ -171,7 +180,7 @@ share/locale/sv/LC_MESSAGES/gtkhtml.mo share/locale/tr/LC_MESSAGES/gtkhtml.mo share/locale/uk/LC_MESSAGES/gtkhtml.mo -share/locale/zh_TW.Big5/LC_MESSAGES/gtkhtml.mo +share/locale/zh_TW/LC_MESSAGES/gtkhtml.mo @dirrm share/gnome/html/gtkhtml @dirrm share/gnome/gtkhtml/icons @dirrm share/gnome/gtkhtml Index: sodipodi/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/sodipodi/Makefile,v retrieving revision 1.28 diff -d -u -r1.28 Makefile --- sodipodi/Makefile 2001/06/19 09:43:08 1.28 +++ sodipodi/Makefile 2001/09/28 10:34:33 @@ -6,8 +6,7 @@ # PORTNAME= sodipodi -PORTVERSION= 0.23 -PORTREVISION= 1 +PORTVERSION= 0.24 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,10 +20,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" +MAN1= sodipodi.1 + pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' Index: sodipodi/distinfo =================================================================== RCS file: /home/ncvs/ports/graphics/sodipodi/distinfo,v retrieving revision 1.8 diff -d -u -r1.8 distinfo --- sodipodi/distinfo 2001/05/21 09:24:02 1.8 +++ sodipodi/distinfo 2001/09/28 10:34:33 @@ -1 +1 @@ -MD5 (sodipodi-0.23.tar.gz) = 947dcc478cb871b36da72b5938c466df +MD5 (sodipodi-0.24.tar.gz) = 87cbb29d00a5ad2c9ec84a45bf5c0431 Index: sodipodi/pkg-plist =================================================================== RCS file: /home/ncvs/ports/graphics/sodipodi/pkg-plist,v retrieving revision 1.8 diff -d -u -r1.8 pkg-plist --- sodipodi/pkg-plist 2001/05/21 09:24:02 1.8 +++ sodipodi/pkg-plist 2001/09/28 10:34:33 @@ -50,6 +50,7 @@ share/gnome/sodipodi/div.xpm share/gnome/sodipodi/document.c share/gnome/sodipodi/document.glade +share/gnome/sodipodi/draw_dynahand.xpm share/gnome/sodipodi/draw_ellipse.xpm share/gnome/sodipodi/draw_freehand.xpm share/gnome/sodipodi/draw_node.xpm Index: sodipodi/files/patch-configure =================================================================== RCS file: patch-configure diff -N patch-configure --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-configure Fri Sep 28 03:34:33 2001 @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- configure 2001/09/28 13:29:15 1.1 ++++ configure 2001/09/28 13:29:37 +@@ -3974,7 +3974,7 @@ + fi + + +- CATOBJEXT=.gmo ++ CATOBJEXT=.mo + fi + + else +@@ -4096,7 +4096,7 @@ + + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes +- CATOBJEXT=.gmo ++ CATOBJEXT=.mo + INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi Index: sodipodi/files/patch-po::Makefile.in.in =================================================================== RCS file: patch-po::Makefile.in.in diff -N patch-po::Makefile.in.in --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-po::Makefile.in.in Fri Sep 28 03:34:33 2001 @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/09/28 13:21:12 1.1 ++++ po/Makefile.in.in 2001/09/28 13:21:31 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ +@@ -126,7 +126,7 @@ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ + done + if test "$(PACKAGE)" = "gettext"; then \ +@@ -172,7 +172,7 @@ + catalogs='$(GMOFILES)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ Index: sodipodi/files/patch-src::sp-text.c =================================================================== RCS file: patch-src::sp-text.c diff -N patch-src::sp-text.c --- /dev/null Fri Sep 28 02:25:32 2001 +++ patch-src::sp-text.c Fri Sep 28 03:34:33 2001 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/sp-text.c 2001/09/28 13:10:32 1.1 ++++ src/sp-text.c 2001/09/28 13:19:21 +@@ -235,7 +235,7 @@ + x = text->x; + y += text->size; + } else { +- g_unichar_to_utf8 (btowc(*c), utfbuf); ++ g_unichar_to_utf8 (*c, utfbuf); + glyph = gnome_font_face_lookup_default (face, g_utf8_get_char(utfbuf)); + + w = gnome_font_face_get_glyph_width (face, glyph); Index: bonobo/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/Makefile,v retrieving revision 1.40 diff -d -u -r1.40 Makefile --- bonobo/Makefile 2001/08/21 14:09:52 1.40 +++ bonobo/Makefile 2001/09/28 10:34:33 @@ -6,7 +6,7 @@ # PORTNAME= bonobo -PORTVERSION= 1.0.8 +PORTVERSION= 1.0.9 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/bonobo @@ -33,5 +33,11 @@ @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + +post-install: + @if [ -L ${PREFIX}/include/bonobo ]; then \ + ${RM} -f ${PREFIX}/include/bonobo; \ + fi + @${LN} -sf ${PREFIX}/include/gnome-1.0/bonobo ${PREFIX}/include/bonobo .include <bsd.port.mk> Index: bonobo/distinfo =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/distinfo,v retrieving revision 1.22 diff -d -u -r1.22 distinfo --- bonobo/distinfo 2001/08/21 14:09:52 1.22 +++ bonobo/distinfo 2001/09/28 10:34:33 @@ -1 +1 @@ -MD5 (bonobo-1.0.8.tar.gz) = a21755814671e25d86988c098ebb68f3 +MD5 (bonobo-1.0.9.tar.gz) = ee5c8becdec041a911c5159e4ebf1e91 Index: bonobo/pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/pkg-plist,v retrieving revision 1.22 diff -d -u -r1.22 pkg-plist --- bonobo/pkg-plist 2001/08/21 14:09:52 1.22 +++ bonobo/pkg-plist 2001/09/28 10:34:33 @@ -19,76 +19,77 @@ etc/bonoboConf.sh etc/bonoboxConf.sh etc/bonobox_printConf.sh +include/bonobo include/bonobo.h -include/bonobo/Bonobo.h -include/bonobo/bonobo-arg.h -include/bonobo/bonobo-async.h -include/bonobo/bonobo-canvas-component.h -include/bonobo/bonobo-canvas-item.h -include/bonobo/bonobo-client-site.h -include/bonobo/bonobo-context.h -include/bonobo/bonobo-control-frame.h -include/bonobo/bonobo-control.h -include/bonobo/bonobo-desktop-window.h -include/bonobo/bonobo-embeddable.h -include/bonobo/bonobo-event-source.h -include/bonobo/bonobo-exception.h -include/bonobo/bonobo-generic-factory.h -include/bonobo/bonobo-item-container.h -include/bonobo/bonobo-item-handler.h -include/bonobo/bonobo-listener.h -include/bonobo/bonobo-main.h -include/bonobo/bonobo-moniker-extender.h -include/bonobo/bonobo-moniker-simple.h -include/bonobo/bonobo-moniker-util.h -include/bonobo/bonobo-moniker.h -include/bonobo/bonobo-object-client.h -include/bonobo/bonobo-object-directory.h -include/bonobo/bonobo-object-io.h -include/bonobo/bonobo-object.h -include/bonobo/bonobo-persist-file.h -include/bonobo/bonobo-persist-stream.h -include/bonobo/bonobo-persist.h -include/bonobo/bonobo-plug.h -include/bonobo/bonobo-print-client.h -include/bonobo/bonobo-print.h -include/bonobo/bonobo-progressive.h -include/bonobo/bonobo-property-bag-client.h -include/bonobo/bonobo-property-bag-xml.h -include/bonobo/bonobo-property-bag.h -include/bonobo/bonobo-property-control.h -include/bonobo/bonobo-property.h -include/bonobo/bonobo-selector-widget.h -include/bonobo/bonobo-selector.h -include/bonobo/bonobo-shlib-factory.h -include/bonobo/bonobo-socket.h -include/bonobo/bonobo-storage-plugin.h -include/bonobo/bonobo-storage.h -include/bonobo/bonobo-stream-client.h -include/bonobo/bonobo-stream-memory.h -include/bonobo/bonobo-stream.h -include/bonobo/bonobo-transient.h -include/bonobo/bonobo-ui-component.h -include/bonobo/bonobo-ui-config-widget.h -include/bonobo/bonobo-ui-container.h -include/bonobo/bonobo-ui-engine.h -include/bonobo/bonobo-ui-node.h -include/bonobo/bonobo-ui-sync.h -include/bonobo/bonobo-ui-toolbar-button-item.h -include/bonobo/bonobo-ui-toolbar-icon.h -include/bonobo/bonobo-ui-toolbar-item.h -include/bonobo/bonobo-ui-toolbar-toggle-button-item.h -include/bonobo/bonobo-ui-util.h -include/bonobo/bonobo-view-frame.h -include/bonobo/bonobo-view.h -include/bonobo/bonobo-widget.h -include/bonobo/bonobo-win.h -include/bonobo/bonobo-wrapper.h -include/bonobo/bonobo-xobject.h -include/bonobo/bonobo-zoomable-frame.h -include/bonobo/bonobo-zoomable.h include/efs.h include/efs_error.h +include/gnome-1.0/bonobo/Bonobo.h +include/gnome-1.0/bonobo/bonobo-arg.h +include/gnome-1.0/bonobo/bonobo-async.h +include/gnome-1.0/bonobo/bonobo-canvas-component.h +include/gnome-1.0/bonobo/bonobo-canvas-item.h +include/gnome-1.0/bonobo/bonobo-client-site.h +include/gnome-1.0/bonobo/bonobo-context.h +include/gnome-1.0/bonobo/bonobo-control-frame.h +include/gnome-1.0/bonobo/bonobo-control.h +include/gnome-1.0/bonobo/bonobo-desktop-window.h +include/gnome-1.0/bonobo/bonobo-embeddable.h +include/gnome-1.0/bonobo/bonobo-event-source.h +include/gnome-1.0/bonobo/bonobo-exception.h +include/gnome-1.0/bonobo/bonobo-generic-factory.h +include/gnome-1.0/bonobo/bonobo-item-container.h +include/gnome-1.0/bonobo/bonobo-item-handler.h +include/gnome-1.0/bonobo/bonobo-listener.h +include/gnome-1.0/bonobo/bonobo-main.h +include/gnome-1.0/bonobo/bonobo-moniker-extender.h +include/gnome-1.0/bonobo/bonobo-moniker-simple.h +include/gnome-1.0/bonobo/bonobo-moniker-util.h +include/gnome-1.0/bonobo/bonobo-moniker.h +include/gnome-1.0/bonobo/bonobo-object-client.h +include/gnome-1.0/bonobo/bonobo-object-directory.h +include/gnome-1.0/bonobo/bonobo-object-io.h +include/gnome-1.0/bonobo/bonobo-object.h +include/gnome-1.0/bonobo/bonobo-persist-file.h +include/gnome-1.0/bonobo/bonobo-persist-stream.h +include/gnome-1.0/bonobo/bonobo-persist.h +include/gnome-1.0/bonobo/bonobo-plug.h +include/gnome-1.0/bonobo/bonobo-print-client.h +include/gnome-1.0/bonobo/bonobo-print.h +include/gnome-1.0/bonobo/bonobo-progressive.h +include/gnome-1.0/bonobo/bonobo-property-bag-client.h +include/gnome-1.0/bonobo/bonobo-property-bag-xml.h +include/gnome-1.0/bonobo/bonobo-property-bag.h +include/gnome-1.0/bonobo/bonobo-property-control.h +include/gnome-1.0/bonobo/bonobo-property.h +include/gnome-1.0/bonobo/bonobo-selector-widget.h +include/gnome-1.0/bonobo/bonobo-selector.h +include/gnome-1.0/bonobo/bonobo-shlib-factory.h +include/gnome-1.0/bonobo/bonobo-socket.h +include/gnome-1.0/bonobo/bonobo-storage-plugin.h +include/gnome-1.0/bonobo/bonobo-storage.h +include/gnome-1.0/bonobo/bonobo-stream-client.h +include/gnome-1.0/bonobo/bonobo-stream-memory.h +include/gnome-1.0/bonobo/bonobo-stream.h +include/gnome-1.0/bonobo/bonobo-transient.h +include/gnome-1.0/bonobo/bonobo-ui-component.h +include/gnome-1.0/bonobo/bonobo-ui-config-widget.h +include/gnome-1.0/bonobo/bonobo-ui-container.h +include/gnome-1.0/bonobo/bonobo-ui-engine.h +include/gnome-1.0/bonobo/bonobo-ui-node.h +include/gnome-1.0/bonobo/bonobo-ui-sync.h +include/gnome-1.0/bonobo/bonobo-ui-toolbar-button-item.h +include/gnome-1.0/bonobo/bonobo-ui-toolbar-icon.h +include/gnome-1.0/bonobo/bonobo-ui-toolbar-item.h +include/gnome-1.0/bonobo/bonobo-ui-toolbar-toggle-button-item.h +include/gnome-1.0/bonobo/bonobo-ui-util.h +include/gnome-1.0/bonobo/bonobo-view-frame.h +include/gnome-1.0/bonobo/bonobo-view.h +include/gnome-1.0/bonobo/bonobo-widget.h +include/gnome-1.0/bonobo/bonobo-win.h +include/gnome-1.0/bonobo/bonobo-wrapper.h +include/gnome-1.0/bonobo/bonobo-xobject.h +include/gnome-1.0/bonobo/bonobo-zoomable-frame.h +include/gnome-1.0/bonobo/bonobo-zoomable.h lib/bonobo/monikers/libmoniker_std.a lib/bonobo/monikers/libmoniker_std.so lib/bonobo/monikers/libmoniker_std.so.0 @@ -109,110 +110,13 @@ lib/libefs.so lib/libefs.so.1 libdata/pkgconfig/libefs.pc -share/gnome/bonobo/html/bonobo-api.html +share/gnome/bonobo/docs/audio_ulaw/C/index.html share/gnome/bonobo/html/bonobo-api.sgml share/gnome/bonobo/html/bonobo-decl.txt share/gnome/bonobo/html/bonobo-sections.txt share/gnome/bonobo/html/bonobo.hierarchy share/gnome/bonobo/html/bonobo.signals share/gnome/bonobo/html/bonobo.types -share/gnome/bonobo/html/bonobo/bonobo-bonobo-arg.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-async.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-canvas-component.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-canvas-item.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-client-site.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-component-io.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-context.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-control-frame.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-control.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-desktop-window.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-embeddable.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-event-source.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-exception.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-generic-factory.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-item-container.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-item-handler.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-listener.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-main.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-extender.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-simple.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-util.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-client.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-directory.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-io.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-object.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist-file.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist-stream.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-plug.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-print-client.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-print.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-progressive.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag-client.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag-xml.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-control.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-property.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-selector.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-socket.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-storage-plugin.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-storage.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream-client.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream-memory.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-transient.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-component.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-container.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-engine.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-node.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-sync.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-button-item.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-icon.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-item.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-toggle-button-item.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-util.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-xml.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-view-frame.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-view.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-widget.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-win.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-wrapper.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-xobject.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-zoomable-frame.html -share/gnome/bonobo/html/bonobo/bonobo-bonobo-zoomable.html -share/gnome/bonobo/html/bonobo/bonobo-controls.html -share/gnome/bonobo/html/bonobo/bonobo-core.html -share/gnome/bonobo/html/bonobo/bonobo-documents-widgets.html -share/gnome/bonobo/html/bonobo/bonobo-documents.html -share/gnome/bonobo/html/bonobo/bonobo-moniker-handlers.html -share/gnome/bonobo/html/bonobo/bonobo-notification.html -share/gnome/bonobo/html/bonobo/bonobo-object-activation.html -share/gnome/bonobo/html/bonobo/bonobo-print.html -share/gnome/bonobo/html/bonobo/bonobo-properties.html -share/gnome/bonobo/html/bonobo/bonobo-storage.html -share/gnome/bonobo/html/bonobo/bonobo-support-utilities.html -share/gnome/bonobo/html/bonobo/bonobo-ugly.html -share/gnome/bonobo/html/bonobo/bonobo-ui.html -share/gnome/bonobo/html/bonobo/bonobo-useful-widgets.html -share/gnome/bonobo/html/bonobo/bonobo-view.html -share/gnome/bonobo/html/bonobo/book1.html -share/gnome/bonobo/html/bonobo/misc-ugly.html -share/gnome/bonobo/html/bonobo/x10104.html -share/gnome/bonobo/html/bonobo/x10146.html -share/gnome/bonobo/html/bonobo/x10147.html -share/gnome/bonobo/html/bonobo/x10189.html -share/gnome/bonobo/html/bonobo/x10996.html -share/gnome/bonobo/html/bonobo/x11010.html -share/gnome/bonobo/html/bonobo/x11207.html -share/gnome/bonobo/html/bonobo/x11335.html -share/gnome/bonobo/html/bonobo/x11349.html -share/gnome/bonobo/html/bonobo/x11351.html -share/gnome/bonobo/html/bonobo/x11391.html -share/gnome/bonobo/html/bonobo/x11418.html -share/gnome/bonobo/html/bonobo/x11419.html -share/gnome/bonobo/html/bonobo/x11421.html -share/gnome/bonobo/html/bonobo/x11462.html share/gnome/idl/Bonobo.idl share/gnome/idl/Bonobo_Advise.idl share/gnome/idl/Bonobo_Canvas.idl @@ -275,8 +179,8 @@ share/locale/tr/LC_MESSAGES/bonobo.mo share/locale/uk/LC_MESSAGES/bonobo.mo share/locale/wa/LC_MESSAGES/bonobo.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/bonobo.mo -share/locale/zh_TW.Big5/LC_MESSAGES/bonobo.mo +share/locale/zh_CN/LC_MESSAGES/bonobo.mo +share/locale/zh_TW/LC_MESSAGES/bonobo.mo @dirrm share/gnome/ui @dirrm share/gnome/libefs/html/libefs @dirrm share/gnome/libefs/html @@ -291,4 +195,5 @@ @dirrm lib/bonobo/plugin @dirrm lib/bonobo/monikers @dirrm lib/bonobo -@dirrm include/bonobo +@dirrm include/gnome-1.0/bonobo +@dirrm include/gnome-1.0 Index: gnomecore/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gnomecore/Makefile,v retrieving revision 1.65 diff -d -u -r1.65 Makefile --- gnomecore/Makefile 2001/09/11 07:42:37 1.65 +++ gnomecore/Makefile 2001/09/28 10:34:33 @@ -15,7 +15,7 @@ MAINTAINER?= gnome@FreeBSD.org -LIB_DEPENDS= gtkhtml.15:${PORTSDIR}/www/gtkhtml +LIB_DEPENDS= gtkhtml.16:${PORTSDIR}/www/gtkhtml RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio USE_X_PREFIX= yes Index: evolution/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/evolution/Makefile,v retrieving revision 1.33 diff -d -u -r1.33 Makefile --- evolution/Makefile 2001/09/13 06:43:21 1.33 +++ evolution/Makefile 2001/09/28 12:14:41 @@ -6,15 +6,14 @@ # PORTNAME= evolution -PORTVERSION= 0.13 +PORTVERSION= 0.14 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/evolution MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \ - gtkhtml.15:${PORTSDIR}/www/gtkhtml +LIB_DEPENDS= bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf #ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until # it actually works @@ -24,8 +23,7 @@ USE_BISON= yes USE_X_PREFIX= yes USE_GNOME= yes -USE_LIBTOOL= yes -LIBTOOLFILES= configure libical/configure +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-db3-libs=${LOCALBASE}/lib \ --with-html-dir=${PREFIX}/share/gnome/html # --with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes Index: evolution/distinfo =================================================================== RCS file: /home/ncvs/ports/mail/evolution/distinfo,v retrieving revision 1.12 diff -d -u -r1.12 distinfo --- evolution/distinfo 2001/09/11 18:14:12 1.12 +++ evolution/distinfo 2001/09/28 12:14:41 @@ -1 +1 @@ -MD5 (evolution-0.13.tar.gz) = c35733ba57648c05d45a7ff9a054c577 +MD5 (evolution-0.14.tar.gz) = 706453bd2271f2b0073cd30188e1a33d Index: evolution/pkg-plist =================================================================== RCS file: /home/ncvs/ports/mail/evolution/pkg-plist,v retrieving revision 1.13 diff -d -u -r1.13 pkg-plist --- evolution/pkg-plist 2001/09/11 18:14:12 1.13 +++ evolution/pkg-plist 2001/09/28 12:14:41 @@ -128,6 +128,7 @@ include/ename/e-address-western.h include/ename/e-name-western-tables.h include/ename/e-name-western.h +include/evolution/cal-client/cal-client-multi.h include/evolution/cal-client/cal-client-types.h include/evolution/cal-client/cal-client.h include/evolution/cal-client/cal-query.h @@ -175,6 +176,7 @@ include/libicalvcal/vcaltmp.h include/libicalvcal/vcc.h include/libicalvcal/vobject.h +lib/evolution/camel-providers/%%VERSION%%/libcamelimap.a lib/evolution/camel-providers/%%VERSION%%/libcamelimap.so lib/evolution/camel-providers/%%VERSION%%/libcamelimap.urls lib/evolution/camel-providers/%%VERSION%%/libcamellocal.a @@ -256,6 +258,7 @@ share/gnome/evolution/ecps/phonelist.ecps share/gnome/evolution/ecps/smallbook.ecps share/gnome/evolution/etspec/e-calendar-table.etspec +share/gnome/evolution/etspec/e-meeting-time-sel.etspec share/gnome/evolution/etspec/e-storage-set-view.etspec share/gnome/evolution/etspec/meeting-page.etspec share/gnome/evolution/etspec/message-list.etspec @@ -265,7 +268,6 @@ share/gnome/evolution/glade/alarm-notify.glade share/gnome/evolution/glade/alarm-options.glade share/gnome/evolution/glade/alarm-page.glade -share/gnome/evolution/glade/alphabet.glade share/gnome/evolution/glade/cal-prefs-dialog.glade share/gnome/evolution/glade/contact-editor.glade share/gnome/evolution/glade/contact-list-editor.glade @@ -292,6 +294,7 @@ share/gnome/evolution/glade/meeting-page.glade share/gnome/evolution/glade/my-evolution.glade share/gnome/evolution/glade/recurrence-page.glade +share/gnome/evolution/glade/schedule-page.glade share/gnome/evolution/glade/select-names.glade share/gnome/evolution/glade/subscribe-dialog.glade share/gnome/evolution/glade/task-details-page.glade @@ -309,7 +312,6 @@ share/gnome/evolution/views/tasks/Tasks.galview share/gnome/evolution/views/tasks/With_Category.galview share/gnome/evolution/views/tasks/galview.xml -share/gnome/help/evolution/C/aboutbook.html share/gnome/help/evolution/C/apx-authors.sgml share/gnome/help/evolution/C/apx-bugs.sgml share/gnome/help/evolution/C/apx-gloss.html @@ -325,7 +327,10 @@ share/gnome/help/evolution/C/config-sync.html share/gnome/help/evolution/C/config-sync.sgml share/gnome/help/evolution/C/config.html +share/gnome/help/evolution/C/contact-automation-basic.html +share/gnome/help/evolution/C/contact-automation-lists.html share/gnome/help/evolution/C/contact-search.html +share/gnome/help/evolution/C/customizing-summary.html share/gnome/help/evolution/C/docbook.css share/gnome/help/evolution/C/encryption.html share/gnome/help/evolution/C/evolution-faq.sgml @@ -363,6 +368,7 @@ share/gnome/help/evolution/C/quickref-cal.html share/gnome/help/evolution/C/quickref-contact.html share/gnome/help/evolution/C/quickref-mail.html +share/gnome/help/evolution/C/rsvp-stuff.html share/gnome/help/evolution/C/stylesheet-images/caution.gif share/gnome/help/evolution/C/stylesheet-images/home.gif share/gnome/help/evolution/C/stylesheet-images/important.gif @@ -376,19 +382,18 @@ share/gnome/help/evolution/C/stylesheet-images/up.gif share/gnome/help/evolution/C/stylesheet-images/warning.gif share/gnome/help/evolution/C/topic.dat +share/gnome/help/evolution/C/typography.html share/gnome/help/evolution/C/ui-intro.html share/gnome/help/evolution/C/usage-calendar-apts.html share/gnome/help/evolution/C/usage-calendar-multiple.html share/gnome/help/evolution/C/usage-calendar-todo.html share/gnome/help/evolution/C/usage-calendar.html share/gnome/help/evolution/C/usage-calendar.sgml -share/gnome/help/evolution/C/usage-contact-automate.html share/gnome/help/evolution/C/usage-contact-organize.html share/gnome/help/evolution/C/usage-contact-sharing.html share/gnome/help/evolution/C/usage-contact.html share/gnome/help/evolution/C/usage-contact.sgml share/gnome/help/evolution/C/usage-encryption.sgml -share/gnome/help/evolution/C/usage-exec-summary.html share/gnome/help/evolution/C/usage-exec-summary.sgml share/gnome/help/evolution/C/usage-mail-getnsend-get.html share/gnome/help/evolution/C/usage-mail-getnsend-send.html @@ -401,10 +406,12 @@ share/gnome/help/evolution/C/usage-mail-subscriptions.html share/gnome/help/evolution/C/usage-mail.html share/gnome/help/evolution/C/usage-mail.sgml +share/gnome/help/evolution/C/usage-mainwindow-starting.html share/gnome/help/evolution/C/usage-mainwindow.html share/gnome/help/evolution/C/usage-mainwindow.sgml share/gnome/help/evolution/C/usage-print.html share/gnome/help/evolution/C/usage-print.sgml +share/gnome/help/evolution/C/usage-summary.html share/gnome/help/evolution/C/usage-sync.html share/gnome/help/evolution/C/usage-sync.sgml share/gnome/help/evolution/C/usage.html @@ -633,6 +640,7 @@ share/gnome/images/evolution/import.xpm share/gnome/images/evolution/inbox-16.png share/gnome/images/evolution/inbox-full-16.png +share/gnome/images/evolution/ldap-16.png share/gnome/images/evolution/mail-config-druid-account-name.png share/gnome/images/evolution/mail-config-druid-identity.png share/gnome/images/evolution/mail-config-druid-receive.png @@ -640,6 +648,7 @@ share/gnome/images/evolution/mail-config-druid.png share/gnome/images/evolution/malehead.png share/gnome/images/evolution/mark-as-important-16.png +share/gnome/images/evolution/meeting-request.png share/gnome/images/evolution/move_message.xpm share/gnome/images/evolution/myevo-appointments.png share/gnome/images/evolution/myevo-mail-summary.png @@ -661,6 +670,9 @@ share/gnome/images/evolution/outbox-16.png share/gnome/images/evolution/outbox-full-16.png share/gnome/images/evolution/pattern.png +share/gnome/images/evolution/pgp-signature-bad.png +share/gnome/images/evolution/pgp-signature-nokey.png +share/gnome/images/evolution/pgp-signature-ok.png share/gnome/images/evolution/print-preview.xpm share/gnome/images/evolution/print.xpm share/gnome/images/evolution/rdf.png @@ -689,6 +701,8 @@ share/gnome/images/evolution/talking-heads.png share/gnome/images/evolution/task.xpm share/gnome/images/evolution/thankyou.png +share/gnome/images/evolution/timezone-16.xpm +share/gnome/images/evolution/timezone-48.png share/gnome/images/evolution/undelete_message-16.png share/gnome/images/evolution/wax-seal-broken.png share/gnome/images/evolution/wax-seal.png @@ -1108,6 +1122,7 @@ share/gnome/ui/evolution.xml share/gnome/ui/my-evolution.xml share/locale/az/LC_MESSAGES/evolution.mo +share/locale/bg/LC_MESSAGES/evolution.mo share/locale/ca/LC_MESSAGES/evolution.mo share/locale/da/LC_MESSAGES/evolution.mo share/locale/de/LC_MESSAGES/evolution.mo @@ -1155,6 +1170,9 @@ @dirrm share/gnome/images/evolution/buttons @dirrm share/gnome/images/evolution @dirrm share/gnome/images +@dirrm share/gnome/html/evolution-devel-guide +@dirrm share/gnome/html/evolution-cal-util +@dirrm share/gnome/html/evolution-cal-client @dirrm share/gnome/help/evolution/no/stylesheet-images @dirrm share/gnome/help/evolution/no/figures @dirrm share/gnome/help/evolution/no Index: evolution/files/patch-aa =================================================================== RCS file: /home/ncvs/ports/mail/evolution/files/patch-aa,v retrieving revision 1.9 diff -d -u -r1.9 patch-aa --- evolution/files/patch-aa 2001/09/13 06:43:26 1.9 +++ evolution/files/patch-aa 2001/09/28 12:14:41 @@ -1,15 +1,18 @@ ---- configure.orig Thu Sep 13 08:28:28 2001 -+++ configure Thu Sep 13 08:29:17 2001 -@@ -5554,7 +5554,7 @@ + +$FreeBSD$ + +--- configure.orig Fri Sep 28 13:40:57 2001 ++++ configure Fri Sep 28 13:43:29 2001 +@@ -9255,7 +9255,7 @@ CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $DB3_CFLAGS" + CPPFLAGS="$DB3_CFLAGS $CPPFLAGS" -for ac_hdr in db.h db3/db.h +for ac_hdr in db3/db.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -5628,7 +5628,7 @@ +@@ -9329,7 +9329,7 @@ echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -18,17 +21,17 @@ fi rm -f conftest* -@@ -5648,7 +5648,7 @@ +@@ -9349,7 +9349,7 @@ ac_cv_db3_ldadd="" for name in db db3 db-3.1; do - LIBS="$LIBS_save $with_db3_libs/lib${name}.a" + LIBS="$LIBS_save $with_db3_libs/lib${name}.so" cat > conftest.$ac_ext <<EOF - #line 5654 "configure" + #line 9355 "configure" #include "confdefs.h" -@@ -5669,7 +5669,7 @@ - if { (eval echo configure:5670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -9370,7 +9370,7 @@ + if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a" @@ -36,7 +39,7 @@ break else -@@ -5739,7 +5739,7 @@ +@@ -9440,7 +9440,7 @@ echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6 if test "$ac_cv_db3_lib_version_match" = no; then @@ -45,7 +48,7 @@ fi CPPFLAGS="$CPPFLAGS_save" -@@ -9349,10 +9349,10 @@ +@@ -12738,10 +12738,10 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac Index: evolution/files/patch-ltmain.sh =================================================================== RCS file: patch-ltmain.sh diff -N patch-ltmain.sh --- /dev/null Fri Sep 28 05:13:28 2001 +++ patch-ltmain.sh Fri Sep 28 05:14:41 2001 @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- ltmain.sh 2001/08/27 09:51:26 1.1 ++++ ltmain.sh 2001/08/27 09:51:42 +@@ -4175,10 +4175,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" --------------BE28246A5B309813380CC1AA-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3BBDC1DB.6D718ECA>