FreeBSD Bugzilla – Attachment 20373 Details for
Bug 35971
[PATCH] Update devel/gnomevfs to 1.0.5
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
gnomevfs.diff
gnomevfs.diff (text/plain), 9.40 KB, created by
Joe Marcus Clarke
on 2002-03-16 09:20:01 UTC
(
hide
)
Description:
gnomevfs.diff
Filename:
MIME Type:
Creator:
Joe Marcus Clarke
Created:
2002-03-16 09:20:01 UTC
Size:
9.40 KB
patch
obsolete
>--- Makefile.orig Sat Mar 16 04:02:55 2002 >+++ Makefile Sat Mar 16 03:21:40 2002 >@@ -6,12 +6,12 @@ > # > > PORTNAME= gnomevfs >-PORTVERSION= 1.0.4 >-PORTREVISION= 3 >+PORTVERSION= 1.0.5 > CATEGORIES= devel gnome > MASTER_SITES= ${MASTER_SITE_GNOME} > MASTER_SITE_SUBDIR= stable/sources/gnome-vfs > DISTNAME= gnome-vfs-${PORTVERSION} >+DIST_SUBDIR= gnome > > MAINTAINER= gnome@FreeBSD.org > >@@ -23,6 +23,7 @@ > .endif > RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata > >+USE_BZIP2= yes > USE_GMAKE= yes > USE_X_PREFIX= yes > USE_GNOMELIBS= yes >@@ -34,8 +35,6 @@ > XGETTEXT=${LOCALBASE}/bin/xgettext-new \ > BSD_PTHREAD_LIBS=${PTHREAD_LIBS} > >-MAN5= gnome-vfs-mime.5 >- > pre-patch: > @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ > s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure >@@ -44,5 +43,7 @@ > s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' > @find ${WRKSRC} -name 'xml-i18n-*' | xargs ${PERL} -pi -e \ > 's|/usr/local/bin/perl|${PERL}|g' >+ @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ >+ 's|iconv\.h|giconv.h|g' > > .include <bsd.port.mk> >--- distinfo.orig Sat Mar 16 04:03:02 2002 >+++ distinfo Sat Mar 16 02:56:55 2002 >@@ -1 +1 @@ >-MD5 (gnome-vfs-1.0.4.tar.gz) = d3dd15715da9671813805674cafa0dc8 >+MD5 (gnome/gnome-vfs-1.0.5.tar.bz2) = e2a17a6b178f54c43968241258f3e729 >--- pkg-plist.orig Sat Mar 16 04:03:14 2002 >+++ pkg-plist Sat Mar 16 03:36:24 2002 >@@ -1,6 +1,5 @@ > bin/gnome-vfs-config > etc/vfs/modules/default-modules.conf >-etc/vfsConf.sh > 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 >@@ -48,6 +47,7 @@ > 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/charset.alias > lib/libgnomevfs-pthread.so > lib/libgnomevfs.a > lib/libgnomevfs.so >@@ -80,6 +80,7 @@ > lib/vfs/modules/libvfs-pipe.so > lib/vfs/modules/libvfs-test.so > lib/vfs/modules/libvfs-translate.so >+lib/vfsConf.sh > share/locale/az/LC_MESSAGES/gnome-vfs.mo > share/locale/ca/LC_MESSAGES/gnome-vfs.mo > share/locale/da/LC_MESSAGES/gnome-vfs.mo >--- files/patch-aa.orig Sat Mar 16 04:03:28 2002 >+++ files/patch-aa Sat Mar 16 03:16:40 2002 >@@ -1,29 +1,26 @@ >- >-$FreeBSD: ports/devel/gnomevfs/files/patch-aa,v 1.11 2002/01/26 08:05:29 sobomax Exp $ >- >---- configure.orig Thu Jan 24 10:25:14 2002 >-+++ configure Thu Jan 24 10:38:00 2002 >-@@ -5949,7 +5949,7 @@ >+--- configure.orig Sat Mar 16 03:12:51 2002 >++++ configure Sat Mar 16 03:16:28 2002 >+@@ -5953,7 +5953,7 @@ >+ VFS_GNOME_LIBS="`gnome-config --libs gnome`" > 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" > > > >-@@ -9854,8 +9854,8 @@ >+@@ -9856,8 +9856,8 @@ > done > fi > > -echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 >--echo "configure:9859: checking for bzCompressInit in -lbz2" >&5 >+-echo "configure:9861: checking for bzCompressInit in -lbz2" >&5 > +echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 > +echo "configure:9859: checking for BZ2_bzCompressInit in -lbz2" >&5 > ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` > if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then > echo $ac_n "(cached) $ac_c" 1>&6 >-@@ -9868,10 +9868,10 @@ >+@@ -9870,10 +9870,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. */ >@@ -35,26 +32,53 @@ > +BZ2_bzCompressInit() > ; return 0; } > EOF >- if { (eval echo configure:9878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then >-@@ -10101,7 +10101,7 @@ >+ if { (eval echo configure:9880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then >+@@ -10103,7 +10103,7 @@ > echo $ac_n "(cached) $ac_c" 1>&6 > else > > - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" > + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo" > cat > conftest.$ac_ext <<EOF >- #line 10107 "configure" >+ #line 10109 "configure" > #include "confdefs.h" >-@@ -10135,7 +10135,7 @@ >+@@ -10137,7 +10137,7 @@ > EOF > > msg_openssl="yes" > - OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto -ldl" >-+ OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo" >++ OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptfoo" > > > if true; then >-@@ -10594,7 +10594,7 @@ >+@@ -10559,14 +10559,14 @@ >+ # >+ # Check for libiconv >+ # >+- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 >+-echo "configure:10564: checking for libiconv_open in -liconv" >&5 >++ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 >++echo "configure:10564: checking for libiconv_open in -lgiconv" >&5 >+ ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` >+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then >+ echo $ac_n "(cached) $ac_c" 1>&6 >+ else >+ ac_save_LIBS="$LIBS" >+-LIBS="-liconv $LIBS" >++LIBS="-lgiconv $LIBS" >+ cat > conftest.$ac_ext <<EOF >+ #line 10572 "configure" >+ #include "confdefs.h" >+@@ -10606,7 +10606,7 @@ >+ fi >+ >+ if test "x$with_libiconv" = "xyes" ; then >+- ICONV_LIBS="-liconv" >++ ICONV_LIBS="-lgiconv" >+ cat >> confdefs.h <<\EOF >+ #define USE_LIBICONV 1 >+ EOF >+@@ -10897,7 +10897,7 @@ > s%@GTK_CFLAGS@%$GTK_CFLAGS%g > s%@GTK_LIBS@%$GTK_LIBS%g > s%@cflags_set@%$cflags_set%g >--- files/patch-ab.orig Sat Mar 16 04:03:40 2002 >+++ files/patch-ab Sat Mar 16 03:35:24 2002 >@@ -1,40 +1,23 @@ >- >-$FreeBSD: ports/devel/gnomevfs/files/patch-ab,v 1.8 2002/01/23 15:22:19 sobomax Exp $ >- >---- Makefile.in.orig Tue Jan 22 11:51:36 2002 >-+++ Makefile.in Tue Jan 22 11:53:19 2002 >-@@ -186,9 +186,9 @@ >+--- Makefile.in.orig Sat Mar 16 03:31:03 2002 >++++ Makefile.in Sat Mar 16 03:31:11 2002 >+@@ -188,9 +188,9 @@ > cxxflags_set = @cxxflags_set@ > l = @l@ > @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 man devel-docs $(SUBDIRS_GNOME) po >-+SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules man $(SUBDIRS_GNOME) po >+-SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules devel-docs $(SUBDIRS_GNOME) po >++SUBDIRS = libgnomevfs libgnomevfs-pthread idl modules $(SUBDIRS_GNOME) po > > > 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 >-@@ -196,7 +196,7 @@ >+@@ -198,7 +198,7 @@ > > bin_SCRIPTS = $(top_builddir)/gnome-vfs-config > > -confexecdir = $(libdir) >-+confexecdir = $(sysconfdir) >++confexecdir = $(etcdir) > confexec_DATA = vfsConf.sh > > ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 >-@@ -535,11 +535,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' \ >--- files/patch-ac.orig Sat Mar 16 04:03:50 2002 >+++ files/patch-ac Sat Mar 16 03:12:24 2002 >@@ -1,9 +1,6 @@ >- >-$FreeBSD: ports/devel/gnomevfs/files/patch-ac,v 1.5 2002/01/24 15:09:56 sobomax Exp $ >- >---- modules/Makefile.in.orig Thu Jan 24 10:25:14 2002 >-+++ modules/Makefile.in Thu Jan 24 10:45:26 2002 >-@@ -197,7 +197,7 @@ >+--- modules/Makefile.in.orig Sat Mar 16 03:09:33 2002 >++++ modules/Makefile.in Sat Mar 16 03:11:50 2002 >+@@ -199,7 +199,7 @@ > @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la > @HAVE_CDDA_FALSE@CDDA_LTLIBS = > >@@ -12,33 +9,11 @@ > modulesdir = $(libdir)/vfs/modules > > modules_LTLIBRARIES = $(CDDA_LTLIBS) libextfs.la libfile.la libvfs-test.la $(HTTP_LTLIBS) libbzip2.la libgzip.la libftp.la libnntp.la libvfs-pipe.la libvfs-translate.la libdesktop.la $(NULL) >-@@ -216,7 +216,6 @@ >+@@ -217,7 +217,6 @@ >+ ### `cdda' method > > libcdda_la_SOURCES = cdda-method.c cdda-method.h cdda-cddb.c cdda-cddb.h cdda-cdrom-extensions.h >- > - >+ > libcdda_la_LDFLAGS = $(module_flags) > libcdda_la_LIBADD = -L/gnome/lib -lcdda_paranoia -lcdda_interface >- >-@@ -311,7 +310,7 @@ >- libextfs_la_OBJECTS = extfs-method.lo >- libfile_la_LIBADD = >- libfile_la_OBJECTS = file-method.lo >--libvfs_test_la_LDFLAGS = >-+libvfs_test_la_LDFLAGS = $(module_flags) >- libvfs_test_la_DEPENDENCIES = >- libvfs_test_la_OBJECTS = test-method.lo >- libhttp_la_DEPENDENCIES = >-@@ -320,10 +319,10 @@ >- libbzip2_la_OBJECTS = bzip2-method.lo >- libgzip_la_DEPENDENCIES = >- libgzip_la_OBJECTS = gzip-method.lo >--libftp_la_LDFLAGS = >-+libftp_la_LDFLAGS = $(module_flags) >- libftp_la_LIBADD = >- libftp_la_OBJECTS = ftp-method.lo >--libnntp_la_LDFLAGS = >-+libnntp_la_LDFLAGS = $(module_flags) >- libnntp_la_LIBADD = >- libnntp_la_OBJECTS = nntp-method.lo >- libvfs_pipe_la_DEPENDENCIES =
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=20373">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 35971
: 20373