summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gnome-vfs/Makefile7
-rw-r--r--devel/gnome-vfs/distinfo2
-rw-r--r--devel/gnome-vfs/files/patch-ah139
-rw-r--r--devel/gnome-vfs/pkg-plist2
-rw-r--r--devel/gnome-vfs1/Makefile7
-rw-r--r--devel/gnome-vfs1/distinfo2
-rw-r--r--devel/gnome-vfs1/files/patch-ah139
-rw-r--r--devel/gnome-vfs1/pkg-plist2
-rw-r--r--devel/gnomevfs/Makefile7
-rw-r--r--devel/gnomevfs/distinfo2
-rw-r--r--devel/gnomevfs/files/patch-ah139
-rw-r--r--devel/gnomevfs/pkg-plist2
-rw-r--r--devel/gnomevfs2/Makefile7
-rw-r--r--devel/gnomevfs2/distinfo2
-rw-r--r--devel/gnomevfs2/files/patch-ah139
-rw-r--r--devel/gnomevfs2/pkg-plist2
16 files changed, 580 insertions, 20 deletions
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 1b8951876aab..52a64d518e8d 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomevfs
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-vfs
@@ -24,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --disable-gconf
+#CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -36,5 +35,7 @@ pre-patch:
@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'
.include <bsd.port.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 397dc52bef0f..fe36b7b329e5 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.4.2.tar.gz) = ecb37aeca042c846322fc7cc894be6ae
+MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
diff --git a/devel/gnome-vfs/files/patch-ah b/devel/gnome-vfs/files/patch-ah
new file mode 100644
index 000000000000..66ce9c74c5aa
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ah
@@ -0,0 +1,139 @@
+--- 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-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 3e6b09593e00..5210efe36233 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -1,5 +1,4 @@
bin/gnome-vfs-config
-bin/gnome-vfs-gen-mimedb
bin/gnome-vfs-slave
bin/nautilus-mime-type-capplet
etc/gnome-vfs-mime-magic
@@ -31,6 +30,7 @@ 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-private.h
include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
include/libgnomevfs/gnome-vfs-mime.h
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 1b8951876aab..52a64d518e8d 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomevfs
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-vfs
@@ -24,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --disable-gconf
+#CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -36,5 +35,7 @@ pre-patch:
@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'
.include <bsd.port.mk>
diff --git a/devel/gnome-vfs1/distinfo b/devel/gnome-vfs1/distinfo
index 397dc52bef0f..fe36b7b329e5 100644
--- a/devel/gnome-vfs1/distinfo
+++ b/devel/gnome-vfs1/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.4.2.tar.gz) = ecb37aeca042c846322fc7cc894be6ae
+MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
diff --git a/devel/gnome-vfs1/files/patch-ah b/devel/gnome-vfs1/files/patch-ah
new file mode 100644
index 000000000000..66ce9c74c5aa
--- /dev/null
+++ b/devel/gnome-vfs1/files/patch-ah
@@ -0,0 +1,139 @@
+--- 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 3e6b09593e00..5210efe36233 100644
--- a/devel/gnome-vfs1/pkg-plist
+++ b/devel/gnome-vfs1/pkg-plist
@@ -1,5 +1,4 @@
bin/gnome-vfs-config
-bin/gnome-vfs-gen-mimedb
bin/gnome-vfs-slave
bin/nautilus-mime-type-capplet
etc/gnome-vfs-mime-magic
@@ -31,6 +30,7 @@ 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-private.h
include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
include/libgnomevfs/gnome-vfs-mime.h
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 1b8951876aab..52a64d518e8d 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomevfs
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-vfs
@@ -24,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --disable-gconf
+#CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -36,5 +35,7 @@ pre-patch:
@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'
.include <bsd.port.mk>
diff --git a/devel/gnomevfs/distinfo b/devel/gnomevfs/distinfo
index 397dc52bef0f..fe36b7b329e5 100644
--- a/devel/gnomevfs/distinfo
+++ b/devel/gnomevfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.4.2.tar.gz) = ecb37aeca042c846322fc7cc894be6ae
+MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
diff --git a/devel/gnomevfs/files/patch-ah b/devel/gnomevfs/files/patch-ah
new file mode 100644
index 000000000000..66ce9c74c5aa
--- /dev/null
+++ b/devel/gnomevfs/files/patch-ah
@@ -0,0 +1,139 @@
+--- 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/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist
index 3e6b09593e00..5210efe36233 100644
--- a/devel/gnomevfs/pkg-plist
+++ b/devel/gnomevfs/pkg-plist
@@ -1,5 +1,4 @@
bin/gnome-vfs-config
-bin/gnome-vfs-gen-mimedb
bin/gnome-vfs-slave
bin/nautilus-mime-type-capplet
etc/gnome-vfs-mime-magic
@@ -31,6 +30,7 @@ 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-private.h
include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
include/libgnomevfs/gnome-vfs-mime.h
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 1b8951876aab..52a64d518e8d 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gnomevfs
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gnome-vfs
@@ -24,7 +23,7 @@ USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
INSTALL_SHLIBS= yes
-CONFIGURE_ARGS= --disable-gconf
+#CONFIGURE_ARGS= --disable-gconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
@@ -36,5 +35,7 @@ pre-patch:
@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'
.include <bsd.port.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 397dc52bef0f..fe36b7b329e5 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.4.2.tar.gz) = ecb37aeca042c846322fc7cc894be6ae
+MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
diff --git a/devel/gnomevfs2/files/patch-ah b/devel/gnomevfs2/files/patch-ah
new file mode 100644
index 000000000000..66ce9c74c5aa
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-ah
@@ -0,0 +1,139 @@
+--- 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/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 3e6b09593e00..5210efe36233 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -1,5 +1,4 @@
bin/gnome-vfs-config
-bin/gnome-vfs-gen-mimedb
bin/gnome-vfs-slave
bin/nautilus-mime-type-capplet
etc/gnome-vfs-mime-magic
@@ -31,6 +30,7 @@ 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-private.h
include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
include/libgnomevfs/gnome-vfs-mime.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 10:32:13 +0000