aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/atk/Makefile9
-rw-r--r--accessibility/atk/distinfo2
-rw-r--r--accessibility/atk/pkg-plist2
-rw-r--r--accessibility/gail/Makefile4
-rw-r--r--accessibility/gail/distinfo2
-rw-r--r--accessibility/gail/pkg-plist2
-rw-r--r--devel/ORBit2/Makefile8
-rw-r--r--devel/ORBit2/distinfo2
-rw-r--r--devel/atk/Makefile9
-rw-r--r--devel/atk/distinfo2
-rw-r--r--devel/atk/pkg-plist2
-rw-r--r--devel/bonobo-activation/Makefile6
-rw-r--r--devel/bonobo-activation/distinfo2
-rw-r--r--devel/bonobo-activation/files/patch-intltool-merge.in14
-rw-r--r--devel/bonobo-activation/files/patch-po::Makefile.in.in14
-rw-r--r--devel/bonobo-activation/files/patch-server::activation-context-query-parser.y14
-rw-r--r--devel/bonobo-activation/files/patch-xml-i18n-merge.in14
-rw-r--r--devel/bonobo-activation/pkg-plist8
-rw-r--r--devel/gconf2/Makefile10
-rw-r--r--devel/gconf2/distinfo2
-rw-r--r--devel/gconf2/pkg-plist6
-rw-r--r--devel/glib13/Makefile7
-rw-r--r--devel/glib13/distinfo2
-rw-r--r--devel/glib13/files/patch-ae18
-rw-r--r--devel/glib13/pkg-plist10
-rw-r--r--devel/glib20/Makefile7
-rw-r--r--devel/glib20/distinfo2
-rw-r--r--devel/glib20/files/patch-ae18
-rw-r--r--devel/glib20/pkg-plist10
-rw-r--r--devel/gnome-vfs/Makefile12
-rw-r--r--devel/gnome-vfs/distinfo2
-rw-r--r--devel/gnome-vfs/files/patch-aa31
-rw-r--r--devel/gnome-vfs/files/patch-intltool-merge.in18
-rw-r--r--devel/gnome-vfs/pkg-plist1
-rw-r--r--devel/gnomevfs2/Makefile12
-rw-r--r--devel/gnomevfs2/distinfo2
-rw-r--r--devel/gnomevfs2/files/patch-aa31
-rw-r--r--devel/gnomevfs2/files/patch-intltool-merge.in18
-rw-r--r--devel/gnomevfs2/pkg-plist1
-rw-r--r--devel/libIDL/Makefile6
-rw-r--r--devel/libIDL/distinfo2
-rw-r--r--devel/libbonobo/Makefile9
-rw-r--r--devel/libbonobo/distinfo2
-rw-r--r--devel/libbonobo/files/patch-intltool-merge.in18
-rw-r--r--devel/libbonobo/pkg-plist2
-rw-r--r--devel/libglade2/Makefile6
-rw-r--r--devel/libglade2/distinfo2
-rw-r--r--devel/libglade2/pkg-plist2
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libgnomecanvas/distinfo2
-rw-r--r--net/linc/Makefile7
-rw-r--r--net/linc/distinfo2
-rw-r--r--x11-toolkits/gail/Makefile4
-rw-r--r--x11-toolkits/gail/distinfo2
-rw-r--r--x11-toolkits/gail/pkg-plist2
-rw-r--r--x11-toolkits/pango/Makefile6
-rw-r--r--x11-toolkits/pango/distinfo2
57 files changed, 198 insertions, 218 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 2cf4cf5b6e46..4611d35daa07 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= atk
-PORTVERSION= 0.10
+PORTVERSION= 0.12
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,10 +19,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= pango.0:${PORTSDIR}/x11-toolkits/pango \
- glib-1.3.13:${PORTSDIR}/devel/glib13
-RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index a3bad18e8156..7fce910d6ab3 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-0.10.tar.bz2) = a2431fd10f4e6cce3727fdb0cdff8dcd
+MD5 (gnome2/atk-0.12.tar.bz2) = 09509179928e4558d2a71c954cf002ba
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index b29f8a48c3c6..cbd91d8c5ddc 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -24,7 +24,7 @@ include/atk-1.0/atk/atktext.h
include/atk-1.0/atk/atkutil.h
include/atk-1.0/atk/atkvalue.h
lib/libatk.so
-lib/libatk.so.10
+lib/libatk.so.12
libdata/pkgconfig/atk.pc
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index d189abf2671c..a2e01bc325c3 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gail
-PORTVERSION= 0.6
+PORTVERSION= 0.8
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index b6d629a0c186..9fc048f43e9a 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.6.tar.bz2) = 7b7102c2a99e34a4c0eebd9343f685a6
+MD5 (gnome2/gail-0.8.tar.bz2) = 6f53ca1d060347647cf2d050ad2a9e9e
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 4f9e77f6397e..f141e8820254 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -6,7 +6,7 @@ lib/libferret.so.0
lib/libgail.so
lib/libgail.so.0
lib/libgailutil.so
-lib/libgailutil.so.6
+lib/libgailutil.so.8
lib/libtestaction.so
lib/libtestaction.so.0
lib/libtestbutton.so
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index b266dd38c29e..6d5e5b65248d 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,17 +6,15 @@
#
PORTNAME= ORBit2
-PORTVERSION= 2.3.103
-PORTREVISION= 1
+PORTVERSION= 2.3.105
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
- IDL-2.0:${PORTSDIR}/devel/libIDL \
+LIB_DEPENDS= IDL-2.0:${PORTSDIR}/devel/libIDL \
popt.0:${PORTSDIR}/devel/popt \
linc.1:${PORTSDIR}/net/linc
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index b87655062a7e..8045dc8a1c0b 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.103.tar.bz2) = 624f67690735c7d186bb432b526e30f8
+MD5 (gnome2/ORBit2-2.3.105.tar.bz2) = a43ddec07a53d2e5ce14b0060d5fc347
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 2cf4cf5b6e46..4611d35daa07 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= atk
-PORTVERSION= 0.10
+PORTVERSION= 0.12
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,10 +19,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= pango.0:${PORTSDIR}/x11-toolkits/pango \
- glib-1.3.13:${PORTSDIR}/devel/glib13
-RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index a3bad18e8156..7fce910d6ab3 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-0.10.tar.bz2) = a2431fd10f4e6cce3727fdb0cdff8dcd
+MD5 (gnome2/atk-0.12.tar.bz2) = 09509179928e4558d2a71c954cf002ba
diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist
index b29f8a48c3c6..cbd91d8c5ddc 100644
--- a/devel/atk/pkg-plist
+++ b/devel/atk/pkg-plist
@@ -24,7 +24,7 @@ include/atk-1.0/atk/atktext.h
include/atk-1.0/atk/atkutil.h
include/atk-1.0/atk/atkvalue.h
lib/libatk.so
-lib/libatk.so.10
+lib/libatk.so.12
libdata/pkgconfig/atk.pc
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 04c826d519e0..f77f38ae5026 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= bonobo-activation
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.9.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -23,6 +22,7 @@ USE_GMAKE= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 9755af015b37..0ad288051923 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.3.tar.bz2) = e10f9788c1d1df646d795cc813be0bdd
+MD5 (gnome2/bonobo-activation-0.9.4.tar.bz2) = 8ba26b622b2e459d19e43a8099987415
diff --git a/devel/bonobo-activation/files/patch-intltool-merge.in b/devel/bonobo-activation/files/patch-intltool-merge.in
new file mode 100644
index 000000000000..4a5138a8ddda
--- /dev/null
+++ b/devel/bonobo-activation/files/patch-intltool-merge.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- intltool-merge.in 2002/02/27 09:18:26 1.1
++++ intltool-merge.in 2002/02/27 09:18:34
+@@ -287,7 +287,7 @@
+ if (lc $encoding eq "utf-8") {
+ open PO_FILE, "<$po_file";
+ } else {
+- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
++ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+ }
+ } else {
+ open PO_FILE, "<$po_file";
diff --git a/devel/bonobo-activation/files/patch-po::Makefile.in.in b/devel/bonobo-activation/files/patch-po::Makefile.in.in
deleted file mode 100644
index 6da522a4a8c5..000000000000
--- a/devel/bonobo-activation/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in 2002/02/13 17:45:32 1.1
-+++ po/Makefile.in.in 2002/02/13 17:45:43
-@@ -104,7 +104,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
diff --git a/devel/bonobo-activation/files/patch-server::activation-context-query-parser.y b/devel/bonobo-activation/files/patch-server::activation-context-query-parser.y
deleted file mode 100644
index 5551c815ffca..000000000000
--- a/devel/bonobo-activation/files/patch-server::activation-context-query-parser.y
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- server/activation-context-query-parser.y 2002/02/13 17:42:46 1.1
-+++ server/activation-context-query-parser.y 2002/02/13 17:42:56
-@@ -23,7 +23,7 @@
- */
-
- %{
--#define YYSTACK_USE_ALLOCA
-+#define YYSTACK_USE_ALLOCA 1
-
- #include "activation-context-query.h"
-
diff --git a/devel/bonobo-activation/files/patch-xml-i18n-merge.in b/devel/bonobo-activation/files/patch-xml-i18n-merge.in
deleted file mode 100644
index cbcf71f4bb50..000000000000
--- a/devel/bonobo-activation/files/patch-xml-i18n-merge.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- xml-i18n-merge.in 2002/02/13 21:58:17 1.1
-+++ xml-i18n-merge.in 2002/02/13 21:58:25
-@@ -232,7 +232,7 @@
-
- if ($UTF8_ARG) {
- my $encoding = get_po_encoding($po_file);
-- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
-+ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
- } else {
- open PO_FILE, "<$po_file";
- }
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index f1c2f7d35fee..f34cbe33ad04 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -19,7 +19,7 @@ include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
lib/libbonobo-activation.so
-lib/libbonobo-activation.so.3
+lib/libbonobo-activation.so.4
libdata/bonobo/servers/Bonobo_CosNaming_NamingContext.server
libdata/bonobo/servers/broken.server
libdata/bonobo/servers/empty.server
@@ -31,6 +31,7 @@ share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
share/locale/az/LC_MESSAGES/bonobo-activation.mo
+share/locale/bg/LC_MESSAGES/bonobo-activation.mo
share/locale/da/LC_MESSAGES/bonobo-activation.mo
share/locale/de/LC_MESSAGES/bonobo-activation.mo
share/locale/el/LC_MESSAGES/bonobo-activation.mo
@@ -43,10 +44,13 @@ share/locale/hu/LC_MESSAGES/bonobo-activation.mo
share/locale/it/LC_MESSAGES/bonobo-activation.mo
share/locale/ja/LC_MESSAGES/bonobo-activation.mo
share/locale/ko/LC_MESSAGES/bonobo-activation.mo
+share/locale/lv/LC_MESSAGES/bonobo-activation.mo
+share/locale/ms/LC_MESSAGES/bonobo-activation.mo
share/locale/nl/LC_MESSAGES/bonobo-activation.mo
share/locale/nn/LC_MESSAGES/bonobo-activation.mo
share/locale/no/LC_MESSAGES/bonobo-activation.mo
share/locale/pl/LC_MESSAGES/bonobo-activation.mo
+share/locale/pt/LC_MESSAGES/bonobo-activation.mo
share/locale/pt_BR/LC_MESSAGES/bonobo-activation.mo
share/locale/ro/LC_MESSAGES/bonobo-activation.mo
share/locale/ru/LC_MESSAGES/bonobo-activation.mo
@@ -56,8 +60,10 @@ share/locale/sv/LC_MESSAGES/bonobo-activation.mo
share/locale/ta/LC_MESSAGES/bonobo-activation.mo
share/locale/tr/LC_MESSAGES/bonobo-activation.mo
share/locale/uk/LC_MESSAGES/bonobo-activation.mo
+share/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo
share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
@dirrm share/idl/bonobo-activation-2.0
+@dirrm share/doc/bonobo-activation
@dirrm libdata/bonobo/servers
@dirrm libdata/bonobo
@dirrm include/bonobo-activation-2.0/bonobo-activation
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 87105b26564c..e95f61005bd8 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gconf2
-PORTVERSION= 1.1.6
+PORTVERSION= 1.1.8
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -17,7 +17,8 @@ MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= ORBit-2.0:${PORTSDIR}/devel/ORBit2 \
db3.2:${PORTSDIR}/databases/db3 \
- xml2.5:${PORTSDIR}/textproc/libxml2
+ xml2.5:${PORTSDIR}/textproc/libxml2 \
+ gtk-x11-1.3.14:${PORTSDIR}/x11-toolkits/gtk13
USE_BZIP2= yes
USE_GMAKE= yes
@@ -25,7 +26,8 @@ USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-db3-includes=${LOCALBASE}/include \
- --with-html-dir=${PREFIX}/share/doc
+ --with-html-dir=${PREFIX}/share/doc \
+ --enable-bdbbackend
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 28803dfa8122..97be93702c49 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/GConf-1.1.6.tar.bz2) = 950e2c7abcbca2b1639d7b6585436abd
+MD5 (gnome2/GConf-1.1.8.tar.bz2) = f44d2f4fb336e162e4a1b1606d91a8bf
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 47f6f13d6cb8..1785035b322c 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -1,10 +1,11 @@
+bin/gconf-sanity-check-2
bin/gconfd-2
-bin/gconftool
bin/gconftool-2
etc/gconf/2/path
include/gconf/2/gconf/gconf-changeset.h
include/gconf/2/gconf/gconf-client.h
include/gconf/2/gconf/gconf-engine.h
+include/gconf/2/gconf/gconf-enum-types.h
include/gconf/2/gconf/gconf-error.h
include/gconf/2/gconf/gconf-listeners.h
include/gconf/2/gconf/gconf-schema.h
@@ -14,7 +15,7 @@ lib/GConf/2/libgconfbackend-bdb.so
lib/GConf/2/libgconfbackend-xml.so
lib/libgconf-2.a
lib/libgconf-2.so
-lib/libgconf-2.so.3
+lib/libgconf-2.so.5
libdata/pkgconfig/gconf-2.0.pc
share/aclocal/gconf-2.m4
share/doc/gconf/c120.html
@@ -65,6 +66,7 @@ share/locale/ko/LC_MESSAGES/GConf2.mo
share/locale/nl/LC_MESSAGES/GConf2.mo
share/locale/nn/LC_MESSAGES/GConf2.mo
share/locale/no/LC_MESSAGES/GConf2.mo
+share/locale/pl/LC_MESSAGES/GConf2.mo
share/locale/pt/LC_MESSAGES/GConf2.mo
share/locale/pt_BR/LC_MESSAGES/GConf2.mo
share/locale/ro/LC_MESSAGES/GConf2.mo
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 8faeed832240..88f54d80fa65 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= glib
-PORTVERSION= 1.3.13
+PORTVERSION= 1.3.14
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,7 +19,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
+ intl.1:${PORTSDIR}/devel/gettext
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
NO_LATEST_LINK= "Unstable, development version."
diff --git a/devel/glib13/distinfo b/devel/glib13/distinfo
index 4e34b9225cd1..98f66c26ceb9 100644
--- a/devel/glib13/distinfo
+++ b/devel/glib13/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-1.3.13.tar.bz2) = 6452c711661ec88b553040e87777ffeb
+MD5 (gnome2/glib-1.3.14.tar.bz2) = 8bf2f7584928ce5edef30542ee9407d7
diff --git a/devel/glib13/files/patch-ae b/devel/glib13/files/patch-ae
index 87404113cbaf..eff5d0e563c9 100644
--- a/devel/glib13/files/patch-ae
+++ b/devel/glib13/files/patch-ae
@@ -1,9 +1,9 @@
$FreeBSD$
---- configure.orig Tue Jan 29 18:34:49 2002
-+++ configure Tue Feb 12 10:13:56 2002
-@@ -16378,8 +16378,8 @@
+--- configure.orig Fri Feb 15 18:43:40 2002
++++ configure Wed Feb 27 09:37:41 2002
+@@ -16692,8 +16692,8 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
;;
@@ -14,7 +14,7 @@ $FreeBSD$
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
# -mthreads flag.
-@@ -16457,13 +16457,13 @@
+@@ -16771,13 +16771,13 @@
fi
;;
*)
@@ -31,13 +31,13 @@ $FreeBSD$
fi
if test x"$have_threads" = xposix; then
defattr=0
-@@ -17660,13 +17660,13 @@
+@@ -17974,13 +17974,13 @@
#
# Check for libiconv
#
-- echo "$as_me:17663: checking for libiconv_open in -liconv" >&5
+- echo "$as_me:17977: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+ echo "$as_me:17663: checking for libiconv_open in -lgiconv" >&5
++ echo "$as_me:17977: checking for libiconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -46,9 +46,9 @@ $FreeBSD$
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line 17671 "configure"
+ #line 17985 "configure"
#include "confdefs.h"
-@@ -17728,7 +17728,7 @@
+@@ -18042,7 +18042,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then
diff --git a/devel/glib13/pkg-plist b/devel/glib13/pkg-plist
index b581f40a3641..e8a251f0a9e3 100644
--- a/devel/glib13/pkg-plist
+++ b/devel/glib13/pkg-plist
@@ -68,16 +68,16 @@ include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
lib/libglib-1.3.a
lib/libglib-1.3.so
-lib/libglib-1.3.so.13
+lib/libglib-1.3.so.14
lib/libgmodule-1.3.a
lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.13
+lib/libgmodule-1.3.so.14
lib/libgobject-1.3.a
lib/libgobject-1.3.so
-lib/libgobject-1.3.so.13
+lib/libgobject-1.3.so.14
lib/libgthread-1.3.a
lib/libgthread-1.3.so
-lib/libgthread-1.3.so.13
+lib/libgthread-1.3.so.14
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
@@ -85,7 +85,6 @@ libdata/pkgconfig/gthread-2.0.pc
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/glib-2.0/gettext/po/Makefile.in.in
-share/glib-2.0/gettext/po/po2tbl.sed.in
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
@@ -94,6 +93,7 @@ share/locale/eu/LC_MESSAGES/glib20.mo
share/locale/fr/LC_MESSAGES/glib20.mo
share/locale/gl/LC_MESSAGES/glib20.mo
share/locale/ja/LC_MESSAGES/glib20.mo
+share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
share/locale/no/LC_MESSAGES/glib20.mo
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 8faeed832240..88f54d80fa65 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= glib
-PORTVERSION= 1.3.13
+PORTVERSION= 1.3.14
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,7 +19,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv \
+ intl.1:${PORTSDIR}/devel/gettext
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
NO_LATEST_LINK= "Unstable, development version."
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 4e34b9225cd1..98f66c26ceb9 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-1.3.13.tar.bz2) = 6452c711661ec88b553040e87777ffeb
+MD5 (gnome2/glib-1.3.14.tar.bz2) = 8bf2f7584928ce5edef30542ee9407d7
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 87404113cbaf..eff5d0e563c9 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,9 +1,9 @@
$FreeBSD$
---- configure.orig Tue Jan 29 18:34:49 2002
-+++ configure Tue Feb 12 10:13:56 2002
-@@ -16378,8 +16378,8 @@
+--- configure.orig Fri Feb 15 18:43:40 2002
++++ configure Wed Feb 27 09:37:41 2002
+@@ -16692,8 +16692,8 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
;;
@@ -14,7 +14,7 @@ $FreeBSD$
# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
# -mthreads flag.
-@@ -16457,13 +16457,13 @@
+@@ -16771,13 +16771,13 @@
fi
;;
*)
@@ -31,13 +31,13 @@ $FreeBSD$
fi
if test x"$have_threads" = xposix; then
defattr=0
-@@ -17660,13 +17660,13 @@
+@@ -17974,13 +17974,13 @@
#
# Check for libiconv
#
-- echo "$as_me:17663: checking for libiconv_open in -liconv" >&5
+- echo "$as_me:17977: checking for libiconv_open in -liconv" >&5
-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+ echo "$as_me:17663: checking for libiconv_open in -lgiconv" >&5
++ echo "$as_me:17977: checking for libiconv_open in -lgiconv" >&5
+echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -46,9 +46,9 @@ $FreeBSD$
-LIBS="-liconv $LIBS"
+LIBS="-lgiconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line 17671 "configure"
+ #line 17985 "configure"
#include "confdefs.h"
-@@ -17728,7 +17728,7 @@
+@@ -18042,7 +18042,7 @@
fi
if test "x$with_libiconv" = "xyes" ; then
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index b581f40a3641..e8a251f0a9e3 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -68,16 +68,16 @@ include/glib-2.0/gobject/gvaluecollector.h
include/glib-2.0/gobject/gvaluetypes.h
lib/libglib-1.3.a
lib/libglib-1.3.so
-lib/libglib-1.3.so.13
+lib/libglib-1.3.so.14
lib/libgmodule-1.3.a
lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.13
+lib/libgmodule-1.3.so.14
lib/libgobject-1.3.a
lib/libgobject-1.3.so
-lib/libgobject-1.3.so.13
+lib/libgobject-1.3.so.14
lib/libgthread-1.3.a
lib/libgthread-1.3.so
-lib/libgthread-1.3.so.13
+lib/libgthread-1.3.so.14
libdata/pkgconfig/glib-2.0.pc
libdata/pkgconfig/gmodule-2.0.pc
libdata/pkgconfig/gobject-2.0.pc
@@ -85,7 +85,6 @@ libdata/pkgconfig/gthread-2.0.pc
share/aclocal/glib-2.0.m4
share/aclocal/glib-gettext.m4
share/glib-2.0/gettext/po/Makefile.in.in
-share/glib-2.0/gettext/po/po2tbl.sed.in
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/de/LC_MESSAGES/glib20.mo
@@ -94,6 +93,7 @@ share/locale/eu/LC_MESSAGES/glib20.mo
share/locale/fr/LC_MESSAGES/glib20.mo
share/locale/gl/LC_MESSAGES/glib20.mo
share/locale/ja/LC_MESSAGES/glib20.mo
+share/locale/ko/LC_MESSAGES/glib20.mo
share/locale/nl/LC_MESSAGES/glib20.mo
share/locale/nn/LC_MESSAGES/glib20.mo
share/locale/no/LC_MESSAGES/glib20.mo
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 660383dc4c34..1e00b77874d7 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,22 +6,20 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 1.9.5
+PORTVERSION= 1.9.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \
- ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
- pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= gconf-2.3:${PORTSDIR}/devel/gconf2 \
+ ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
+LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
- pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index f91ac99d125f..ba692c445c37 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.5.tar.bz2) = 6187575b3cd890fed78c805659455057
+MD5 (gnome2/gnome-vfs-1.9.7.tar.bz2) = 766b86fbcbcec8da3604ca92b6eadc42
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index a5963d2046f2..e6ade3b65778 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,20 +1,20 @@
$FreeBSD$
---- configure 2002/02/16 13:00:43 1.1
-+++ configure 2002/02/16 13:03:25
-@@ -12056,8 +12056,8 @@
+--- configure.orig Wed Feb 27 12:00:58 2002
++++ configure Wed Feb 27 12:02:16 2002
+@@ -11963,8 +11963,8 @@
done
fi
--echo "$as_me:12059: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12059: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:11966: checking for BZ2_bzCompressInit in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12073,11 +12073,11 @@
+@@ -11980,11 +11980,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -28,25 +28,28 @@ $FreeBSD$
;
return 0;
}
-@@ -12336,7 +12336,7 @@
+@@ -12296,7 +12296,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat >conftest.$ac_ext <<_ACEOF
- #line 12341 "configure"
+ #line 12301 "configure"
#include "confdefs.h"
-@@ -12386,7 +12386,7 @@
- EOF
+@@ -12347,9 +12347,9 @@
msg_openssl="yes"
-- OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto"
-+ OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo"
+ if test x$with_openssl_libs != x/usr/lib; then
+- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
++ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
+ else
+- OPENSSL_LIBS="-lssl -lcrypto"
++ OPENSSL_LIBS="-lssl -lcryptofoo"
+ fi
if true; then
- HAVE_SSL_TRUE=
-@@ -13170,7 +13170,7 @@
+@@ -13227,7 +13227,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-intltool-merge.in b/devel/gnome-vfs/files/patch-intltool-merge.in
index 1b5a09da7f27..3d34ddfdbf53 100644
--- a/devel/gnome-vfs/files/patch-intltool-merge.in
+++ b/devel/gnome-vfs/files/patch-intltool-merge.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- intltool-merge.in 2002/02/16 12:59:40 1.1
-+++ intltool-merge.in 2002/02/16 12:59:59
-@@ -269,7 +269,7 @@
-
- if ($UTF8_ARG) {
- my $encoding = get_po_encoding ($po_file);
-- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
-+ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+--- intltool-merge.in.orig Mon Feb 11 23:40:38 2002
++++ intltool-merge.in Wed Feb 27 12:03:10 2002
+@@ -287,7 +287,7 @@
+ if (lc $encoding eq "utf-8") {
+ open PO_FILE, "<$po_file";
+ } else {
+- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
++ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+ }
} else {
open PO_FILE, "<$po_file";
- }
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index d2264681ee4c..e752643c375a 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -25,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 660383dc4c34..1e00b77874d7 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,22 +6,20 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 1.9.5
+PORTVERSION= 1.9.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= msgfmt-new:${PORTSDIR}/devel/gettext-devel \
- ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
- pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= gconf-2.3:${PORTSDIR}/devel/gconf2 \
+ ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
+LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata \
- pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index f91ac99d125f..ba692c445c37 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.5.tar.bz2) = 6187575b3cd890fed78c805659455057
+MD5 (gnome2/gnome-vfs-1.9.7.tar.bz2) = 766b86fbcbcec8da3604ca92b6eadc42
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index a5963d2046f2..e6ade3b65778 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,20 +1,20 @@
$FreeBSD$
---- configure 2002/02/16 13:00:43 1.1
-+++ configure 2002/02/16 13:03:25
-@@ -12056,8 +12056,8 @@
+--- configure.orig Wed Feb 27 12:00:58 2002
++++ configure Wed Feb 27 12:02:16 2002
+@@ -11963,8 +11963,8 @@
done
fi
--echo "$as_me:12059: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:11966: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12059: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:11966: checking for BZ2_bzCompressInit in -lbz2" >&5
+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12073,11 +12073,11 @@
+@@ -11980,11 +11980,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -28,25 +28,28 @@ $FreeBSD$
;
return 0;
}
-@@ -12336,7 +12336,7 @@
+@@ -12296,7 +12296,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
+ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
cat >conftest.$ac_ext <<_ACEOF
- #line 12341 "configure"
+ #line 12301 "configure"
#include "confdefs.h"
-@@ -12386,7 +12386,7 @@
- EOF
+@@ -12347,9 +12347,9 @@
msg_openssl="yes"
-- OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcrypto"
-+ OPENSSL_LDFLAGS="-L$with_openssl_libs -lssl -lcryptofoo"
+ if test x$with_openssl_libs != x/usr/lib; then
+- OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
++ OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
+ else
+- OPENSSL_LIBS="-lssl -lcrypto"
++ OPENSSL_LIBS="-lssl -lcryptofoo"
+ fi
if true; then
- HAVE_SSL_TRUE=
-@@ -13170,7 +13170,7 @@
+@@ -13227,7 +13227,7 @@
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-intltool-merge.in b/devel/gnomevfs2/files/patch-intltool-merge.in
index 1b5a09da7f27..3d34ddfdbf53 100644
--- a/devel/gnomevfs2/files/patch-intltool-merge.in
+++ b/devel/gnomevfs2/files/patch-intltool-merge.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- intltool-merge.in 2002/02/16 12:59:40 1.1
-+++ intltool-merge.in 2002/02/16 12:59:59
-@@ -269,7 +269,7 @@
-
- if ($UTF8_ARG) {
- my $encoding = get_po_encoding ($po_file);
-- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
-+ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+--- intltool-merge.in.orig Mon Feb 11 23:40:38 2002
++++ intltool-merge.in Wed Feb 27 12:03:10 2002
+@@ -287,7 +287,7 @@
+ if (lc $encoding eq "utf-8") {
+ open PO_FILE, "<$po_file";
+ } else {
+- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
++ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+ }
} else {
open PO_FILE, "<$po_file";
- }
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index d2264681ee4c..e752643c375a 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -25,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
+include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h
include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 36afb218943b..02329812467c 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME= libIDL
-PORTVERSION= 0.7.3
+PORTVERSION= 0.7.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= glib-1.3.13:${PORTSDIR}/devel/glib13
+LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo
index ac22dc9b9c20..40e3cc956a93 100644
--- a/devel/libIDL/distinfo
+++ b/devel/libIDL/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libIDL-0.7.3.tar.bz2) = f52fc93a78aeb97644e882f4085bac97
+MD5 (gnome2/libIDL-0.7.4.tar.bz2) = 837b1b11e411d58dd5472715c0b1e68f
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 3e052567ccbd..3010d4b6f30a 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,18 +6,15 @@
#
PORTNAME= libbonobo
-PORTVERSION= 1.110.0
+PORTVERSION= 1.112.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= glib-1.3.13:${PORTSDIR}/devel/glib13 \
- bonobo-activation.3:${PORTSDIR}/devel/bonobo-activation
-RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS= bonobo-activation.4:${PORTSDIR}/devel/bonobo-activation
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 2676b543fa6e..05fa712d8598 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.110.0.tar.bz2) = 4341e22e07cf7c603b8a3d2c21804af6
+MD5 (gnome2/libbonobo-1.112.0.tar.bz2) = a4b4adf02fea1a1feca11897ecd82cc0
diff --git a/devel/libbonobo/files/patch-intltool-merge.in b/devel/libbonobo/files/patch-intltool-merge.in
index 9bdb5a48384b..4b41055809fe 100644
--- a/devel/libbonobo/files/patch-intltool-merge.in
+++ b/devel/libbonobo/files/patch-intltool-merge.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- intltool-merge.in 2002/02/14 09:09:06 1.1
-+++ intltool-merge.in 2002/02/14 09:09:15
-@@ -265,7 +265,7 @@
-
- if ($UTF8_ARG) {
- my $encoding = get_po_encoding ($po_file);
-- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
-+ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+--- intltool-merge.in.orig Tue Feb 19 10:28:55 2002
++++ intltool-merge.in Wed Feb 27 11:49:32 2002
+@@ -287,7 +287,7 @@
+ if (lc $encoding eq "utf-8") {
+ open PO_FILE, "<$po_file";
+ } else {
+- open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";
++ open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";
+ }
} else {
open PO_FILE, "<$po_file";
- }
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 94a3672e895b..8409be27366f 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -99,6 +99,7 @@ share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
share/locale/es/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo
share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo
share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
@@ -107,6 +108,7 @@ share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo
share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
share/locale/no/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo
share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 098c4e940382..5c31d07c383f 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libglade2
-PORTVERSION= 1.99.6
+PORTVERSION= 1.99.7
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- gtk-x11-1.3.13:${PORTSDIR}/x11-toolkits/gtk13
+ gtk-x11-1.3.14:${PORTSDIR}/x11-toolkits/gtk13
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
USE_BZIP2= yes
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 6c86b2e1c880..d7384b6c79ae 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.6.tar.bz2) = f9711089ae3db3a29d87e0dd5892de0d
+MD5 (gnome2/libglade-1.99.7.tar.bz2) = 0c3fa7bcd47f0e20f96d1dae855fa232
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index dbb654084d9e..6a552523d95a 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -10,6 +10,7 @@ lib/libglade-2.0.so.0
libdata/pkgconfig/libglade-2.0.pc
share/doc/libglade/gladexml.html
share/doc/libglade/libglade-dtd.html
+share/doc/libglade/libglade-dtd-exceptions.html
share/doc/libglade/libglade-embedding.html
share/doc/libglade/libglade-extending.html
share/doc/libglade/libglade-gnome.html
@@ -18,6 +19,7 @@ share/doc/libglade/libglade-lib.html
share/doc/libglade/libglade-libglade-build.html
share/doc/libglade/libglade-libglade-initialisation.html
share/doc/libglade/libglade-libglade-sax-parser.html
+share/doc/libglade/libglade-modules.html
share/doc/libglade/libglade-notes.html
share/doc/libglade/libglade.html
@dirrm share/doc/libglade
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 840ff39783b4..68436356d39e 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomecanvas
-PORTVERSION= 1.110.0
+PORTVERSION= 1.111.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
LIB_DEPENDS= glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index f5165cb9b8e6..8d43d4492958 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-1.110.0.tar.bz2) = cd2dd46f2c4787e9153fef89cb001b09
+MD5 (gnome2/libgnomecanvas-1.111.0.tar.bz2) = f5251d70b45fe0cd9f5036b5d8fb9471
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 3983157b0616..14106649f03a 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -6,16 +6,15 @@
#
PORTNAME= linc
-PORTVERSION= 0.1.16
-PORTREVISION= 1
+PORTVERSION= 0.1.18
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= glib-1.3.13:${PORTSDIR}/devel/glib13
+LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/net/linc/distinfo b/net/linc/distinfo
index 87e1d465c3d9..377dcd257515 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1 +1 @@
-MD5 (gnome2/linc-0.1.16.tar.bz2) = bb2aa352564eb4f6011b684b75877ba8
+MD5 (gnome2/linc-0.1.18.tar.bz2) = 5351a08ccb833f9ff32eca138f0ff81e
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index d189abf2671c..a2e01bc325c3 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gail
-PORTVERSION= 0.6
+PORTVERSION= 0.8
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-alpha2
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index b6d629a0c186..9fc048f43e9a 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.6.tar.bz2) = 7b7102c2a99e34a4c0eebd9343f685a6
+MD5 (gnome2/gail-0.8.tar.bz2) = 6f53ca1d060347647cf2d050ad2a9e9e
diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist
index 4f9e77f6397e..f141e8820254 100644
--- a/x11-toolkits/gail/pkg-plist
+++ b/x11-toolkits/gail/pkg-plist
@@ -6,7 +6,7 @@ lib/libferret.so.0
lib/libgail.so
lib/libgail.so.0
lib/libgailutil.so
-lib/libgailutil.so.6
+lib/libgailutil.so.8
lib/libtestaction.so
lib/libtestaction.so.0
lib/libtestbutton.so
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index b8d85062b8bf..e0efc0c27118 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= pango
-PORTVERSION= 0.24
+PORTVERSION= 0.25
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
ftp://ftp.gtk.org/pub/gtk/v1.3/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
http://www.ameth.org/gimp/gtk/v1.3/
@@ -17,7 +17,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
-LIB_DEPENDS= glib-1.3.13:${PORTSDIR}/devel/glib13 \
+LIB_DEPENDS= glib-1.3.14:${PORTSDIR}/devel/glib13 \
freetype.8:${PORTSDIR}/print/freetype2 \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 2b6c4dea9d01..b2098df5b877 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pango-0.24.tar.bz2) = 468d2973cf38705c85459ee495bfb11b
+MD5 (gnome2/pango-0.25.tar.bz2) = b1da9f0b95a7d2bfd481db0278739e18