aboutsummaryrefslogtreecommitdiffstats
path: root/devel/gnome-vfs1
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2001-05-05 05:39:58 +0800
committerade <ade@FreeBSD.org>2001-05-05 05:39:58 +0800
commit47096a53b6ba4bc8cf0c36b6496e7e6bd04d1a56 (patch)
treef1bacc1ef2f6c75368fd9132a67b624f0abf2cd4 /devel/gnome-vfs1
parentb168e3046ef1066791fa96cbbbdcfc373243817c (diff)
downloadfreebsd-ports-gnome-47096a53b6ba4bc8cf0c36b6496e7e6bd04d1a56.tar.gz
freebsd-ports-gnome-47096a53b6ba4bc8cf0c36b6496e7e6bd04d1a56.tar.zst
freebsd-ports-gnome-47096a53b6ba4bc8cf0c36b6496e7e6bd04d1a56.zip
Update to GNOME 1.4 -- massive changes all around, for the sake of
CVS repo bloat, I'll only list the updates. graphics/imlib 1.9.9 -> 1.9.10 textproc/xml-i18n-tools 0.8 -> 0.8.1 x11/gnomelibs 1.2.11 -> 1.2.13 devel/oaf 0.6.2 -> 0.6.5 devel/gconf 0.12 -> 1.0.0 devel/gnomevfs 0.5 -> 1.0 graphics/gdk-pixbuf 0.9.0 -> 0.11.0 sysutils/gnomecontrolcenter 1.2.2 -> 1.4.0.1 print/gnomeprint 0.25 -> 0.28 devel/bonobo 0.37 -> 1.0.3 audio/gnomeaudio 1.0.0 -> 1.4.0 x11/gnomecore 1.2.4 -> 1.4.0.3 devel/libgtop 1.0.11 -> 1.0.12 x11/gnomeapplets 1.2.4 -> 1.4.0.1 misc/gnomeuserdocs NEW 1.4.1 misc/gnomeutils 1.2.1 -> 1.4.0 deskutils/gnomepim 1.2.0 -> 1.4.0 games/gnomegames 1.2.0 -> 1.4.0.1 print/ggv 0.95 -> 1.0 editors/ghex 1.1.4 -> 1.2 devel/bugbuddy 1.2 -> 2.0.1 devel/glade 0.5.11 -> 0.6.2 sysutils/gtop 1.0.12 -> 1.0.13 x11/xalf NEW 0.11 x11-toolkits/py-gtk 0.6.6 -> 0.6.7 x11-toolkits/py-gnome 1.0.53 -> 1.4.0 x11-toolkits/guile-gtk 0.19 -> 0.20 x11-toolkits/guile-gnome 0.10 -> 0.20 devel/libsigc++ 1.0.1 -> 1.0.3 x11-toolkits/gnome-- 1.1.15 -> 1.1.17 x11-toolkits/panel-- NEW 0.1 x11-fm/gnomemc 4.5.51 -> 4.5.54
Diffstat (limited to 'devel/gnome-vfs1')
-rw-r--r--devel/gnome-vfs1/Makefile8
-rw-r--r--devel/gnome-vfs1/distinfo2
-rw-r--r--devel/gnome-vfs1/files/patch-aa22
-rw-r--r--devel/gnome-vfs1/files/patch-ab29
-rw-r--r--devel/gnome-vfs1/files/patch-ae10
-rw-r--r--devel/gnome-vfs1/files/patch-ah139
-rw-r--r--devel/gnome-vfs1/pkg-plist12
7 files changed, 35 insertions, 187 deletions
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index e10c3bff11d8..c834266d6a60 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gnomevfs
-PORTVERSION= 0.5
+PORTVERSION= 1.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-vfs
@@ -14,16 +14,14 @@ DISTNAME= gnome-vfs-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
- gconf-1.1:${PORTSDIR}/devel/gconf \
+LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOME= yes
+USE_GNOMELIBS= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-#CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gnome-vfs1/distinfo b/devel/gnome-vfs1/distinfo
index fe36b7b329e5..b3ac5fdb1674 100644
--- a/devel/gnome-vfs1/distinfo
+++ b/devel/gnome-vfs1/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
+MD5 (gnome-vfs-1.0.tar.gz) = 2ddec52e27f5e8f4939f37e9b34c0732
diff --git a/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa
index 98bb9e5f2b8d..b709bbd7cb5b 100644
--- a/devel/gnome-vfs1/files/patch-aa
+++ b/devel/gnome-vfs1/files/patch-aa
@@ -1,7 +1,23 @@
---- configure.orig Thu Nov 2 17:44:34 2000
-+++ configure Fri Nov 3 10:22:49 2000
-@@ -2196,3 +2196,3 @@
+--- configure.orig Mon Mar 12 19:26:12 2001
++++ configure Thu Mar 15 20:33:39 2001
+@@ -2280,3 +2280,3 @@
VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`"
- VFS_GLIB_CONFIG="glib-config"
+ VFS_GLIB_CONFIG="$GLIB_CONFIG"
else
+@@ -6930,4 +6930,4 @@
+
+-echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
+-echo "configure:6933: checking for bzCompressInit in -lbz2" >&5
++echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
++echo "configure:6933: checking for BZ2_bzCompressInit in -lbz2" >&5
+ ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
+@@ -6944,6 +6944,6 @@
+ builtin and then its argument prototype would still apply. */
+-char bzCompressInit();
++char BZ2_bzCompressInit();
+
+ int main() {
+-bzCompressInit()
++BZ2_bzCompressInit()
+ ; return 0; }
diff --git a/devel/gnome-vfs1/files/patch-ab b/devel/gnome-vfs1/files/patch-ab
index 0b8cc0137d1e..1f9e2c80cbab 100644
--- a/devel/gnome-vfs1/files/patch-ab
+++ b/devel/gnome-vfs1/files/patch-ab
@@ -1,31 +1,16 @@
---- Makefile.in.orig Wed Nov 29 15:02:07 2000
-+++ Makefile.in Wed Nov 29 15:04:28 2000
-@@ -169,9 +169,9 @@
- @USING_OAF_TRUE@SUBDIRS_OAF = libgnomevfs-corba
- @USING_OAF_FALSE@SUBDIRS_OAF =
- @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME =
--@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = test mime-type-capplet
-+@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = mime-type-capplet
+--- Makefile.in.orig Mon Mar 12 19:28:26 2001
++++ Makefile.in Thu Mar 15 20:25:50 2001
+@@ -174,3 +174,3 @@
--SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man devel-docs $(SUBDIRS_GNOME) po
-+SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man $(SUBDIRS_GNOME) po
+-SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man devel-docs $(SUBDIRS_GNOME) po macros
++SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man $(SUBDIRS_GNOME) po macros
-
- EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec vfsConf.sh.in vfscorbaConf.sh.in vfspthreadConf.sh.in gnome-vfs-config.in
-@@ -179,7 +179,7 @@
-
- bin_SCRIPTS = $(top_builddir)/gnome-vfs-config
+@@ -182,3 +182,3 @@
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
confexec_DATA = vfsConf.sh vfscorbaConf.sh vfspthreadConf.sh
-
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -539,6 +539,7 @@
-
- gnome-vfs-config: gnome-vfs-config.in Makefile
+@@ -542,2 +542,3 @@
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' \
diff --git a/devel/gnome-vfs1/files/patch-ae b/devel/gnome-vfs1/files/patch-ae
deleted file mode 100644
index 736b9b64d1cb..000000000000
--- a/devel/gnome-vfs1/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- mime-type-capplet/nautilus-mime-type-capplet.c.orig Thu Nov 2 02:37:45 2000
-+++ mime-type-capplet/nautilus-mime-type-capplet.c Fri Nov 3 10:27:38 2000
-@@ -32,3 +32,7 @@
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- #include <string.h>
diff --git a/devel/gnome-vfs1/files/patch-ah b/devel/gnome-vfs1/files/patch-ah
deleted file mode 100644
index 66ce9c74c5aa..000000000000
--- a/devel/gnome-vfs1/files/patch-ah
+++ /dev/null
@@ -1,139 +0,0 @@
---- libgnomevfs-pthread/gnome-vfs-thread-pool.c.orig Tue Jan 16 15:46:59 2001
-+++ libgnomevfs-pthread/gnome-vfs-thread-pool.c Mon Jan 29 11:04:11 2001
-@@ -45,3 +45,7 @@
-
-+#ifdef __FreeBSD__
-+static pthread_mutex_t thread_list_lock;
-+#else
- static pthread_mutex_t thread_list_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+#endif
-
-@@ -176,2 +180,19 @@
- GnomeVFSThreadState *available_thread;
-+
-+#ifdef __FreeBSD__
-+ static int init = 0;
-+
-+ if (init == 0) {
-+ pthread_mutexattr_t attr;
-+
-+ if (pthread_mutexattr_init(&attr) < 0)
-+ return -1;
-+ if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) < 0)
-+ return -1;
-+ if (pthread_mutex_init(&thread_list_lock, &attr) < 0)
-+ return -1;
-+
-+ init = 1;
-+ }
-+#endif
-
---- libgnomevfs-pthread/gnome-vfs-async-job-map.c.orig Fri Jan 19 12:10:09 2001
-+++ libgnomevfs-pthread/gnome-vfs-async-job-map.c Mon Jan 29 11:19:10 2001
-@@ -33,3 +33,7 @@
- static guint async_job_map_next_id;
-+#ifdef __FreeBSD__
-+static pthread_mutex_t async_job_map_lock;
-+#else
- static pthread_mutex_t async_job_map_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+#endif
- gboolean async_job_map_locked;
-@@ -148,2 +152,28 @@
-
-+#ifdef __FreeBSD__
-+static void lock_and_load(pthread_mutex_t *mtx)
-+{
-+ static int init = 0;
-+ int rc;
-+
-+ if (init == 0) {
-+ pthread_mutexattr_t attr;
-+
-+ rc = pthread_mutexattr_init(&attr);
-+ g_assert(rc == 0);
-+
-+ rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+ g_assert(rc == 0);
-+
-+ rc = pthread_mutex_init(mtx, &attr);
-+ g_assert(rc == 0);
-+
-+ init = 1;
-+ }
-+
-+ rc = pthread_mutex_lock(mtx);
-+ g_assert(rc == 0);
-+}
-+#endif
-+
- void
-@@ -151,3 +181,7 @@
- {
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_map_lock);
-+#else
- pthread_mutex_lock (&async_job_map_lock);
-+#endif
- async_job_map_locked = TRUE;
-@@ -180,3 +214,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
-
-@@ -209,3 +247,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_insert (async_job_callback_map, GUINT_TO_POINTER (notify_result->callback_id),
-@@ -221,3 +263,7 @@
- JOB_DEBUG (("removing callback %d ", callback_id));
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_remove (async_job_callback_map, GUINT_TO_POINTER (callback_id));
-@@ -250,3 +296,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_foreach (async_job_callback_map,
-@@ -261,3 +311,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_destroy (async_job_callback_map);
---- modules/ftp-method.c.orig Tue Jan 9 13:54:02 2001
-+++ modules/ftp-method.c Mon Jan 29 11:42:30 2001
-@@ -39,2 +39,3 @@
-
-+#include <sys/types.h>
- #include <ctype.h> /* for isspace */
---- modules/nfs-method.c.orig Sat Dec 30 09:50:36 2000
-+++ modules/nfs-method.c Mon Jan 29 11:44:59 2001
-@@ -127,2 +127,3 @@
- break;
-+#ifndef __FreeBSD__
- } else if (*success == ECOMM) {
-@@ -136,2 +137,3 @@
- */
-+#endif
- } else if ((rv == RPC_CANTSEND) || /* can't send */
-@@ -140,3 +142,5 @@
- (rv == RPC_SYSTEMERROR) || /* generic other problem at server */
-+#ifndef __FreeBSD__
- (rv == RPC_RPCBFAILURE) || /* portmapper failed in its call */
-+#endif
- (rv == RPC_CANTDECODEARGS) || /* can't decode arguments */
diff --git a/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist
index 5210efe36233..0140524794c2 100644
--- a/devel/gnome-vfs1/pkg-plist
+++ b/devel/gnome-vfs1/pkg-plist
@@ -1,6 +1,5 @@
bin/gnome-vfs-config
bin/gnome-vfs-slave
-bin/nautilus-mime-type-capplet
etc/gnome-vfs-mime-magic
etc/vfs/modules/default-modules.conf
etc/vfsConf.sh
@@ -15,7 +14,6 @@ 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-list.h
include/libgnomevfs/gnome-vfs-directory.h
include/libgnomevfs/gnome-vfs-file-info.h
include/libgnomevfs/gnome-vfs-file-size.h
@@ -31,7 +29,6 @@ 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-private.h
include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
include/libgnomevfs/gnome-vfs-mime.h
include/libgnomevfs/gnome-vfs-module-shared.h
@@ -41,7 +38,6 @@ 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-process.h
include/libgnomevfs/gnome-vfs-regexp-filter.h
include/libgnomevfs/gnome-vfs-result.h
include/libgnomevfs/gnome-vfs-seekable.h
@@ -85,19 +81,18 @@ lib/vfs/modules/libftp.so
lib/vfs/modules/libgconf.so
lib/vfs/modules/libgzip.so
lib/vfs/modules/libhttp.so
-lib/vfs/modules/libnfs.so
lib/vfs/modules/libvfs-pipe.so
lib/vfs/modules/libvfs-test.so
lib/vfs/modules/libvfs-translate.so
share/gnome/application-registry/gnome-vfs.applications
-share/gnome/apps/Settings/nautilus-mime-type.desktop
-share/gnome/control-center/nautilus-mime-type.desktop
share/gnome/mime-info/gnome-vfs.keys
share/gnome/mime-info/gnome-vfs.mime
+share/locale/az/LC_MESSAGES/gnome-vfs.mo
share/locale/ca/LC_MESSAGES/gnome-vfs.mo
share/locale/da/LC_MESSAGES/gnome-vfs.mo
share/locale/de/LC_MESSAGES/gnome-vfs.mo
share/locale/el/LC_MESSAGES/gnome-vfs.mo
+share/locale/es/LC_MESSAGES/gnome-vfs.mo
share/locale/fi/LC_MESSAGES/gnome-vfs.mo
share/locale/fr/LC_MESSAGES/gnome-vfs.mo
share/locale/ga/LC_MESSAGES/gnome-vfs.mo
@@ -108,15 +103,18 @@ share/locale/ja/LC_MESSAGES/gnome-vfs.mo
share/locale/ko/LC_MESSAGES/gnome-vfs.mo
share/locale/lt/LC_MESSAGES/gnome-vfs.mo
share/locale/nl/LC_MESSAGES/gnome-vfs.mo
+share/locale/nn/LC_MESSAGES/gnome-vfs.mo
share/locale/no/LC_MESSAGES/gnome-vfs.mo
share/locale/pl/LC_MESSAGES/gnome-vfs.mo
share/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
+share/locale/ro/LC_MESSAGES/gnome-vfs.mo
share/locale/ru/LC_MESSAGES/gnome-vfs.mo
share/locale/sk/LC_MESSAGES/gnome-vfs.mo
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/wa/LC_MESSAGES/gnome-vfs.mo
@dirrm share/gnome/application-registry
@dirrm lib/vfs/modules
@dirrm lib/vfs/include