summaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/ORBit/Makefile1
-rw-r--r--devel/ORBit/files/patch-ac13
-rw-r--r--devel/ORBit2/Makefile1
-rw-r--r--devel/ORBit2/files/patch-ac13
-rw-r--r--devel/bonobo/Makefile14
-rw-r--r--devel/bonobo/distinfo2
-rw-r--r--devel/bonobo/pkg-plist36
-rw-r--r--devel/bug-buddy/Makefile6
-rw-r--r--devel/bug-buddy/distinfo2
-rw-r--r--devel/bug-buddy/pkg-plist19
-rw-r--r--devel/bugbuddy/Makefile6
-rw-r--r--devel/bugbuddy/distinfo2
-rw-r--r--devel/bugbuddy/pkg-plist19
-rw-r--r--devel/bugbuddy2/Makefile6
-rw-r--r--devel/bugbuddy2/distinfo2
-rw-r--r--devel/bugbuddy2/pkg-plist19
-rw-r--r--devel/gconf/Makefile8
-rw-r--r--devel/gconf/distinfo2
-rw-r--r--devel/gconf/pkg-plist6
-rw-r--r--devel/gconf2/Makefile8
-rw-r--r--devel/gconf2/distinfo2
-rw-r--r--devel/gconf2/pkg-plist6
-rw-r--r--devel/glade/Makefile3
-rw-r--r--devel/glade/distinfo2
-rw-r--r--devel/glade/pkg-plist30
-rw-r--r--devel/glade2/Makefile3
-rw-r--r--devel/glade2/distinfo2
-rw-r--r--devel/glade2/pkg-plist30
-rw-r--r--devel/gnome-vfs/Makefile8
-rw-r--r--devel/gnome-vfs/distinfo2
-rw-r--r--devel/gnome-vfs/files/patch-aa22
-rw-r--r--devel/gnome-vfs/files/patch-ab29
-rw-r--r--devel/gnome-vfs/files/patch-ae10
-rw-r--r--devel/gnome-vfs/files/patch-ah139
-rw-r--r--devel/gnome-vfs/pkg-plist12
-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
-rw-r--r--devel/gnomevfs/Makefile8
-rw-r--r--devel/gnomevfs/distinfo2
-rw-r--r--devel/gnomevfs/files/patch-aa22
-rw-r--r--devel/gnomevfs/files/patch-ab29
-rw-r--r--devel/gnomevfs/files/patch-ae10
-rw-r--r--devel/gnomevfs/files/patch-ah139
-rw-r--r--devel/gnomevfs/pkg-plist12
-rw-r--r--devel/gnomevfs2/Makefile8
-rw-r--r--devel/gnomevfs2/distinfo2
-rw-r--r--devel/gnomevfs2/files/patch-aa22
-rw-r--r--devel/gnomevfs2/files/patch-ab29
-rw-r--r--devel/gnomevfs2/files/patch-ae10
-rw-r--r--devel/gnomevfs2/files/patch-ah139
-rw-r--r--devel/gnomevfs2/pkg-plist12
-rw-r--r--devel/libglade/Makefile6
-rw-r--r--devel/libglade/files/patch-aa9
-rw-r--r--devel/libglade/pkg-plist3
-rw-r--r--devel/libglade2/Makefile6
-rw-r--r--devel/libglade2/files/patch-aa9
-rw-r--r--devel/libglade2/pkg-plist3
-rw-r--r--devel/libgtop/Makefile2
-rw-r--r--devel/libgtop/distinfo2
-rw-r--r--devel/libgtop/files/patch-ah26
-rw-r--r--devel/libgtop/files/patch-ai11
-rw-r--r--devel/libgtop/pkg-plist1
-rw-r--r--devel/libgtop2/Makefile2
-rw-r--r--devel/libgtop2/distinfo2
-rw-r--r--devel/libgtop2/files/patch-ah26
-rw-r--r--devel/libgtop2/files/patch-ai11
-rw-r--r--devel/libgtop2/pkg-plist1
-rw-r--r--devel/libsigc++/Makefile2
-rw-r--r--devel/libsigc++/distinfo2
-rw-r--r--devel/libsigc++12/Makefile2
-rw-r--r--devel/libsigc++12/distinfo2
-rw-r--r--devel/libsigc++20/Makefile2
-rw-r--r--devel/libsigc++20/distinfo2
-rw-r--r--devel/oaf/Makefile11
-rw-r--r--devel/oaf/distinfo2
-rw-r--r--devel/oaf/pkg-plist2
81 files changed, 368 insertions, 930 deletions
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index daad8b7..ac53d8c 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ORBit
PORTVERSION= 0.5.7
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index f8f88a5..8844d91 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -20,17 +20,18 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
---- src/orb/Makefile.in.orig Mon Feb 15 12:59:59 1999
-+++ src/orb/Makefile.in Thu Feb 18 22:36:39 1999
-@@ -106,7 +106,7 @@
- IDL = $(top_builddir)/src/idl-compiler/orbit-idl
- IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
+--- src/orb/Makefile.in.orig Tue Jan 30 14:56:07 2001
++++ src/orb/Makefile.in Thu Mar 8 11:16:44 2001
+@@ -113,3 +113,3 @@
-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libORBit_la_LDFLAGS = -version-info 2:0:0
libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+@@ -121,3 +121,3 @@
- BUILT_SOURCES = interface_repository.h interface_repository-common.c interface_repository-stubs.c
+-CFLAGS = -g -O0
++CFLAGS = @CFLAGS@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- src/services/name/Makefile.in.orig Thu Oct 12 11:07:08 2000
+++ src/services/name/Makefile.in Thu Oct 12 13:11:55 2000
@@ -109,3 +109,3 @@
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index daad8b7..ac53d8c 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ORBit
PORTVERSION= 0.5.7
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac
index f8f88a5..8844d91 100644
--- a/devel/ORBit2/files/patch-ac
+++ b/devel/ORBit2/files/patch-ac
@@ -20,17 +20,18 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
---- src/orb/Makefile.in.orig Mon Feb 15 12:59:59 1999
-+++ src/orb/Makefile.in Thu Feb 18 22:36:39 1999
-@@ -106,7 +106,7 @@
- IDL = $(top_builddir)/src/idl-compiler/orbit-idl
- IRIDL = $(top_srcdir)/src/daemons/interface_repository/interface_repository.idl
+--- src/orb/Makefile.in.orig Tue Jan 30 14:56:07 2001
++++ src/orb/Makefile.in Thu Mar 8 11:16:44 2001
+@@ -113,3 +113,3 @@
-libORBit_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libORBit_la_LDFLAGS = -version-info 2:0:0
libORBit_la_LIBADD = $(GLIB_LIBS) -lm
+@@ -121,3 +121,3 @@
- BUILT_SOURCES = interface_repository.h interface_repository-common.c interface_repository-stubs.c
+-CFLAGS = -g -O0
++CFLAGS = @CFLAGS@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- src/services/name/Makefile.in.orig Thu Oct 12 11:07:08 2000
+++ src/services/name/Makefile.in Thu Oct 12 13:11:55 2000
@@ -109,3 +109,3 @@
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 10e4f37..d16b5de 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,20 +6,19 @@
#
PORTNAME= bonobo
-PORTVERSION= 0.37
+PORTVERSION= 1.0.3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/bonobo
+MASTER_SITE_SUBDIR= stable/sources/bonobo
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gnomeprint.13:${PORTSDIR}/print/gnomeprint \
- oaf.0:${PORTSDIR}/devel/oaf
+LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint
USE_X_PREFIX= yes
USE_PERL5= yes
USE_GMAKE= yes
-USE_GNOME= yes
+USE_GNOMECTRL= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFILES= configure libefs/configure
@@ -33,4 +32,9 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+# XXX: hack - will be fixed in next release - say hi to
+# GNOME release engineering :)
+post-patch:
+ @find ${WRKSRC} -name '*.idl' | xargs touch
+
.include <bsd.port.mk>
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 27f0975..962a390 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-0.37.tar.gz) = 9055c40397c74c9a6bc0edfcd5a1610f
+MD5 (bonobo-1.0.3.tar.gz) = 9dd2ed10a4614fc9c11559ad5c152b72
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 3c791a0..106e61f 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -26,7 +26,6 @@ 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-component-io.h
include/bonobo/bonobo-context.h
include/bonobo/bonobo-control-frame.h
include/bonobo/bonobo-control.h
@@ -114,8 +113,8 @@ 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-activation-context.html
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
@@ -132,7 +131,8 @@ 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-async.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
@@ -150,8 +150,6 @@ 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-listener.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-types.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
@@ -163,7 +161,9 @@ 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
@@ -175,10 +175,13 @@ 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
@@ -186,10 +189,27 @@ 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/x11340.html
-share/gnome/bonobo/html/bonobo/x11347.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
@@ -211,7 +231,6 @@ share/gnome/idl/Bonobo_Storage.idl
share/gnome/idl/Bonobo_UI.idl
share/gnome/idl/Bonobo_Unknown.idl
share/gnome/idl/Bonobo_Zoomable.idl
-share/gnome/mime-info/bonobo.keys
share/gnome/oaf/Bonobo_Moniker_gzip.oaf
share/gnome/oaf/Bonobo_Moniker_http.oaf
share/gnome/oaf/Bonobo_Moniker_std.oaf
@@ -240,6 +259,7 @@ share/locale/hu/LC_MESSAGES/bonobo.mo
share/locale/it/LC_MESSAGES/bonobo.mo
share/locale/ja/LC_MESSAGES/bonobo.mo
share/locale/ko/LC_MESSAGES/bonobo.mo
+share/locale/lt/LC_MESSAGES/bonobo.mo
share/locale/nl/LC_MESSAGES/bonobo.mo
share/locale/no/LC_MESSAGES/bonobo.mo
share/locale/pl/LC_MESSAGES/bonobo.mo
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index ce11bef..426cdbb 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -6,16 +6,14 @@
#
PORTNAME= bugbuddy
-PORTVERSION= 1.2
+PORTVERSION= 2.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/bug-buddy
+MASTER_SITE_SUBDIR= unstable/sources/bug-buddy
DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
-
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 1e7a6bc..858e61d 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-1.2.tar.gz) = b166326ebf19fd23ea8ec4385ec13d7d
+MD5 (bug-buddy-2.0.1.tar.gz) = e70f4e0be3ee08ae34190c20d89bf16e
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 85e477b..308f091 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -4,10 +4,14 @@ share/gnome/bug-buddy/bug-anim.png
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-core.png
share/gnome/bug-buddy/bug-flower.png
+share/gnome/bug-buddy/bugzilla/gnome.bugzilla
+share/gnome/bug-buddy/bugzilla/gnome/config
+share/gnome/bug-buddy/bugzilla/gnome/products
share/gnome/bug-buddy/debian-packages
share/gnome/bug-buddy/gdb-cmd
share/gnome/bug-buddy/gnome-packages
share/gnome/bug-buddy/gnome.appmap
+share/gnome/bug-buddy/gnome.png
share/gnome/bug-buddy/helix-packages
share/gnome/bug-buddy/kde-packages
share/gnome/bug-buddy/xml/Debian.bts
@@ -17,14 +21,15 @@ share/gnome/bug-buddy/xml/Independent_Project.bts
share/gnome/bug-buddy/xml/KDE.bts
share/gnome/help/bug-buddy/C/authors.html
share/gnome/help/bug-buddy/C/bugs.html
-share/gnome/help/bug-buddy/C/collect-debug-info.html
+share/gnome/help/bug-buddy/C/component.html
share/gnome/help/bug-buddy/C/contact-info.html
share/gnome/help/bug-buddy/C/debug-info.html
share/gnome/help/bug-buddy/C/description.html
share/gnome/help/bug-buddy/C/docbook.css
share/gnome/help/bug-buddy/C/index.html
+share/gnome/help/bug-buddy/C/license.html
share/gnome/help/bug-buddy/C/ln10.html
-share/gnome/help/bug-buddy/C/report-info.html
+share/gnome/help/bug-buddy/C/product.html
share/gnome/help/bug-buddy/C/stylesheet-images/caution.png
share/gnome/help/bug-buddy/C/stylesheet-images/important.png
share/gnome/help/bug-buddy/C/stylesheet-images/note.png
@@ -32,14 +37,13 @@ share/gnome/help/bug-buddy/C/stylesheet-images/tip.png
share/gnome/help/bug-buddy/C/stylesheet-images/warning.png
share/gnome/help/bug-buddy/C/submit-report.html
share/gnome/help/bug-buddy/C/summary.html
-share/gnome/help/bug-buddy/C/system-config.html
+share/gnome/help/bug-buddy/C/updating.html
share/gnome/help/bug-buddy/it/authors.html
share/gnome/help/bug-buddy/it/bugs.html
share/gnome/help/bug-buddy/it/collect-debug-info.html
share/gnome/help/bug-buddy/it/contact-info.html
share/gnome/help/bug-buddy/it/debug-info.html
share/gnome/help/bug-buddy/it/description.html
-share/gnome/help/bug-buddy/it/docbook.css
share/gnome/help/bug-buddy/it/index.html
share/gnome/help/bug-buddy/it/ln13.html
share/gnome/help/bug-buddy/it/report-info.html
@@ -54,9 +58,9 @@ share/gnome/help/bug-buddy/it/system-config.html
share/gnome/mime-info/bug-buddy.keys
share/gnome/mime-info/bug-buddy.mime
share/gnome/pixmaps/bug-buddy.png
+share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/ca/LC_MESSAGES/bug-buddy.mo
share/locale/cs/LC_MESSAGES/bug-buddy.mo
-share/locale/da/LC_MESSAGES/bug-buddy.mo
share/locale/de/LC_MESSAGES/bug-buddy.mo
share/locale/el/LC_MESSAGES/bug-buddy.mo
share/locale/en_AU/LC_MESSAGES/bug-buddy.mo
@@ -70,7 +74,9 @@ share/locale/hu/LC_MESSAGES/bug-buddy.mo
share/locale/it/LC_MESSAGES/bug-buddy.mo
share/locale/ja/LC_MESSAGES/bug-buddy.mo
share/locale/ko/LC_MESSAGES/bug-buddy.mo
+share/locale/lt/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
+share/locale/nn/LC_MESSAGES/bug-buddy.mo
share/locale/no/LC_MESSAGES/bug-buddy.mo
share/locale/pl/LC_MESSAGES/bug-buddy.mo
share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
@@ -81,6 +87,7 @@ share/locale/sl/LC_MESSAGES/bug-buddy.mo
share/locale/sv/LC_MESSAGES/bug-buddy.mo
share/locale/tr/LC_MESSAGES/bug-buddy.mo
share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/help/bug-buddy/it/stylesheet-images
@dirrm share/gnome/help/bug-buddy/it/figures
@dirrm share/gnome/help/bug-buddy/it
@@ -89,4 +96,6 @@ share/locale/uk/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/help/bug-buddy/C
@dirrm share/gnome/help/bug-buddy
@dirrm share/gnome/bug-buddy/xml
+@dirrm share/gnome/bug-buddy/bugzilla/gnome
+@dirrm share/gnome/bug-buddy/bugzilla
@dirrm share/gnome/bug-buddy
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index ce11bef..426cdbb 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -6,16 +6,14 @@
#
PORTNAME= bugbuddy
-PORTVERSION= 1.2
+PORTVERSION= 2.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/bug-buddy
+MASTER_SITE_SUBDIR= unstable/sources/bug-buddy
DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
-
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
index 1e7a6bc..858e61d 100644
--- a/devel/bugbuddy/distinfo
+++ b/devel/bugbuddy/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-1.2.tar.gz) = b166326ebf19fd23ea8ec4385ec13d7d
+MD5 (bug-buddy-2.0.1.tar.gz) = e70f4e0be3ee08ae34190c20d89bf16e
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index 85e477b..308f091 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -4,10 +4,14 @@ share/gnome/bug-buddy/bug-anim.png
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-core.png
share/gnome/bug-buddy/bug-flower.png
+share/gnome/bug-buddy/bugzilla/gnome.bugzilla
+share/gnome/bug-buddy/bugzilla/gnome/config
+share/gnome/bug-buddy/bugzilla/gnome/products
share/gnome/bug-buddy/debian-packages
share/gnome/bug-buddy/gdb-cmd
share/gnome/bug-buddy/gnome-packages
share/gnome/bug-buddy/gnome.appmap
+share/gnome/bug-buddy/gnome.png
share/gnome/bug-buddy/helix-packages
share/gnome/bug-buddy/kde-packages
share/gnome/bug-buddy/xml/Debian.bts
@@ -17,14 +21,15 @@ share/gnome/bug-buddy/xml/Independent_Project.bts
share/gnome/bug-buddy/xml/KDE.bts
share/gnome/help/bug-buddy/C/authors.html
share/gnome/help/bug-buddy/C/bugs.html
-share/gnome/help/bug-buddy/C/collect-debug-info.html
+share/gnome/help/bug-buddy/C/component.html
share/gnome/help/bug-buddy/C/contact-info.html
share/gnome/help/bug-buddy/C/debug-info.html
share/gnome/help/bug-buddy/C/description.html
share/gnome/help/bug-buddy/C/docbook.css
share/gnome/help/bug-buddy/C/index.html
+share/gnome/help/bug-buddy/C/license.html
share/gnome/help/bug-buddy/C/ln10.html
-share/gnome/help/bug-buddy/C/report-info.html
+share/gnome/help/bug-buddy/C/product.html
share/gnome/help/bug-buddy/C/stylesheet-images/caution.png
share/gnome/help/bug-buddy/C/stylesheet-images/important.png
share/gnome/help/bug-buddy/C/stylesheet-images/note.png
@@ -32,14 +37,13 @@ share/gnome/help/bug-buddy/C/stylesheet-images/tip.png
share/gnome/help/bug-buddy/C/stylesheet-images/warning.png
share/gnome/help/bug-buddy/C/submit-report.html
share/gnome/help/bug-buddy/C/summary.html
-share/gnome/help/bug-buddy/C/system-config.html
+share/gnome/help/bug-buddy/C/updating.html
share/gnome/help/bug-buddy/it/authors.html
share/gnome/help/bug-buddy/it/bugs.html
share/gnome/help/bug-buddy/it/collect-debug-info.html
share/gnome/help/bug-buddy/it/contact-info.html
share/gnome/help/bug-buddy/it/debug-info.html
share/gnome/help/bug-buddy/it/description.html
-share/gnome/help/bug-buddy/it/docbook.css
share/gnome/help/bug-buddy/it/index.html
share/gnome/help/bug-buddy/it/ln13.html
share/gnome/help/bug-buddy/it/report-info.html
@@ -54,9 +58,9 @@ share/gnome/help/bug-buddy/it/system-config.html
share/gnome/mime-info/bug-buddy.keys
share/gnome/mime-info/bug-buddy.mime
share/gnome/pixmaps/bug-buddy.png
+share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/ca/LC_MESSAGES/bug-buddy.mo
share/locale/cs/LC_MESSAGES/bug-buddy.mo
-share/locale/da/LC_MESSAGES/bug-buddy.mo
share/locale/de/LC_MESSAGES/bug-buddy.mo
share/locale/el/LC_MESSAGES/bug-buddy.mo
share/locale/en_AU/LC_MESSAGES/bug-buddy.mo
@@ -70,7 +74,9 @@ share/locale/hu/LC_MESSAGES/bug-buddy.mo
share/locale/it/LC_MESSAGES/bug-buddy.mo
share/locale/ja/LC_MESSAGES/bug-buddy.mo
share/locale/ko/LC_MESSAGES/bug-buddy.mo
+share/locale/lt/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
+share/locale/nn/LC_MESSAGES/bug-buddy.mo
share/locale/no/LC_MESSAGES/bug-buddy.mo
share/locale/pl/LC_MESSAGES/bug-buddy.mo
share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
@@ -81,6 +87,7 @@ share/locale/sl/LC_MESSAGES/bug-buddy.mo
share/locale/sv/LC_MESSAGES/bug-buddy.mo
share/locale/tr/LC_MESSAGES/bug-buddy.mo
share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/help/bug-buddy/it/stylesheet-images
@dirrm share/gnome/help/bug-buddy/it/figures
@dirrm share/gnome/help/bug-buddy/it
@@ -89,4 +96,6 @@ share/locale/uk/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/help/bug-buddy/C
@dirrm share/gnome/help/bug-buddy
@dirrm share/gnome/bug-buddy/xml
+@dirrm share/gnome/bug-buddy/bugzilla/gnome
+@dirrm share/gnome/bug-buddy/bugzilla
@dirrm share/gnome/bug-buddy
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index ce11bef..426cdbb 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,16 +6,14 @@
#
PORTNAME= bugbuddy
-PORTVERSION= 1.2
+PORTVERSION= 2.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/bug-buddy
+MASTER_SITE_SUBDIR= unstable/sources/bug-buddy
DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade
-
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= yes
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index 1e7a6bc..858e61d 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1 +1 @@
-MD5 (bug-buddy-1.2.tar.gz) = b166326ebf19fd23ea8ec4385ec13d7d
+MD5 (bug-buddy-2.0.1.tar.gz) = e70f4e0be3ee08ae34190c20d89bf16e
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index 85e477b..308f091 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -4,10 +4,14 @@ share/gnome/bug-buddy/bug-anim.png
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-core.png
share/gnome/bug-buddy/bug-flower.png
+share/gnome/bug-buddy/bugzilla/gnome.bugzilla
+share/gnome/bug-buddy/bugzilla/gnome/config
+share/gnome/bug-buddy/bugzilla/gnome/products
share/gnome/bug-buddy/debian-packages
share/gnome/bug-buddy/gdb-cmd
share/gnome/bug-buddy/gnome-packages
share/gnome/bug-buddy/gnome.appmap
+share/gnome/bug-buddy/gnome.png
share/gnome/bug-buddy/helix-packages
share/gnome/bug-buddy/kde-packages
share/gnome/bug-buddy/xml/Debian.bts
@@ -17,14 +21,15 @@ share/gnome/bug-buddy/xml/Independent_Project.bts
share/gnome/bug-buddy/xml/KDE.bts
share/gnome/help/bug-buddy/C/authors.html
share/gnome/help/bug-buddy/C/bugs.html
-share/gnome/help/bug-buddy/C/collect-debug-info.html
+share/gnome/help/bug-buddy/C/component.html
share/gnome/help/bug-buddy/C/contact-info.html
share/gnome/help/bug-buddy/C/debug-info.html
share/gnome/help/bug-buddy/C/description.html
share/gnome/help/bug-buddy/C/docbook.css
share/gnome/help/bug-buddy/C/index.html
+share/gnome/help/bug-buddy/C/license.html
share/gnome/help/bug-buddy/C/ln10.html
-share/gnome/help/bug-buddy/C/report-info.html
+share/gnome/help/bug-buddy/C/product.html
share/gnome/help/bug-buddy/C/stylesheet-images/caution.png
share/gnome/help/bug-buddy/C/stylesheet-images/important.png
share/gnome/help/bug-buddy/C/stylesheet-images/note.png
@@ -32,14 +37,13 @@ share/gnome/help/bug-buddy/C/stylesheet-images/tip.png
share/gnome/help/bug-buddy/C/stylesheet-images/warning.png
share/gnome/help/bug-buddy/C/submit-report.html
share/gnome/help/bug-buddy/C/summary.html
-share/gnome/help/bug-buddy/C/system-config.html
+share/gnome/help/bug-buddy/C/updating.html
share/gnome/help/bug-buddy/it/authors.html
share/gnome/help/bug-buddy/it/bugs.html
share/gnome/help/bug-buddy/it/collect-debug-info.html
share/gnome/help/bug-buddy/it/contact-info.html
share/gnome/help/bug-buddy/it/debug-info.html
share/gnome/help/bug-buddy/it/description.html
-share/gnome/help/bug-buddy/it/docbook.css
share/gnome/help/bug-buddy/it/index.html
share/gnome/help/bug-buddy/it/ln13.html
share/gnome/help/bug-buddy/it/report-info.html
@@ -54,9 +58,9 @@ share/gnome/help/bug-buddy/it/system-config.html
share/gnome/mime-info/bug-buddy.keys
share/gnome/mime-info/bug-buddy.mime
share/gnome/pixmaps/bug-buddy.png
+share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/ca/LC_MESSAGES/bug-buddy.mo
share/locale/cs/LC_MESSAGES/bug-buddy.mo
-share/locale/da/LC_MESSAGES/bug-buddy.mo
share/locale/de/LC_MESSAGES/bug-buddy.mo
share/locale/el/LC_MESSAGES/bug-buddy.mo
share/locale/en_AU/LC_MESSAGES/bug-buddy.mo
@@ -70,7 +74,9 @@ share/locale/hu/LC_MESSAGES/bug-buddy.mo
share/locale/it/LC_MESSAGES/bug-buddy.mo
share/locale/ja/LC_MESSAGES/bug-buddy.mo
share/locale/ko/LC_MESSAGES/bug-buddy.mo
+share/locale/lt/LC_MESSAGES/bug-buddy.mo
share/locale/nl/LC_MESSAGES/bug-buddy.mo
+share/locale/nn/LC_MESSAGES/bug-buddy.mo
share/locale/no/LC_MESSAGES/bug-buddy.mo
share/locale/pl/LC_MESSAGES/bug-buddy.mo
share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
@@ -81,6 +87,7 @@ share/locale/sl/LC_MESSAGES/bug-buddy.mo
share/locale/sv/LC_MESSAGES/bug-buddy.mo
share/locale/tr/LC_MESSAGES/bug-buddy.mo
share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/help/bug-buddy/it/stylesheet-images
@dirrm share/gnome/help/bug-buddy/it/figures
@dirrm share/gnome/help/bug-buddy/it
@@ -89,4 +96,6 @@ share/locale/uk/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/help/bug-buddy/C
@dirrm share/gnome/help/bug-buddy
@dirrm share/gnome/bug-buddy/xml
+@dirrm share/gnome/bug-buddy/bugzilla/gnome
+@dirrm share/gnome/bug-buddy/bugzilla
@dirrm share/gnome/bug-buddy
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 670f4c2..46afdd1 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gconf
-PORTVERSION= 0.12
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/GConf
@@ -15,14 +14,13 @@ DISTNAME= GConf-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- guile.9:${PORTSDIR}/lang/guile \
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \
oaf.0:${PORTSDIR}/devel/oaf
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
-USE_GNOME= yes
+USE_GNOMELIBS= yes
INSTALL_SHLIBS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gconf/distinfo b/devel/gconf/distinfo
index 4ec565c..bbbf84e 100644
--- a/devel/gconf/distinfo
+++ b/devel/gconf/distinfo
@@ -1 +1 @@
-MD5 (GConf-0.12.tar.gz) = 5a95d5e6cb1984d086210d2ca66e7420
+MD5 (GConf-1.0.0.tar.gz) = cdd363895dbc3d56412cb40ee1c2999b
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 80bc8f2..9de2e64 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -25,20 +25,26 @@ lib/libgconf-gtk-1.so
lib/libgconf-gtk-1.so.1
share/aclocal/gconf-1.m4
share/gnome/oaf/gconfd-1.oafinfo
+share/locale/az/LC_MESSAGES/GConf.mo
share/locale/ca/LC_MESSAGES/GConf.mo
share/locale/cs/LC_MESSAGES/GConf.mo
share/locale/da/LC_MESSAGES/GConf.mo
share/locale/de/LC_MESSAGES/GConf.mo
share/locale/el/LC_MESSAGES/GConf.mo
+share/locale/es/LC_MESSAGES/GConf.mo
share/locale/fi/LC_MESSAGES/GConf.mo
share/locale/fr/LC_MESSAGES/GConf.mo
share/locale/ga/LC_MESSAGES/GConf.mo
+share/locale/hu/LC_MESSAGES/GConf.mo
+share/locale/it/LC_MESSAGES/GConf.mo
share/locale/ja/LC_MESSAGES/GConf.mo
share/locale/ko/LC_MESSAGES/GConf.mo
share/locale/nl/LC_MESSAGES/GConf.mo
share/locale/no/LC_MESSAGES/GConf.mo
share/locale/pt_BR/LC_MESSAGES/GConf.mo
share/locale/ru/LC_MESSAGES/GConf.mo
+share/locale/sk/LC_MESSAGES/GConf.mo
+share/locale/sl/LC_MESSAGES/GConf.mo
share/locale/sv/LC_MESSAGES/GConf.mo
share/locale/tr/LC_MESSAGES/GConf.mo
share/locale/uk/LC_MESSAGES/GConf.mo
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 670f4c2..46afdd1 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gconf
-PORTVERSION= 0.12
-PORTREVISION= 1
+PORTVERSION= 1.0.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/GConf
@@ -15,14 +14,13 @@ DISTNAME= GConf-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
- guile.9:${PORTSDIR}/lang/guile \
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \
oaf.0:${PORTSDIR}/devel/oaf
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_LIBTOOL= yes
-USE_GNOME= yes
+USE_GNOMELIBS= yes
INSTALL_SHLIBS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 4ec565c..bbbf84e 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (GConf-0.12.tar.gz) = 5a95d5e6cb1984d086210d2ca66e7420
+MD5 (GConf-1.0.0.tar.gz) = cdd363895dbc3d56412cb40ee1c2999b
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 80bc8f2..9de2e64 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -25,20 +25,26 @@ lib/libgconf-gtk-1.so
lib/libgconf-gtk-1.so.1
share/aclocal/gconf-1.m4
share/gnome/oaf/gconfd-1.oafinfo
+share/locale/az/LC_MESSAGES/GConf.mo
share/locale/ca/LC_MESSAGES/GConf.mo
share/locale/cs/LC_MESSAGES/GConf.mo
share/locale/da/LC_MESSAGES/GConf.mo
share/locale/de/LC_MESSAGES/GConf.mo
share/locale/el/LC_MESSAGES/GConf.mo
+share/locale/es/LC_MESSAGES/GConf.mo
share/locale/fi/LC_MESSAGES/GConf.mo
share/locale/fr/LC_MESSAGES/GConf.mo
share/locale/ga/LC_MESSAGES/GConf.mo
+share/locale/hu/LC_MESSAGES/GConf.mo
+share/locale/it/LC_MESSAGES/GConf.mo
share/locale/ja/LC_MESSAGES/GConf.mo
share/locale/ko/LC_MESSAGES/GConf.mo
share/locale/nl/LC_MESSAGES/GConf.mo
share/locale/no/LC_MESSAGES/GConf.mo
share/locale/pt_BR/LC_MESSAGES/GConf.mo
share/locale/ru/LC_MESSAGES/GConf.mo
+share/locale/sk/LC_MESSAGES/GConf.mo
+share/locale/sl/LC_MESSAGES/GConf.mo
share/locale/sv/LC_MESSAGES/GConf.mo
share/locale/tr/LC_MESSAGES/GConf.mo
share/locale/uk/LC_MESSAGES/GConf.mo
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index ea47aa0..0551a5b 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glade
-PORTVERSION= 0.5.11
+PORTVERSION= 0.6.2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/glade
@@ -16,6 +16,7 @@ MAINTAINER= ade@FreeBSD.org
USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
+CONFIGURE_ARGS= --with-bonobo
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/libs"
diff --git a/devel/glade/distinfo b/devel/glade/distinfo
index ef97c01..2c8c82c 100644
--- a/devel/glade/distinfo
+++ b/devel/glade/distinfo
@@ -1 +1 @@
-MD5 (glade-0.5.11.tar.gz) = 23d063133cbbfd331e3ee0f694efa610
+MD5 (glade-0.6.2.tar.gz) = 261c9a48441d2a884654b11a79c220ee
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index 53a8cf0..c022bb3 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -8,6 +8,7 @@ share/gnome/glade/gnome/curses.m4
share/gnome/glade/gnome/gnome-bonobo-check.m4
share/gnome/glade/gnome/gnome-common.m4
share/gnome/glade/gnome/gnome-fileutils.m4
+share/gnome/glade/gnome/gnome-gettext.m4
share/gnome/glade/gnome/gnome-ghttp-check.m4
share/gnome/glade/gnome/gnome-gnorba-check.m4
share/gnome/glade/gnome/gnome-guile-checks.m4
@@ -28,6 +29,7 @@ share/gnome/glade/gnome/need-declaration.m4
share/gnome/glade/gtk/autogen.sh
share/gnome/help/glade/C/faq/docbook.css
share/gnome/help/glade/C/faq/index.html
+share/gnome/help/glade/C/faq/faq.sgml
share/gnome/help/glade/C/faq/ln7.html
share/gnome/help/glade/C/faq/stylesheet-images/caution.gif
share/gnome/help/glade/C/faq/stylesheet-images/home.gif
@@ -57,6 +59,7 @@ share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif
share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif
share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif
share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif
+share/gnome/help/glade/C/turbo-start/turbo-start.sgml
share/gnome/help/glade/C/user-guide/authors.html
share/gnome/help/glade/C/user-guide/docbook.css
share/gnome/help/glade/C/user-guide/edit-menu.html
@@ -84,6 +87,7 @@ share/gnome/help/glade/C/user-guide/stylesheet-images/toc-plus.gif
share/gnome/help/glade/C/user-guide/stylesheet-images/up.gif
share/gnome/help/glade/C/user-guide/stylesheet-images/warning.gif
share/gnome/help/glade/C/user-guide/toolbar.html
+share/gnome/help/glade/C/user-guide/user-guide.sgml
share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png
share/gnome/help/glade/C/user-guide/user-guide-images/file-menu.png
share/gnome/help/glade/C/user-guide/user-guide-images/grid-options.png
@@ -109,8 +113,28 @@ share/gnome/help/glade/C/user-guide/windows-tree.html
share/gnome/help/glade/C/user-guide/windows.html
share/gnome/help/glade/C/user-guide/x225.html
share/gnome/help/glade/C/user-guide/x324.html
+share/gnome/help/glade/it/faq/docbook.css
+share/gnome/help/glade/it/faq/index.html
+share/gnome/help/glade/it/faq/ln10.html
+share/gnome/help/glade/it/faq/stylesheet-images/caution.gif
+share/gnome/help/glade/it/faq/stylesheet-images/home.gif
+share/gnome/help/glade/it/faq/stylesheet-images/important.gif
+share/gnome/help/glade/it/faq/stylesheet-images/next.gif
+share/gnome/help/glade/it/faq/stylesheet-images/note.gif
+share/gnome/help/glade/it/faq/stylesheet-images/prev.gif
+share/gnome/help/glade/it/faq/stylesheet-images/tip.gif
+share/gnome/help/glade/it/faq/stylesheet-images/toc-blank.gif
+share/gnome/help/glade/it/faq/stylesheet-images/toc-minus.gif
+share/gnome/help/glade/it/faq/stylesheet-images/toc-plus.gif
+share/gnome/help/glade/it/faq/stylesheet-images/up.gif
+share/gnome/help/glade/it/faq/stylesheet-images/warning.gif
+share/gnome/help/glade/it/topic.dat
+share/gnome/omf/glade/faq-C.omf
+share/gnome/omf/glade/turbo-start-C.omf
+share/gnome/omf/glade/user-guide-C.omf
share/gnome/pixmaps/glade.png
share/gnome/pixmaps/glade/glade_logo.png
+share/locale/az/LC_MESSAGES/glade.mo
share/locale/ca/LC_MESSAGES/glade.mo
share/locale/cs/LC_MESSAGES/glade.mo
share/locale/da/LC_MESSAGES/glade.mo
@@ -121,6 +145,7 @@ share/locale/es/LC_MESSAGES/glade.mo
share/locale/fr/LC_MESSAGES/glade.mo
share/locale/ga/LC_MESSAGES/glade.mo
share/locale/gl/LC_MESSAGES/glade.mo
+share/locale/hu/LC_MESSAGES/glade.mo
share/locale/it/LC_MESSAGES/glade.mo
share/locale/ja/LC_MESSAGES/glade.mo
share/locale/ko/LC_MESSAGES/glade.mo
@@ -128,15 +153,20 @@ share/locale/no/LC_MESSAGES/glade.mo
share/locale/pl/LC_MESSAGES/glade.mo
share/locale/pt_BR/LC_MESSAGES/glade.mo
share/locale/ru/LC_MESSAGES/glade.mo
+share/locale/sk/LC_MESSAGES/glade.mo
share/locale/sv/LC_MESSAGES/glade.mo
share/locale/tr/LC_MESSAGES/glade.mo
share/locale/uk/LC_MESSAGES/glade.mo
@dirrm share/gnome/pixmaps/glade
+@dirrm share/gnome/omf/glade
@dirrm share/gnome/help/glade/C/user-guide/user-guide-images
@dirrm share/gnome/help/glade/C/user-guide/stylesheet-images
@dirrm share/gnome/help/glade/C/user-guide
@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images
@dirrm share/gnome/help/glade/C/turbo-start
+@dirrm share/gnome/help/glade/it/faq/stylesheet-images
+@dirrm share/gnome/help/glade/it/faq
+@dirrm share/gnome/help/glade/it
@dirrm share/gnome/help/glade/C/faq/stylesheet-images
@dirrm share/gnome/help/glade/C/faq
@dirrm share/gnome/help/glade/C
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index ea47aa0..0551a5b 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glade
-PORTVERSION= 0.5.11
+PORTVERSION= 0.6.2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/glade
@@ -16,6 +16,7 @@ MAINTAINER= ade@FreeBSD.org
USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
+CONFIGURE_ARGS= --with-bonobo
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/libs"
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index ef97c01..2c8c82c 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (glade-0.5.11.tar.gz) = 23d063133cbbfd331e3ee0f694efa610
+MD5 (glade-0.6.2.tar.gz) = 261c9a48441d2a884654b11a79c220ee
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index 53a8cf0..c022bb3 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -8,6 +8,7 @@ share/gnome/glade/gnome/curses.m4
share/gnome/glade/gnome/gnome-bonobo-check.m4
share/gnome/glade/gnome/gnome-common.m4
share/gnome/glade/gnome/gnome-fileutils.m4
+share/gnome/glade/gnome/gnome-gettext.m4
share/gnome/glade/gnome/gnome-ghttp-check.m4
share/gnome/glade/gnome/gnome-gnorba-check.m4
share/gnome/glade/gnome/gnome-guile-checks.m4
@@ -28,6 +29,7 @@ share/gnome/glade/gnome/need-declaration.m4
share/gnome/glade/gtk/autogen.sh
share/gnome/help/glade/C/faq/docbook.css
share/gnome/help/glade/C/faq/index.html
+share/gnome/help/glade/C/faq/faq.sgml
share/gnome/help/glade/C/faq/ln7.html
share/gnome/help/glade/C/faq/stylesheet-images/caution.gif
share/gnome/help/glade/C/faq/stylesheet-images/home.gif
@@ -57,6 +59,7 @@ share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif
share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif
share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif
share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif
+share/gnome/help/glade/C/turbo-start/turbo-start.sgml
share/gnome/help/glade/C/user-guide/authors.html
share/gnome/help/glade/C/user-guide/docbook.css
share/gnome/help/glade/C/user-guide/edit-menu.html
@@ -84,6 +87,7 @@ share/gnome/help/glade/C/user-guide/stylesheet-images/toc-plus.gif
share/gnome/help/glade/C/user-guide/stylesheet-images/up.gif
share/gnome/help/glade/C/user-guide/stylesheet-images/warning.gif
share/gnome/help/glade/C/user-guide/toolbar.html
+share/gnome/help/glade/C/user-guide/user-guide.sgml
share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png
share/gnome/help/glade/C/user-guide/user-guide-images/file-menu.png
share/gnome/help/glade/C/user-guide/user-guide-images/grid-options.png
@@ -109,8 +113,28 @@ share/gnome/help/glade/C/user-guide/windows-tree.html
share/gnome/help/glade/C/user-guide/windows.html
share/gnome/help/glade/C/user-guide/x225.html
share/gnome/help/glade/C/user-guide/x324.html
+share/gnome/help/glade/it/faq/docbook.css
+share/gnome/help/glade/it/faq/index.html
+share/gnome/help/glade/it/faq/ln10.html
+share/gnome/help/glade/it/faq/stylesheet-images/caution.gif
+share/gnome/help/glade/it/faq/stylesheet-images/home.gif
+share/gnome/help/glade/it/faq/stylesheet-images/important.gif
+share/gnome/help/glade/it/faq/stylesheet-images/next.gif
+share/gnome/help/glade/it/faq/stylesheet-images/note.gif
+share/gnome/help/glade/it/faq/stylesheet-images/prev.gif
+share/gnome/help/glade/it/faq/stylesheet-images/tip.gif
+share/gnome/help/glade/it/faq/stylesheet-images/toc-blank.gif
+share/gnome/help/glade/it/faq/stylesheet-images/toc-minus.gif
+share/gnome/help/glade/it/faq/stylesheet-images/toc-plus.gif
+share/gnome/help/glade/it/faq/stylesheet-images/up.gif
+share/gnome/help/glade/it/faq/stylesheet-images/warning.gif
+share/gnome/help/glade/it/topic.dat
+share/gnome/omf/glade/faq-C.omf
+share/gnome/omf/glade/turbo-start-C.omf
+share/gnome/omf/glade/user-guide-C.omf
share/gnome/pixmaps/glade.png
share/gnome/pixmaps/glade/glade_logo.png
+share/locale/az/LC_MESSAGES/glade.mo
share/locale/ca/LC_MESSAGES/glade.mo
share/locale/cs/LC_MESSAGES/glade.mo
share/locale/da/LC_MESSAGES/glade.mo
@@ -121,6 +145,7 @@ share/locale/es/LC_MESSAGES/glade.mo
share/locale/fr/LC_MESSAGES/glade.mo
share/locale/ga/LC_MESSAGES/glade.mo
share/locale/gl/LC_MESSAGES/glade.mo
+share/locale/hu/LC_MESSAGES/glade.mo
share/locale/it/LC_MESSAGES/glade.mo
share/locale/ja/LC_MESSAGES/glade.mo
share/locale/ko/LC_MESSAGES/glade.mo
@@ -128,15 +153,20 @@ share/locale/no/LC_MESSAGES/glade.mo
share/locale/pl/LC_MESSAGES/glade.mo
share/locale/pt_BR/LC_MESSAGES/glade.mo
share/locale/ru/LC_MESSAGES/glade.mo
+share/locale/sk/LC_MESSAGES/glade.mo
share/locale/sv/LC_MESSAGES/glade.mo
share/locale/tr/LC_MESSAGES/glade.mo
share/locale/uk/LC_MESSAGES/glade.mo
@dirrm share/gnome/pixmaps/glade
+@dirrm share/gnome/omf/glade
@dirrm share/gnome/help/glade/C/user-guide/user-guide-images
@dirrm share/gnome/help/glade/C/user-guide/stylesheet-images
@dirrm share/gnome/help/glade/C/user-guide
@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images
@dirrm share/gnome/help/glade/C/turbo-start
+@dirrm share/gnome/help/glade/it/faq/stylesheet-images
+@dirrm share/gnome/help/glade/it/faq
+@dirrm share/gnome/help/glade/it
@dirrm share/gnome/help/glade/C/faq/stylesheet-images
@dirrm share/gnome/help/glade/C/faq
@dirrm share/gnome/help/glade/C
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index e10c3bf..c834266 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/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-vfs/distinfo b/devel/gnome-vfs/distinfo
index fe36b7b..b3ac5fd 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
+MD5 (gnome-vfs-1.0.tar.gz) = 2ddec52e27f5e8f4939f37e9b34c0732
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 98bb9e5..b709bbd 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/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-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index 0b8cc01..1f9e2c8 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/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-vfs/files/patch-ae b/devel/gnome-vfs/files/patch-ae
deleted file mode 100644
index 736b9b6..0000000
--- a/devel/gnome-vfs/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-vfs/files/patch-ah b/devel/gnome-vfs/files/patch-ah
deleted file mode 100644
index 66ce9c7..0000000
--- a/devel/gnome-vfs/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-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 5210efe..0140524 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/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
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index e10c3bf..c834266 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 fe36b7b..b3ac5fd 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 98bb9e5..b709bbd 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 0b8cc01..1f9e2c8 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 736b9b6..0000000
--- 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 66ce9c7..0000000
--- 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 5210efe..0140524 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
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index e10c3bf..c834266 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/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/gnomevfs/distinfo b/devel/gnomevfs/distinfo
index fe36b7b..b3ac5fd 100644
--- a/devel/gnomevfs/distinfo
+++ b/devel/gnomevfs/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
+MD5 (gnome-vfs-1.0.tar.gz) = 2ddec52e27f5e8f4939f37e9b34c0732
diff --git a/devel/gnomevfs/files/patch-aa b/devel/gnomevfs/files/patch-aa
index 98bb9e5..b709bbd 100644
--- a/devel/gnomevfs/files/patch-aa
+++ b/devel/gnomevfs/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/gnomevfs/files/patch-ab b/devel/gnomevfs/files/patch-ab
index 0b8cc01..1f9e2c8 100644
--- a/devel/gnomevfs/files/patch-ab
+++ b/devel/gnomevfs/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/gnomevfs/files/patch-ae b/devel/gnomevfs/files/patch-ae
deleted file mode 100644
index 736b9b6..0000000
--- a/devel/gnomevfs/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/gnomevfs/files/patch-ah b/devel/gnomevfs/files/patch-ah
deleted file mode 100644
index 66ce9c7..0000000
--- a/devel/gnomevfs/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/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist
index 5210efe..0140524 100644
--- a/devel/gnomevfs/pkg-plist
+++ b/devel/gnomevfs/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
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index e10c3bf..c834266 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/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/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index fe36b7b..b3ac5fd 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome-vfs-0.5.tar.gz) = 7cdadc7943349bd36cb8370654937774
+MD5 (gnome-vfs-1.0.tar.gz) = 2ddec52e27f5e8f4939f37e9b34c0732
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 98bb9e5..b709bbd 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/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/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index 0b8cc01..1f9e2c8 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/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/gnomevfs2/files/patch-ae b/devel/gnomevfs2/files/patch-ae
deleted file mode 100644
index 736b9b6..0000000
--- a/devel/gnomevfs2/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/gnomevfs2/files/patch-ah b/devel/gnomevfs2/files/patch-ah
deleted file mode 100644
index 66ce9c7..0000000
--- a/devel/gnomevfs2/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/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 5210efe..0140524 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/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
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 929b8e8..8947cb2 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -7,19 +7,21 @@
PORTNAME= libglade
PORTVERSION= 0.16
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libglade
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo
USE_PERL5= yes
USE_GMAKE= yes
-USE_GNOMELIBS= yes
+USE_GNOMECTRL= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --enable-bonobo
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libglade/files/patch-aa b/devel/libglade/files/patch-aa
deleted file mode 100644
index 2d4586d..0000000
--- a/devel/libglade/files/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
---- configure.orig Mon Jul 10 10:37:02 2000
-+++ configure Thu Aug 24 15:31:47 2000
-@@ -2801,4 +2801,4 @@
- if test "x$no_bonobo" = x ; then
-- echo "$ac_t""yes" 1>&6
-- have_bonobo=true
-+ echo "$ac_t""yes - but I'm ignoring it" 1>&6
-+ have_bonobo=false
- else
diff --git a/devel/libglade/pkg-plist b/devel/libglade/pkg-plist
index 00c92fa..e13fdef 100644
--- a/devel/libglade/pkg-plist
+++ b/devel/libglade/pkg-plist
@@ -8,6 +8,9 @@ include/glade/glade-widget-tree.h
lib/libglade.a
lib/libglade.so
lib/libglade.so.4
+lib/libglade-bonobo.a
+lib/libglade-bonobo.so
+lib/libglade-bonobo.so.4
lib/libglade-gnome.a
lib/libglade-gnome.so
lib/libglade-gnome.so.4
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 929b8e8..8947cb2 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -7,19 +7,21 @@
PORTNAME= libglade
PORTVERSION= 0.16
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libglade
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo
USE_PERL5= yes
USE_GMAKE= yes
-USE_GNOMELIBS= yes
+USE_GNOMECTRL= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS= --enable-bonobo
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libglade2/files/patch-aa b/devel/libglade2/files/patch-aa
deleted file mode 100644
index 2d4586d..0000000
--- a/devel/libglade2/files/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
---- configure.orig Mon Jul 10 10:37:02 2000
-+++ configure Thu Aug 24 15:31:47 2000
-@@ -2801,4 +2801,4 @@
- if test "x$no_bonobo" = x ; then
-- echo "$ac_t""yes" 1>&6
-- have_bonobo=true
-+ echo "$ac_t""yes - but I'm ignoring it" 1>&6
-+ have_bonobo=false
- else
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 00c92fa..e13fdef 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -8,6 +8,9 @@ include/glade/glade-widget-tree.h
lib/libglade.a
lib/libglade.so
lib/libglade.so.4
+lib/libglade-bonobo.a
+lib/libglade-bonobo.so
+lib/libglade-bonobo.so.4
lib/libglade-gnome.a
lib/libglade-gnome.so
lib/libglade-gnome.so.4
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 75269fc..5c175d8 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libgtop
-PORTVERSION= 1.0.11
+PORTVERSION= 1.0.12
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libgtop
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 18aa9ec..d3030c0 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.11.tar.gz) = 29f349af7494882b15c4de805534d778
+MD5 (libgtop-1.0.12.tar.gz) = ac2cbd0245845dc13bfe262fd6a5577a
diff --git a/devel/libgtop/files/patch-ah b/devel/libgtop/files/patch-ah
index 6fd7e96..3fa66d3 100644
--- a/devel/libgtop/files/patch-ah
+++ b/devel/libgtop/files/patch-ah
@@ -1,5 +1,5 @@
--- sysdeps/freebsd/procmap.c.orig Thu May 27 13:56:48 1999
-+++ sysdeps/freebsd/procmap.c Wed Dec 27 10:51:50 2000
++++ sysdeps/freebsd/procmap.c Thu Mar 1 17:29:02 2001
@@ -35,3 +35,7 @@
#include <vm/vm_object.h>
+#if (__FreeBSD_version >= 400011)
@@ -14,7 +14,7 @@
#endif
@@ -116,3 +119,7 @@
if (kvm_read (server->machine.kd,
-+#if __FreeBSD_version >= 500013
++#if (__FreeBSD_version >= 500013)
+ (unsigned long) pinfo [0].ki_vmspace,
+#else
(unsigned long) pinfo [0].kp_proc.p_vmspace,
@@ -28,25 +28,3 @@
- &mount, sizeof (mount)) != sizeof (mount))
- glibtop_error_io_r (server, "kvm_read (mount)");
---- sysdeps/freebsd/sem_limits.c.orig Sun Jan 2 16:32:20 2000
-+++ sysdeps/freebsd/sem_limits.c Sun Jan 2 16:35:00 2000
-@@ -46,7 +46,7 @@
-
- /* #define KERNEL to get declaration of `struct seminfo'. */
-
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__bsdi__) || (__FreeBSD_version < 400011)
- #define KERNEL 1
- #else
- #define _KERNEL 1
---- sysdeps/freebsd/shm_limits.c.orig Sun Jan 2 16:27:59 2000
-+++ sysdeps/freebsd/shm_limits.c Sun Jan 2 16:35:18 2000
-@@ -46,7 +46,7 @@
-
- /* #define KERNEL to get declaration of `struct shminfo'. */
-
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__bsdi__) || (__FreeBSD_version < 400011)
- #define KERNEL 1
- #else
- #define _KERNEL 1
diff --git a/devel/libgtop/files/patch-ai b/devel/libgtop/files/patch-ai
deleted file mode 100644
index 5a8d660..0000000
--- a/devel/libgtop/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysdeps/freebsd/msg_limits.c.orig Sun Feb 13 09:47:58 2000
-+++ sysdeps/freebsd/msg_limits.c Fri May 26 13:36:23 2000
-@@ -46,7 +46,7 @@
-
- /* #define KERNEL to get declaration of `struct msginfo'. */
-
--#if (defined __FreeBSD__) || (defined __bsdi__)
-+#if ((defined __FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__)
- #define KERNEL 1
- #else
- #define _KERNEL 1
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index bb47391..fde69f1 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -77,6 +77,7 @@ lib/libgtop_sysdeps_suid.so.1
share/locale/az/LC_MESSAGES/libgtop.mo
share/locale/da/LC_MESSAGES/libgtop.mo
share/locale/de/LC_MESSAGES/libgtop.mo
+share/locale/el/LC_MESSAGES/libgtop.mo
share/locale/es/LC_MESSAGES/libgtop.mo
share/locale/es_DO/LC_MESSAGES/libgtop.mo
share/locale/es_GT/LC_MESSAGES/libgtop.mo
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 75269fc..5c175d8 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libgtop
-PORTVERSION= 1.0.11
+PORTVERSION= 1.0.12
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libgtop
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 18aa9ec..d3030c0 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1 +1 @@
-MD5 (libgtop-1.0.11.tar.gz) = 29f349af7494882b15c4de805534d778
+MD5 (libgtop-1.0.12.tar.gz) = ac2cbd0245845dc13bfe262fd6a5577a
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
index 6fd7e96..3fa66d3 100644
--- a/devel/libgtop2/files/patch-ah
+++ b/devel/libgtop2/files/patch-ah
@@ -1,5 +1,5 @@
--- sysdeps/freebsd/procmap.c.orig Thu May 27 13:56:48 1999
-+++ sysdeps/freebsd/procmap.c Wed Dec 27 10:51:50 2000
++++ sysdeps/freebsd/procmap.c Thu Mar 1 17:29:02 2001
@@ -35,3 +35,7 @@
#include <vm/vm_object.h>
+#if (__FreeBSD_version >= 400011)
@@ -14,7 +14,7 @@
#endif
@@ -116,3 +119,7 @@
if (kvm_read (server->machine.kd,
-+#if __FreeBSD_version >= 500013
++#if (__FreeBSD_version >= 500013)
+ (unsigned long) pinfo [0].ki_vmspace,
+#else
(unsigned long) pinfo [0].kp_proc.p_vmspace,
@@ -28,25 +28,3 @@
- &mount, sizeof (mount)) != sizeof (mount))
- glibtop_error_io_r (server, "kvm_read (mount)");
---- sysdeps/freebsd/sem_limits.c.orig Sun Jan 2 16:32:20 2000
-+++ sysdeps/freebsd/sem_limits.c Sun Jan 2 16:35:00 2000
-@@ -46,7 +46,7 @@
-
- /* #define KERNEL to get declaration of `struct seminfo'. */
-
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__bsdi__) || (__FreeBSD_version < 400011)
- #define KERNEL 1
- #else
- #define _KERNEL 1
---- sysdeps/freebsd/shm_limits.c.orig Sun Jan 2 16:27:59 2000
-+++ sysdeps/freebsd/shm_limits.c Sun Jan 2 16:35:18 2000
-@@ -46,7 +46,7 @@
-
- /* #define KERNEL to get declaration of `struct shminfo'. */
-
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__bsdi__) || (__FreeBSD_version < 400011)
- #define KERNEL 1
- #else
- #define _KERNEL 1
diff --git a/devel/libgtop2/files/patch-ai b/devel/libgtop2/files/patch-ai
deleted file mode 100644
index 5a8d660..0000000
--- a/devel/libgtop2/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysdeps/freebsd/msg_limits.c.orig Sun Feb 13 09:47:58 2000
-+++ sysdeps/freebsd/msg_limits.c Fri May 26 13:36:23 2000
-@@ -46,7 +46,7 @@
-
- /* #define KERNEL to get declaration of `struct msginfo'. */
-
--#if (defined __FreeBSD__) || (defined __bsdi__)
-+#if ((defined __FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__)
- #define KERNEL 1
- #else
- #define _KERNEL 1
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index bb47391..fde69f1 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -77,6 +77,7 @@ lib/libgtop_sysdeps_suid.so.1
share/locale/az/LC_MESSAGES/libgtop.mo
share/locale/da/LC_MESSAGES/libgtop.mo
share/locale/de/LC_MESSAGES/libgtop.mo
+share/locale/el/LC_MESSAGES/libgtop.mo
share/locale/es/LC_MESSAGES/libgtop.mo
share/locale/es_DO/LC_MESSAGES/libgtop.mo
share/locale/es_GT/LC_MESSAGES/libgtop.mo
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 01ff250..231a722 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libsigc++
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libsigc
diff --git a/devel/libsigc++/distinfo b/devel/libsigc++/distinfo
index bd60b77..03c129d6 100644
--- a/devel/libsigc++/distinfo
+++ b/devel/libsigc++/distinfo
@@ -1 +1 @@
-MD5 (libsigc++-1.0.1.tar.gz) = 69cc92bbece1c8085dce4e9a466404b3
+MD5 (libsigc++-1.0.3.tar.gz) = a7e0f529bc49fdcc097108a48c55796d
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 01ff250..231a722 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libsigc++
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libsigc
diff --git a/devel/libsigc++12/distinfo b/devel/libsigc++12/distinfo
index bd60b77..03c129d6 100644
--- a/devel/libsigc++12/distinfo
+++ b/devel/libsigc++12/distinfo
@@ -1 +1 @@
-MD5 (libsigc++-1.0.1.tar.gz) = 69cc92bbece1c8085dce4e9a466404b3
+MD5 (libsigc++-1.0.3.tar.gz) = a7e0f529bc49fdcc097108a48c55796d
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 01ff250..231a722 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libsigc++
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= libsigc
diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo
index bd60b77..03c129d6 100644
--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@@ -1 +1 @@
-MD5 (libsigc++-1.0.1.tar.gz) = 69cc92bbece1c8085dce4e9a466404b3
+MD5 (libsigc++-1.0.3.tar.gz) = a7e0f529bc49fdcc097108a48c55796d
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 82e5c68..71cf9c7 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -6,25 +6,22 @@
#
PORTNAME= oaf
-PORTVERSION= 0.6.2
+PORTVERSION= 0.6.5
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/oaf
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit \
- popt.0:${PORTSDIR}/devel/popt \
- xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GLIB= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
- --datadir=${PREFIX}/share/gnome \
- --enable-static --enable-shared \
+USE_GNOMELIBS= yes
+CONFIGURE_ARGS= --enable-static --enable-shared \
--disable-more-warnings
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/devel/oaf/distinfo b/devel/oaf/distinfo
index 084164c..eaafaed 100644
--- a/devel/oaf/distinfo
+++ b/devel/oaf/distinfo
@@ -1 +1 @@
-MD5 (oaf-0.6.2.tar.gz) = 2c0817a5e34a3ad266d9a18b092bc9d8
+MD5 (oaf-0.6.5.tar.gz) = 23bfa9046d8d745d7cd17ad75fb08aed
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index 9cc6d56..2050f86 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -41,6 +41,8 @@ share/locale/ja/LC_MESSAGES/oaf.mo
share/locale/ko/LC_MESSAGES/oaf.mo
share/locale/no/LC_MESSAGES/oaf.mo
share/locale/pl/LC_MESSAGES/oaf.mo
+share/locale/pt_BR/LC_MESSAGES/oaf.mo
+share/locale/ro/LC_MESSAGES/oaf.mo
share/locale/ru/LC_MESSAGES/oaf.mo
share/locale/sk/LC_MESSAGES/oaf.mo
share/locale/sl/LC_MESSAGES/oaf.mo
OpenPOWER on IntegriCloud