aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/ORBit2/Makefile2
-rw-r--r--devel/atk/Makefile2
-rw-r--r--devel/bonobo-activation/Makefile11
-rw-r--r--devel/bonobo-activation/distinfo2
-rw-r--r--devel/bugbuddy2/Makefile15
-rw-r--r--devel/bugbuddy2/distinfo2
-rw-r--r--devel/bugbuddy2/pkg-plist4
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/glib20/Makefile4
-rw-r--r--devel/glib20/distinfo2
-rw-r--r--devel/glib20/pkg-plist1
-rw-r--r--devel/gnome-common/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile15
-rw-r--r--devel/gnome-vfs/distinfo2
-rw-r--r--devel/gnome-vfs/files/patch-aa22
-rw-r--r--devel/gnome-vfs/files/patch-ab19
-rw-r--r--devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in10
-rw-r--r--devel/gnomecommon/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile15
-rw-r--r--devel/gnomevfs2/distinfo2
-rw-r--r--devel/gnomevfs2/files/patch-aa22
-rw-r--r--devel/gnomevfs2/files/patch-ab19
-rw-r--r--devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in10
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libbonobo/Makefile2
-rw-r--r--devel/libglade2/Makefile2
-rw-r--r--devel/libgtop2/Makefile2
-rw-r--r--devel/pkg-config/Makefile2
-rw-r--r--devel/pkgconfig/Makefile2
29 files changed, 105 insertions, 94 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 7f39742c2d90..36e557269cb8 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ORBit2
PORTVERSION= 2.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 2e3cd6e9f3f9..18ed1def595c 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.0.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME} \
ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index ed9527088951..8f979ef47e05 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= bonobo-activation
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -20,6 +20,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
+USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
@@ -31,8 +32,8 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
MAN1= bonobo-activation-server.1
pre-patch:
- @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
- 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
- s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g'
+ @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
+ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
+ s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
.include <bsd.port.mk>
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 486cd9fdf4b0..88ac38c20274 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-1.0.0.tar.bz2) = 4cd1154d61ada02892224729275b9df0
+MD5 (gnome2/bonobo-activation-1.0.2.tar.bz2) = 12e959429016c59365b4cd4bb9746bd0
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 36bb86f41ae0..10c9b8519ded 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= bugbuddy2
-PORTVERSION= 2.1.6
+PORTVERSION= 2.2.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -19,6 +19,7 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \
@@ -27,11 +28,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+MAN1= bug-buddy.1
+
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
- 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
- s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
+ 's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+ s|[(]datadir[)]/locale|(prefix)/share/locale|g'
.include <bsd.port.mk>
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index f5244472cff4..872361f759c0 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bug-buddy-2.1.6.tar.bz2) = ff1b5f08e39080597c21f6a196c9b78f
+MD5 (gnome2/bug-buddy-2.2.0.tar.bz2) = c98a12f48a1f0c8697a7937a4a7d08a1
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index 57521b2948c2..d21dc8b68f19 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -1,4 +1,5 @@
bin/bug-buddy
+share/gnome/application-registry/bug-buddy.applications
share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-buddy.png
@@ -19,7 +20,9 @@ share/gnome/mime-info/bug-buddy.keys
share/gnome/mime-info/bug-buddy.mime
share/gnome/omf/bug-buddy/bug-buddy-C.omf
share/gnome/pixmaps/bug-buddy.png
+share/locale/ar/LC_MESSAGES/bug-buddy.mo
share/locale/az/LC_MESSAGES/bug-buddy.mo
+share/locale/bg/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
@@ -58,7 +61,6 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/omf/bug-buddy
-@dirrm share/gnome/help/bug-buddy/C/figures
@dirrm share/gnome/help/bug-buddy/C
@dirrm share/gnome/help/bug-buddy
@dirrm share/gnome/bug-buddy/bugzilla/ximian
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 358e79fadc8b..6c73f7b3288f 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gconf2
PORTVERSION= 1.2.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 5472148142e0..b3bf8cc6819e 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= glib
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-rc1,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-rc2,} \
ftp://ftp.gtk.org/pub/gtk/v2.0/ \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 3aec3a34f37a..c09b09961102 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-2.0.3.tar.bz2) = cba4ea14c4969c24dc49f08469aa0d7d
+MD5 (gnome2/glib-2.0.4.tar.bz2) = a4101c1f3fc1306eeb8f048f08e3f4b1
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index df9253700c83..87dda2263ddc 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -85,6 +85,7 @@ 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/locale/ar/LC_MESSAGES/glib20.mo
share/locale/az/LC_MESSAGES/glib20.mo
share/locale/ca/LC_MESSAGES/glib20.mo
share/locale/cs/LC_MESSAGES/glib20.mo
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index a71a614c1312..e665920e587b 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecommon
PORTVERSION= 1.2.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index f6cbe2c47ea6..178900592686 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.0.0
+PORTVERSION= 2.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/mis
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
@@ -35,11 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
- 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
- s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g'
- @find ${WRKSRC} -name "*info.in" | xargs ${PERL} -pi -e \
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+ 's|[(]libdir[)]/pkgconfig|\(prefix)/libdata/pkgconfig|g ; \
+ s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+ @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
's|\@datadir\@/gnome|\@datadir\@|g'
.include <bsd.port.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 11e1321832ff..78957bac4178 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.0.0.tar.bz2) = 6cdfc3379acf63c422109bfd87bfc3fe
+MD5 (gnome2/gnome-vfs-2.0.1.tar.bz2) = 0057aacf7e2a4d1fb2a13192de840436
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index fe31e4719654..62d8d7cbfa40 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon Jun 10 13:08:18 2002
-+++ configure Mon Jun 10 13:09:52 2002
-@@ -7493,6 +7493,7 @@
+--- configure.orig Tue Jun 25 18:16:23 2002
++++ configure Tue Jun 25 18:20:43 2002
+@@ -7209,6 +7209,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12412,8 +12413,8 @@
+@@ -12128,8 +12129,8 @@
done
fi
--echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12131: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12415: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12131: 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
-@@ -12429,11 +12430,11 @@
+@@ -12145,11 +12146,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -33,16 +33,16 @@
;
return 0;
}
-@@ -12762,7 +12763,7 @@
+@@ -12478,7 +12479,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 12767 "configure"
+ #line 12483 "configure"
#include "confdefs.h"
-@@ -12813,9 +12814,9 @@
+@@ -12529,9 +12530,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
fi
if true; then
-@@ -14018,7 +14019,7 @@
+@@ -13622,7 +13623,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-ab b/devel/gnome-vfs/files/patch-ab
index 535e326cd949..71079f6affb8 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,10 +1,11 @@
---- Makefile.in.orig Mon Jun 10 13:10:15 2002
-+++ Makefile.in Mon Jun 10 13:10:42 2002
-@@ -182,7 +182,6 @@
- schemas \
- devel-docs \
- doc \
-- test \
- monikers \
- po
+--- Makefile.in.orig Tue Jun 25 18:21:17 2002
++++ Makefile.in Tue Jun 25 18:22:25 2002
+@@ -170,7 +170,7 @@
+ SUBDIRS_GNOME = monikers doc schemas
+
+-SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po
++SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po
+
+
+ EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index 2884f343c186..f82a5fcd0b6a 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig Mon Jun 10 13:10:56 2002
-+++ libgnomevfs/Makefile.in Mon Jun 10 13:11:51 2002
-@@ -330,7 +330,7 @@
+--- libgnomevfs/Makefile.in.orig Tue Jun 25 18:22:53 2002
++++ libgnomevfs/Makefile.in Tue Jun 25 18:23:39 2002
+@@ -192,7 +192,7 @@
# Platform specific includes
-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- gnome-vfs-file-size.h
+ libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h
+
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index a71a614c1312..e665920e587b 100644
--- a/devel/gnomecommon/Makefile
+++ b/devel/gnomecommon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecommon
PORTVERSION= 1.2.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index f6cbe2c47ea6..178900592686 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomevfs2
-PORTVERSION= 2.0.0
+PORTVERSION= 2.0.1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -23,6 +23,7 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/mis
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
@@ -35,11 +36,11 @@ CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
pre-patch:
- @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
- 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
- s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g'
- @find ${WRKSRC} -name "*info.in" | xargs ${PERL} -pi -e \
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+ 's|[(]libdir[)]/pkgconfig|\(prefix)/libdata/pkgconfig|g ; \
+ s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
+ @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \
's|\@datadir\@/gnome|\@datadir\@|g'
.include <bsd.port.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 11e1321832ff..78957bac4178 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.0.0.tar.bz2) = 6cdfc3379acf63c422109bfd87bfc3fe
+MD5 (gnome2/gnome-vfs-2.0.1.tar.bz2) = 0057aacf7e2a4d1fb2a13192de840436
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index fe31e4719654..62d8d7cbfa40 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Mon Jun 10 13:08:18 2002
-+++ configure Mon Jun 10 13:09:52 2002
-@@ -7493,6 +7493,7 @@
+--- configure.orig Tue Jun 25 18:16:23 2002
++++ configure Tue Jun 25 18:20:43 2002
+@@ -7209,6 +7209,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12412,8 +12413,8 @@
+@@ -12128,8 +12129,8 @@
done
fi
--echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12131: checking for bzCompressInit in -lbz2" >&5
-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12415: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12131: 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
-@@ -12429,11 +12430,11 @@
+@@ -12145,11 +12146,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -33,16 +33,16 @@
;
return 0;
}
-@@ -12762,7 +12763,7 @@
+@@ -12478,7 +12479,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 12767 "configure"
+ #line 12483 "configure"
#include "confdefs.h"
-@@ -12813,9 +12814,9 @@
+@@ -12529,9 +12530,9 @@
msg_openssl="yes"
if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
fi
if true; then
-@@ -14018,7 +14019,7 @@
+@@ -13622,7 +13623,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-ab b/devel/gnomevfs2/files/patch-ab
index 535e326cd949..71079f6affb8 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,10 +1,11 @@
---- Makefile.in.orig Mon Jun 10 13:10:15 2002
-+++ Makefile.in Mon Jun 10 13:10:42 2002
-@@ -182,7 +182,6 @@
- schemas \
- devel-docs \
- doc \
-- test \
- monikers \
- po
+--- Makefile.in.orig Tue Jun 25 18:21:17 2002
++++ Makefile.in Tue Jun 25 18:22:25 2002
+@@ -170,7 +170,7 @@
+ SUBDIRS_GNOME = monikers doc schemas
+
+-SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po
++SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po
+
+
+ EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 2884f343c186..f82a5fcd0b6a 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig Mon Jun 10 13:10:56 2002
-+++ libgnomevfs/Makefile.in Mon Jun 10 13:11:51 2002
-@@ -330,7 +330,7 @@
+--- libgnomevfs/Makefile.in.orig Tue Jun 25 18:22:53 2002
++++ libgnomevfs/Makefile.in Tue Jun 25 18:23:39 2002
+@@ -192,7 +192,7 @@
# Platform specific includes
-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS = \
- gnome-vfs-file-size.h
+ libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h
+
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index a8ab4debd165..d243f0ad1f1b 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libIDL
PORTVERSION= 0.8.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 8f0e042259fd..b054896ccc81 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libbonobo
PORTVERSION= 2.0.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 2f4a4c419440..b5c694b316f3 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libglade2
PORTVERSION= 2.0.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index e42b94e933c6..f903949441d6 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libgtop2
PORTVERSION= 2.0.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index ad84a18d4205..936984258f80 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pkgconfig
PORTVERSION= 0.12.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index ad84a18d4205..936984258f80 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pkgconfig
PORTVERSION= 0.12.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org