diff options
118 files changed, 481 insertions, 393 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 5d838a97f740..2500911e8f30 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -9,7 +9,7 @@ PORTNAME= at-spi PORTVERSION= 1.0.1 CATEGORIES= x11-toolkits 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/accessibility/atk/Makefile b/accessibility/atk/Makefile index 2e3cd6e9f3f9..18ed1def595c 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/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/accessibility/gail/Makefile b/accessibility/gail/Makefile index accb4e78f436..ebdefe2cf538 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -9,7 +9,7 @@ PORTNAME= gail PORTVERSION= 0.16 CATEGORIES= x11-toolkits 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/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 78907279b7e7..21c17c9b2806 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.0.0 CATEGORIES= audio 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-media-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 78907279b7e7..21c17c9b2806 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.0.0 CATEGORIES= audio 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-media-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 7c84209d408b..45c9d0239d71 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 1.109.0 +PORTVERSION= 2.0.0 PORTEPOCH= 1 CATEGORIES= misc 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-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -33,11 +34,11 @@ MAN1= archive-generator.1 gnome-calculator.1 \ gnome-search-tool.1 gnome-system-log.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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index bb66c7d7bf40..79f4232f20d8 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-1.109.0.tar.bz2) = 7d5c695cb5605a05c8d0b102e35cf4be +MD5 (gnome2/gnome-utils-2.0.0.tar.bz2) = bc2cf88b452e6c680a3d2dd247f85870 diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 7c84209d408b..45c9d0239d71 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 1.109.0 +PORTVERSION= 2.0.0 PORTEPOCH= 1 CATEGORIES= misc 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-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -33,11 +34,11 @@ MAN1= archive-generator.1 gnome-calculator.1 \ gnome-search-tool.1 gnome-system-log.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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index bb66c7d7bf40..79f4232f20d8 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-1.109.0.tar.bz2) = 7d5c695cb5605a05c8d0b102e35cf4be +MD5 (gnome2/gnome-utils-2.0.0.tar.bz2) = bc2cf88b452e6c680a3d2dd247f85870 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 diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index 334cffb0ff29..a6548ab67d3e 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gedit2 -PORTVERSION= 1.199.0 +PORTVERSION= 2.0.0 CATEGORIES= editors 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= gedit-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -21,6 +22,7 @@ WRKSRC= ${WRKDIR}/gedit-${PORTVERSION} USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -30,10 +32,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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/editors/gedit2/distinfo b/editors/gedit2/distinfo index e73413756e56..0b550d2aed9b 100644 --- a/editors/gedit2/distinfo +++ b/editors/gedit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gedit2-1.199.0.tar.bz2) = 95d715bb407bf58f1c70d7f791404856 +MD5 (gnome2/gedit-2.0.0.tar.bz2) = cf400aa1510a51aab9a2a02482aeed2b diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 10ed297c1e20..626866f69559 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= games 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-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,22 +21,24 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome + --datadir=${PREFIX}/share/gnome \ + --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' + @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' .include <bsd.port.mk> diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 0be49f23b440..bc150231a8b8 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-games-2.0.0.tar.bz2) = 5f64d6a2047a2e6f2c191f521110e955 +MD5 (gnome2/gnome-games-2.0.1.tar.bz2) = f70b83d1cc7930530008035a4bb69bf5 diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index c6f88b8e148f..d2cbb830da47 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -72,8 +72,8 @@ share/gnome/applications/gtali.desktop share/gnome/applications/iagno.desktop share/gnome/applications/mahjongg.desktop share/gnome/applications/same-gnome.desktop +share/gnome/applications/sol.desktop share/gnome/applications/xbill.desktop -share/gnome/apps/Games/sol.desktop share/gnome/games/glines.scores share/gnome/games/gnibbles.1.0.scores share/gnome/games/gnibbles.1.1.scores @@ -829,7 +829,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/gnibbles @dirrm share/gnome/gnect @dirrm share/gnome/games -@dirrm share/gnome/apps/Games @dirrm include/gdkcardimage @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 10ed297c1e20..626866f69559 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= games 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-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,22 +21,24 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome + --datadir=${PREFIX}/share/gnome \ + --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' + @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' .include <bsd.port.mk> diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 0be49f23b440..bc150231a8b8 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-games-2.0.0.tar.bz2) = 5f64d6a2047a2e6f2c191f521110e955 +MD5 (gnome2/gnome-games-2.0.1.tar.bz2) = f70b83d1cc7930530008035a4bb69bf5 diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index c6f88b8e148f..d2cbb830da47 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -72,8 +72,8 @@ share/gnome/applications/gtali.desktop share/gnome/applications/iagno.desktop share/gnome/applications/mahjongg.desktop share/gnome/applications/same-gnome.desktop +share/gnome/applications/sol.desktop share/gnome/applications/xbill.desktop -share/gnome/apps/Games/sol.desktop share/gnome/games/glines.scores share/gnome/games/gnibbles.1.0.scores share/gnome/games/gnibbles.1.1.scores @@ -829,7 +829,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/gnibbles @dirrm share/gnome/gnect @dirrm share/gnome/games -@dirrm share/gnome/apps/Games @dirrm include/gdkcardimage @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index c5c5bce84e0d..d5c25d37c53e 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eog2 -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= graphics 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= eog-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,6 +21,7 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ USE_BZIP2= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -30,11 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo index a14269401fa8..a097bb17acd3 100644 --- a/graphics/eog2/distinfo +++ b/graphics/eog2/distinfo @@ -1 +1 @@ -MD5 (gnome2/eog-1.0.0.tar.bz2) = bda45849d387b28afc3106bbe6ece5ca +MD5 (gnome2/eog-1.0.1.tar.bz2) = 0870d7a21aa33bc6c959ec8a83d0e003 diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile index 1bd18926250d..a5dea57150df 100644 --- a/graphics/libart_lgpl/Makefile +++ b/graphics/libart_lgpl/Makefile @@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2 PORTVERSION= 2.3.8 CATEGORIES= graphics 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/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile index 1bd18926250d..a5dea57150df 100644 --- a/graphics/libart_lgpl2/Makefile +++ b/graphics/libart_lgpl2/Makefile @@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2 PORTVERSION= 2.3.8 CATEGORIES= graphics 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/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 661710bbe8cd..f7548057fac6 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgnomecanvas PORTVERSION= 2.0.1 CATEGORIES= graphics 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/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 59c0a25a08f4..e7a40cfc65bb 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -9,7 +9,7 @@ PORTNAME= librsvg2 PORTVERSION= 1.1.6 CATEGORIES= graphics 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 DISTNAME= librsvg-${PORTVERSION} diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 7c84209d408b..45c9d0239d71 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 1.109.0 +PORTVERSION= 2.0.0 PORTEPOCH= 1 CATEGORIES= misc 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-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -33,11 +34,11 @@ MAN1= archive-generator.1 gnome-calculator.1 \ gnome-search-tool.1 gnome-system-log.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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo index bb66c7d7bf40..79f4232f20d8 100644 --- a/misc/gnomeutils2/distinfo +++ b/misc/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-1.109.0.tar.bz2) = 7d5c695cb5605a05c8d0b102e35cf4be +MD5 (gnome2/gnome-utils-2.0.0.tar.bz2) = bc2cf88b452e6c680a3d2dd247f85870 diff --git a/net/linc/Makefile b/net/linc/Makefile index ec8527ea8986..50ed9374b625 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -9,7 +9,7 @@ PORTNAME= linc PORTVERSION= 0.5.0 CATEGORIES= net 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/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index f86dcea1f379..5f8da493d5f0 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgnomeprint PORTVERSION= 1.115.0 CATEGORIES= print 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/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 615f19dad61a..90836daed2d4 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -9,7 +9,7 @@ PORTNAME= gconf-editor PORTVERSION= 0.2 CATEGORIES= sysutils 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/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index d7463172f739..76895641ff3c 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 1.99.10 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= sysutils 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= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +19,7 @@ LIB_DEPENDS= gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -29,11 +29,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index c575e3738f5a..00226dd4317c 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-1.99.10.tar.bz2) = eea5a5261e3447d01960463755422854 +MD5 (gnome2/control-center-2.0.0.tar.bz2) = aeb1e8ddfd98511baaf73030674813ad diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c index d5ce54f8ce00..0969a7707ffd 100644 --- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -1,29 +1,29 @@ ---- capplets/mouse/gnome-mouse-properties.c.orig Sun May 5 01:04:48 2002 -+++ capplets/mouse/gnome-mouse-properties.c Sun May 5 01:05:10 2002 -@@ -532,7 +532,7 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Wed May 29 00:14:19 2002 ++++ capplets/mouse/gnome-mouse-properties.c Tue Jun 25 21:51:30 2002 +@@ -570,7 +570,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL); gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -553,7 +553,7 @@ +@@ -591,7 +591,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL); gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -574,7 +574,7 @@ +@@ -612,7 +612,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL); gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 7e44bf49ffc1..595398730551 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon May 6 01:33:23 2002 -+++ configure Mon May 6 01:33:51 2002 -@@ -7353,6 +7353,7 @@ +--- configure.orig Mon Jun 17 17:54:50 2002 ++++ configure Tue Jun 25 22:10:20 2002 +@@ -8102,6 +8102,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,27 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -11337,7 +11338,7 @@ +@@ -12782,7 +12783,7 @@ fi - cat >>confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}" +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" - EOF + _ACEOF GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' +@@ -13487,11 +13488,11 @@ + s,@XF86MISC_LIBS@,$XF86MISC_LIBS,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t +-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t ++s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t + s,@GNOMECC_CFLAGS@,$GNOMECC_CFLAGS,;t t +-s,@GNOMECC_LIBS@,$GNOMECC_LIBS,;t t ++s~@GNOMECC_LIBS@~$GNOMECC_LIBS~;t t + s,@GNOME_SETTINGS_DAEMON_CFLAGS@,$GNOME_SETTINGS_DAEMON_CFLAGS,;t t +-s,@GNOME_SETTINGS_DAEMON_LIBS@,$GNOME_SETTINGS_DAEMON_LIBS,;t t ++s~@GNOME_SETTINGS_DAEMON_LIBS@~$GNOME_SETTINGS_DAEMON_LIBS~;t t + s,@OLD_CAPPLET_CFLAGS@,$OLD_CAPPLET_CFLAGS,;t t + s,@OLD_CAPPLET_LIBS@,$OLD_CAPPLET_LIBS,;t t + s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 5a2cc754db3c..f3419e8bd636 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -1,6 +1,7 @@ bin/gnome-accessibility-keyboard-properties bin/gnome-background-properties bin/gnome-control-center +bin/gnome-default-applications-properties bin/gnome-file-types-properties bin/gnome-font-properties bin/gnome-keybinding-properties @@ -12,15 +13,25 @@ bin/gnome-sound-properties bin/gnome-theme-properties bin/gnome-ui-properties etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml +etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas +include/gnome-window-settings-2.0/gnome-window-manager.h +include/gnome-window-settings-2.0/gnome-wm-manager.h +lib/libgnome-window-settings.a +lib/libgnome-window-settings.so +lib/libgnome-window-settings.so.1 libdata/bonobo/servers/GNOME_SettingsDaemon.server +libdata/pkgconfig/gnome-window-settings-2.0.pc share/gnome/applications/gnomecc.desktop share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop share/gnome/control-center-2.0/capplets/background.desktop share/gnome/control-center-2.0/capplets/behavior.desktop +share/gnome/control-center-2.0/capplets/default-applications.desktop share/gnome/control-center-2.0/capplets/file-types.desktop share/gnome/control-center-2.0/capplets/font-properties.desktop share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop @@ -35,6 +46,7 @@ share/gnome/control-center-2.0/icons/advanced-directory.png share/gnome/control-center-2.0/icons/background-capplet.png share/gnome/control-center-2.0/icons/behavior-capplet.png share/gnome/control-center-2.0/icons/control-center.png +share/gnome/control-center-2.0/icons/default-applications-capplet.png share/gnome/control-center-2.0/icons/font-capplet.png share/gnome/control-center-2.0/icons/mouse-capplet.png share/gnome/control-center-2.0/icons/sound-capplet.png @@ -42,6 +54,7 @@ share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade2 +share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade @@ -68,29 +81,17 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png share/gnome/control-center-2.0/pixmaps/mouse-left.png share/gnome/control-center-2.0/pixmaps/mouse-right.png -share/gnome/cursor-fonts/cursor-large-white.pcf.gz -share/gnome/cursor-fonts/cursor-large.pcf.gz -share/gnome/cursor-fonts/cursor-white.pcf.gz +share/gnome/cursor-fonts/cursor-large-white.pcf +share/gnome/cursor-fonts/cursor-large.pcf +share/gnome/cursor-fonts/cursor-white.pcf share/gnome/gnome-2.0/ui/gnomecc-ui.xml -share/gnome/help/control-center-manual/C/config-accessibility-keyboard.xml -share/gnome/help/control-center-manual/C/config-background.xml -share/gnome/help/control-center-manual/C/config-behavior.xml -share/gnome/help/control-center-manual/C/config-cds.xml -share/gnome/help/control-center-manual/C/config-file-type.xml -share/gnome/help/control-center-manual/C/config-hints.xml -share/gnome/help/control-center-manual/C/config-html.xml -share/gnome/help/control-center-manual/C/config-kbd.xml -share/gnome/help/control-center-manual/C/config-keybindings.xml -share/gnome/help/control-center-manual/C/config-mouse.xml -share/gnome/help/control-center-manual/C/config-screensaver.xml -share/gnome/help/control-center-manual/C/config-sound.xml -share/gnome/help/control-center-manual/C/config-themes.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl share/gnome/pixmaps/accessibility-keyboard-capplet.png share/gnome/pixmaps/background-capplet.png share/gnome/pixmaps/behavior-capplet.png share/gnome/pixmaps/control-center2.png +share/gnome/pixmaps/default-applications-capplet.png share/gnome/pixmaps/font-capplet.png share/gnome/pixmaps/gnomecc-2/active.png share/gnome/pixmaps/gnomecc-2/bcg_top.png @@ -102,7 +103,9 @@ share/gnome/pixmaps/mouse-capplet.png share/gnome/pixmaps/sound-capplet.png share/gnome/vfolders/Accessibility.directory share/gnome/vfolders/Advanced.directory +share/locale/ar/LC_MESSAGES/control-center-2.0.mo share/locale/az/LC_MESSAGES/control-center-2.0.mo +share/locale/bg/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo share/locale/da/LC_MESSAGES/control-center-2.0.mo @@ -141,15 +144,15 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/pixmaps/gnomecc-2 -@dirrm share/gnome/help/control-center-manual/C/figures -@dirrm share/gnome/help/control-center-manual/C -@dirrm share/gnome/help/control-center-manual @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces @dirrm share/gnome/control-center-2.0/icons @dirrm share/gnome/applications +@dirrm include/gnome-window-settings-2.0 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 555bc4a58d71..3abf9fdc8b4c 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnomesystemmonitor PORTVERSION= 2.0.0 CATEGORIES= sysutils 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-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index d7463172f739..76895641ff3c 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 1.99.10 -PORTREVISION= 1 +PORTVERSION= 2.0.0 CATEGORIES= sysutils 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= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +19,7 @@ LIB_DEPENDS= gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -29,11 +29,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index c575e3738f5a..00226dd4317c 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-1.99.10.tar.bz2) = eea5a5261e3447d01960463755422854 +MD5 (gnome2/control-center-2.0.0.tar.bz2) = aeb1e8ddfd98511baaf73030674813ad diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c index d5ce54f8ce00..0969a7707ffd 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -1,29 +1,29 @@ ---- capplets/mouse/gnome-mouse-properties.c.orig Sun May 5 01:04:48 2002 -+++ capplets/mouse/gnome-mouse-properties.c Sun May 5 01:05:10 2002 -@@ -532,7 +532,7 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Wed May 29 00:14:19 2002 ++++ capplets/mouse/gnome-mouse-properties.c Tue Jun 25 21:51:30 2002 +@@ -570,7 +570,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf.gz", FALSE, NULL); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL); gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -553,7 +553,7 @@ +@@ -591,7 +591,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf.gz", FALSE, NULL); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL); gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -574,7 +574,7 @@ +@@ -612,7 +612,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf.gz", FALSE, NULL); +- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL); ++ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL); gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index 7e44bf49ffc1..595398730551 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon May 6 01:33:23 2002 -+++ configure Mon May 6 01:33:51 2002 -@@ -7353,6 +7353,7 @@ +--- configure.orig Mon Jun 17 17:54:50 2002 ++++ configure Tue Jun 25 22:10:20 2002 +@@ -8102,6 +8102,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,27 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -11337,7 +11338,7 @@ +@@ -12782,7 +12783,7 @@ fi - cat >>confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}" +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" - EOF + _ACEOF GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' +@@ -13487,11 +13488,11 @@ + s,@XF86MISC_LIBS@,$XF86MISC_LIBS,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t +-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t ++s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t + s,@GNOMECC_CFLAGS@,$GNOMECC_CFLAGS,;t t +-s,@GNOMECC_LIBS@,$GNOMECC_LIBS,;t t ++s~@GNOMECC_LIBS@~$GNOMECC_LIBS~;t t + s,@GNOME_SETTINGS_DAEMON_CFLAGS@,$GNOME_SETTINGS_DAEMON_CFLAGS,;t t +-s,@GNOME_SETTINGS_DAEMON_LIBS@,$GNOME_SETTINGS_DAEMON_LIBS,;t t ++s~@GNOME_SETTINGS_DAEMON_LIBS@~$GNOME_SETTINGS_DAEMON_LIBS~;t t + s,@OLD_CAPPLET_CFLAGS@,$OLD_CAPPLET_CFLAGS,;t t + s,@OLD_CAPPLET_LIBS@,$OLD_CAPPLET_LIBS,;t t + s,@GNOME_CFLAGS@,$GNOME_CFLAGS,;t t diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 5a2cc754db3c..f3419e8bd636 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -1,6 +1,7 @@ bin/gnome-accessibility-keyboard-properties bin/gnome-background-properties bin/gnome-control-center +bin/gnome-default-applications-properties bin/gnome-file-types-properties bin/gnome-font-properties bin/gnome-keybinding-properties @@ -12,15 +13,25 @@ bin/gnome-sound-properties bin/gnome-theme-properties bin/gnome-ui-properties etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml +etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas +include/gnome-window-settings-2.0/gnome-window-manager.h +include/gnome-window-settings-2.0/gnome-wm-manager.h +lib/libgnome-window-settings.a +lib/libgnome-window-settings.so +lib/libgnome-window-settings.so.1 libdata/bonobo/servers/GNOME_SettingsDaemon.server +libdata/pkgconfig/gnome-window-settings-2.0.pc share/gnome/applications/gnomecc.desktop share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop share/gnome/control-center-2.0/capplets/background.desktop share/gnome/control-center-2.0/capplets/behavior.desktop +share/gnome/control-center-2.0/capplets/default-applications.desktop share/gnome/control-center-2.0/capplets/file-types.desktop share/gnome/control-center-2.0/capplets/font-properties.desktop share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop @@ -35,6 +46,7 @@ share/gnome/control-center-2.0/icons/advanced-directory.png share/gnome/control-center-2.0/icons/background-capplet.png share/gnome/control-center-2.0/icons/behavior-capplet.png share/gnome/control-center-2.0/icons/control-center.png +share/gnome/control-center-2.0/icons/default-applications-capplet.png share/gnome/control-center-2.0/icons/font-capplet.png share/gnome/control-center-2.0/icons/mouse-capplet.png share/gnome/control-center-2.0/icons/sound-capplet.png @@ -42,6 +54,7 @@ share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade2 +share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade @@ -68,29 +81,17 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png share/gnome/control-center-2.0/pixmaps/mouse-left.png share/gnome/control-center-2.0/pixmaps/mouse-right.png -share/gnome/cursor-fonts/cursor-large-white.pcf.gz -share/gnome/cursor-fonts/cursor-large.pcf.gz -share/gnome/cursor-fonts/cursor-white.pcf.gz +share/gnome/cursor-fonts/cursor-large-white.pcf +share/gnome/cursor-fonts/cursor-large.pcf +share/gnome/cursor-fonts/cursor-white.pcf share/gnome/gnome-2.0/ui/gnomecc-ui.xml -share/gnome/help/control-center-manual/C/config-accessibility-keyboard.xml -share/gnome/help/control-center-manual/C/config-background.xml -share/gnome/help/control-center-manual/C/config-behavior.xml -share/gnome/help/control-center-manual/C/config-cds.xml -share/gnome/help/control-center-manual/C/config-file-type.xml -share/gnome/help/control-center-manual/C/config-hints.xml -share/gnome/help/control-center-manual/C/config-html.xml -share/gnome/help/control-center-manual/C/config-kbd.xml -share/gnome/help/control-center-manual/C/config-keybindings.xml -share/gnome/help/control-center-manual/C/config-mouse.xml -share/gnome/help/control-center-manual/C/config-screensaver.xml -share/gnome/help/control-center-manual/C/config-sound.xml -share/gnome/help/control-center-manual/C/config-themes.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl share/gnome/pixmaps/accessibility-keyboard-capplet.png share/gnome/pixmaps/background-capplet.png share/gnome/pixmaps/behavior-capplet.png share/gnome/pixmaps/control-center2.png +share/gnome/pixmaps/default-applications-capplet.png share/gnome/pixmaps/font-capplet.png share/gnome/pixmaps/gnomecc-2/active.png share/gnome/pixmaps/gnomecc-2/bcg_top.png @@ -102,7 +103,9 @@ share/gnome/pixmaps/mouse-capplet.png share/gnome/pixmaps/sound-capplet.png share/gnome/vfolders/Accessibility.directory share/gnome/vfolders/Advanced.directory +share/locale/ar/LC_MESSAGES/control-center-2.0.mo share/locale/az/LC_MESSAGES/control-center-2.0.mo +share/locale/bg/LC_MESSAGES/control-center-2.0.mo share/locale/ca/LC_MESSAGES/control-center-2.0.mo share/locale/cs/LC_MESSAGES/control-center-2.0.mo share/locale/da/LC_MESSAGES/control-center-2.0.mo @@ -141,15 +144,15 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/pixmaps/gnomecc-2 -@dirrm share/gnome/help/control-center-manual/C/figures -@dirrm share/gnome/help/control-center-manual/C -@dirrm share/gnome/help/control-center-manual @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces @dirrm share/gnome/control-center-2.0/icons @dirrm share/gnome/applications +@dirrm include/gnome-window-settings-2.0 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 555bc4a58d71..3abf9fdc8b4c 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnomesystemmonitor PORTVERSION= 2.0.0 CATEGORIES= sysutils 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-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index f68ae9d54c03..1b4b17d31799 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -10,7 +10,7 @@ PORTVERSION= 2.0.0 PORTREVISION= 1 CATEGORIES= www 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/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 4b760202bf6d..89b573b65b44 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -9,7 +9,7 @@ PORTNAME= nautilus2 PORTVERSION= 2.0.0 CATEGORIES= x11-fm 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 DISTNAME= nautilus-${PORTVERSION} diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile index 5d838a97f740..2500911e8f30 100644 --- a/x11-toolkits/at-spi/Makefile +++ b/x11-toolkits/at-spi/Makefile @@ -9,7 +9,7 @@ PORTNAME= at-spi PORTVERSION= 1.0.1 CATEGORIES= x11-toolkits 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/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile index 51689a9eec4a..09fe9995841e 100644 --- a/x11-toolkits/eel2/Makefile +++ b/x11-toolkits/eel2/Makefile @@ -9,7 +9,7 @@ PORTNAME= eel2 PORTVERSION= 2.0.0 CATEGORIES= x11-toolkits 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 DISTNAME= eel-${PORTVERSION} diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile index accb4e78f436..ebdefe2cf538 100644 --- a/x11-toolkits/gail/Makefile +++ b/x11-toolkits/gail/Makefile @@ -9,7 +9,7 @@ PORTNAME= gail PORTVERSION= 0.16 CATEGORIES= x11-toolkits 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/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 514f49290e2d..f982490bc45d 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,9 +6,9 @@ # PORTNAME= gtk -PORTVERSION= 2.0.3 +PORTVERSION= 2.0.5 CATEGORIES= x11-toolkits -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%/ \ @@ -31,6 +31,7 @@ USE_BZIP2= yes NO_LATEST_LINK= yes USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -45,9 +46,9 @@ MAN1= gdk-pixbuf-csource.1 post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ - xargs ${PERL} -pi -e 's|-lgmodule|\@GMODULE_LIBS\@|g' - @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 3ba12f41a23e..68f86653e5fe 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk+-2.0.3.tar.bz2) = ede2b96a3de02b5e2c29de741529b358 +MD5 (gnome2/gtk+-2.0.5.tar.bz2) = dfa52595e76fd389c4d42c60412317e8 diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 055634d7c7d4..a90f3e48936d 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -222,6 +222,7 @@ libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20.mo diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 514f49290e2d..f982490bc45d 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,9 +6,9 @@ # PORTNAME= gtk -PORTVERSION= 2.0.3 +PORTVERSION= 2.0.5 CATEGORIES= x11-toolkits -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%/ \ @@ -31,6 +31,7 @@ USE_BZIP2= yes NO_LATEST_LINK= yes USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes USE_PERL5= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -45,9 +46,9 @@ MAN1= gdk-pixbuf-csource.1 post-extract: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ - xargs ${PERL} -pi -e 's|-lgmodule|\@GMODULE_LIBS\@|g' - @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 3ba12f41a23e..68f86653e5fe 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk+-2.0.3.tar.bz2) = ede2b96a3de02b5e2c29de741529b358 +MD5 (gnome2/gtk+-2.0.5.tar.bz2) = dfa52595e76fd389c4d42c60412317e8 diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 055634d7c7d4..a90f3e48936d 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -222,6 +222,7 @@ libdata/pkgconfig/gdk-x11-2.0.pc libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 +share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20.mo diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 2889de341676..1bd92f7f9daa 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -9,7 +9,7 @@ PORTNAME= libbonoboui PORTVERSION= 2.0.0 CATEGORIES= x11-toolkits 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/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 08a29f895697..6a64bbba3375 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgail-gnome PORTVERSION= 1.0.0 CATEGORIES= x11-toolkits 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/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index a8b2b9d3cf7b..da0b70b373b0 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgnomeprintui PORTVERSION= 1.115.0 CATEGORIES= x11-toolkits 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/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index fa27ba400c9a..99b2e8016207 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgnomeui PORTVERSION= 2.0.1 CATEGORIES= x11-toolkits 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/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index c8532e79cae4..9a95202db77a 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -9,7 +9,7 @@ PORTNAME= libwnck PORTVERSION= 0.14 CATEGORIES= x11-toolkits 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/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index f79613348464..25b3bd25bc13 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libzvt -PORTVERSION= 1.99999.0 +PORTVERSION= 2.0.0 CATEGORIES= x11-toolkits 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 @@ -20,6 +20,7 @@ LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -30,12 +31,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(datadir\)/gnome/|\$\(datadir\)/|g' - @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]datadir[)]/gnome/|(datadir)/|g' + @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' .include <bsd.port.mk> diff --git a/x11-toolkits/libzvt/distinfo b/x11-toolkits/libzvt/distinfo index 53f4e9864950..d83be6ed1fc1 100644 --- a/x11-toolkits/libzvt/distinfo +++ b/x11-toolkits/libzvt/distinfo @@ -1 +1 @@ -MD5 (gnome2/libzvt-1.99999.0.tar.bz2) = a4485c3091e0c23b81184bc224a6dbb1 +MD5 (gnome2/libzvt-2.0.0.tar.bz2) = 6c94cf3cb82299cd51c0b9e855103674 diff --git a/x11-toolkits/libzvt/pkg-plist b/x11-toolkits/libzvt/pkg-plist index 8010139ae802..c41927312f32 100644 --- a/x11-toolkits/libzvt/pkg-plist +++ b/x11-toolkits/libzvt/pkg-plist @@ -3,10 +3,11 @@ include/libzvt-2.0/libzvt/libzvt.h include/libzvt-2.0/libzvt/lists.h include/libzvt-2.0/libzvt/vt.h include/libzvt-2.0/libzvt/vtx.h -lib/libzvt-2.a -lib/libzvt-2.so -lib/libzvt-2.so.0 +lib/libzvt-2.0.a +lib/libzvt-2.0.so +lib/libzvt-2.0.so.0 libdata/pkgconfig/libzvt-2.0.pc -sbin/gnome-pty-helper-2 +libexec/libzvt-2.0/gnome-pty-helper +@dirrm libexec/libzvt-2.0 @dirrm include/libzvt-2.0/libzvt @dirrm include/libzvt-2.0 diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 98979de0cb5c..50db21e21218 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,9 +6,9 @@ # PORTNAME= pango -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11-toolkits -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.cs.umn.edu/pub/gimp/gtk/v1.3/ \ http://www.ameth.org/gimp/gtk/v1.3/ @@ -24,6 +24,7 @@ LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-qt=no \ @@ -50,9 +51,9 @@ PLIST_SUB+= XFREE4:="" .endif pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' - @find ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${PERL} -pi -e \ + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' + @find ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|internal/tterrors\.h|fterrors.h| ; s|TT_Err_|FT_Err_|g' .include <bsd.port.post.mk> diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index b4db6b789764..03a3bcb3eeb2 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1 +1 @@ -MD5 (gnome2/pango-1.0.2.tar.bz2) = 2142fa3f27141cfaa1eae63fcd4e7113 +MD5 (gnome2/pango-1.0.3.tar.bz2) = 5bb1904c4a7837ec5b8007501646302d diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index 22bb3f42d314..16fbfcbd064f 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -6,16 +6,17 @@ # PORTNAME= rep-gtk2 -PORTVERSION= 2002.06.11 +PORTVERSION= 0.16 +PORTEPOCH= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1 -DISTNAME= rep-gtk-${PORTVERSION:S/./-/g} +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2 +DISTNAME= rep-gtk-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep2 \ +LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep \ gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} diff --git a/x11-toolkits/rep-gtk2/distinfo b/x11-toolkits/rep-gtk2/distinfo index 083f3dc0d310..720973c29ff1 100644 --- a/x11-toolkits/rep-gtk2/distinfo +++ b/x11-toolkits/rep-gtk2/distinfo @@ -1 +1 @@ -MD5 (gnome2/rep-gtk-2002-06-11.tar.bz2) = 7a9211257ba93d5f90462b8d9d11f9bb +MD5 (gnome2/rep-gtk-0.16.tar.bz2) = 4bc2cff9e0af947606621320873c1791 diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index b88ea2a57289..9972f3b16897 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -6,24 +6,26 @@ # PORTNAME= sawfish2 -PORTVERSION= 2002.06.11 +PORTVERSION= 2.0 +PORTEPOCH= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc1 -DISTNAME= sawfish-${PORTVERSION:S/./-/g} +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-rc2 +DISTNAME= sawfish-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep2 +LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2 RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2 GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//} -PLIST_SUB= GNUHOST=${GNUHOST} VERSION=2.0.pre1 +PLIST_SUB= GNUHOST=${GNUHOST} VERSION=2.0 USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-readline \ @@ -36,14 +38,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ + @${REINPLACE_CMD} -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ - s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ - 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ - s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \ - s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g' + s|[$$][(]top_builddir[)]/intl/libintl.a|-lintl|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' post-install: install-info --section="X11 window manager" \ diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo index cb0be5578a36..6f4dabfb197e 100644 --- a/x11-wm/sawfish2/distinfo +++ b/x11-wm/sawfish2/distinfo @@ -1 +1 @@ -MD5 (gnome2/sawfish-2002-06-11.tar.bz2) = 6217c3810620dab57e84203b19783aa0 +MD5 (gnome2/sawfish-2.0.tar.bz2) = 47f57179c50737992500dca7f2cab4b4 diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index f8869f83783c..8583d49022d1 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -9,7 +9,7 @@ PORTNAME= gdm2 PORTVERSION= 2.4.0.0 CATEGORIES= x11 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= gdm-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 63649a698949..db8d56510920 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnomeapplets2 PORTVERSION= 2.0.0 CATEGORIES= x11 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-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 65f216ea81c0..bc8a7e7ea304 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 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-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes @@ -33,10 +34,10 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gnome-about.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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(datadir\)/gnome/|\$\(datadir\)/|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]datadir[)]/gnome/|(datadir)/|g' .include <bsd.port.mk> diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 70e07a18f8e7..c3afec440332 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.0.0.tar.bz2) = d35116a9c3fa1779d36d8611e35de36a +MD5 (gnome2/gnome-desktop-2.0.1.tar.bz2) = cd4bda0134eea261b0034d1bc275a228 diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 2a92fa4b0b04..3efc10ab837d 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 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-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \ USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -34,12 +35,12 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gnome-panel-2.1 gnome-panel-properties.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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index c974ae3bc8dd..f582cfb29d47 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.0.0.tar.bz2) = 539847acb8919e85aef73350a3218a82 +MD5 (gnome2/gnome-panel-2.0.1.tar.bz2) = 3793bc3f6901a59cc2829f990af9cb1e diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 76895157c835..04113c0f1bf3 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -10,6 +10,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml @@ -218,6 +220,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index bb4f84718265..f3f76b1a5238 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomesession -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 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-session-${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 \ @@ -32,10 +33,10 @@ MAN1= gnome-libice-check.1 gnome-login-check.1 gnome-session.1 \ MAN5= default.session.5 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/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 3aec0fe5e19e..8b25c352f18b 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-session-2.0.0.tar.bz2) = ba3d76c8924a164eb9628b3c64d8ddff +MD5 (gnome2/gnome-session-2.0.1.tar.bz2) = 6e8dadb1a18072312dbf66a421482bf3 diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 5a07971a5deb..8a87ed6b789c 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -8,7 +8,6 @@ etc/gconf/schemas/gnome-session.schemas share/gnome/control-center-2.0/capplets/session-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/pixmaps/splash/gnome-splash-1.4.0.png share/gnome/pixmaps/splash/gnome-splash.png share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index f5f94e4b6445..8818e1e3c187 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -7,19 +7,21 @@ PORTNAME= gnometerminal PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= x11 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-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= zvt-2.0:${PORTSDIR}/x11-toolkits/libzvt \ +LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \ 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 \ @@ -29,11 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 63649a698949..db8d56510920 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -9,7 +9,7 @@ PORTNAME= gnomeapplets2 PORTVERSION= 2.0.0 CATEGORIES= x11 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-applets-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 65f216ea81c0..bc8a7e7ea304 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 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-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_BISON= yes INSTALLS_SHLIB= yes @@ -33,10 +34,10 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gnome-about.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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(datadir\)/gnome/|\$\(datadir\)/|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]datadir[)]/gnome/|(datadir)/|g' .include <bsd.port.mk> diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 70e07a18f8e7..c3afec440332 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.0.0.tar.bz2) = d35116a9c3fa1779d36d8611e35de36a +MD5 (gnome2/gnome-desktop-2.0.1.tar.bz2) = cd4bda0134eea261b0034d1bc275a228 diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index 2a92fa4b0b04..3efc10ab837d 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 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-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,6 +20,7 @@ LIB_DEPENDS= wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \ USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -34,12 +35,12 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gnome-panel-2.1 gnome-panel-properties.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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index c974ae3bc8dd..f582cfb29d47 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.0.0.tar.bz2) = 539847acb8919e85aef73350a3218a82 +MD5 (gnome2/gnome-panel-2.0.1.tar.bz2) = 3793bc3f6901a59cc2829f990af9cb1e diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index 76895157c835..04113c0f1bf3 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -10,6 +10,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml @@ -218,6 +220,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index bb4f84718265..f3f76b1a5238 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomesession -PORTVERSION= 2.0.0 +PORTVERSION= 2.0.1 CATEGORIES= x11 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-session-${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 \ @@ -32,10 +33,10 @@ MAN1= gnome-libice-check.1 gnome-login-check.1 gnome-session.1 \ MAN5= default.session.5 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/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 3aec0fe5e19e..8b25c352f18b 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-session-2.0.0.tar.bz2) = ba3d76c8924a164eb9628b3c64d8ddff +MD5 (gnome2/gnome-session-2.0.1.tar.bz2) = 6e8dadb1a18072312dbf66a421482bf3 diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 5a07971a5deb..8a87ed6b789c 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -8,7 +8,6 @@ etc/gconf/schemas/gnome-session.schemas share/gnome/control-center-2.0/capplets/session-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/pixmaps/splash/gnome-splash-1.4.0.png share/gnome/pixmaps/splash/gnome-splash.png share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index f5f94e4b6445..8818e1e3c187 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -7,19 +7,21 @@ PORTNAME= gnometerminal PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= x11 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-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= zvt-2.0:${PORTSDIR}/x11-toolkits/libzvt \ +LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \ 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 \ @@ -29,11 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index f471d2d24af4..954414c7cd3b 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -9,7 +9,7 @@ PORTNAME= libgnome PORTVERSION= 2.0.1 CATEGORIES?= x11 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/x11/yelp/Makefile b/x11/yelp/Makefile index b9ecaa6f23b1..74d4c2655725 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,10 +6,10 @@ # PORTNAME= yelp -PORTVERSION= 1.0 +PORTVERSION= 1.0.1 CATEGORIES= x11 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 @@ -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 \ @@ -28,13 +29,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @${PERL} -pi -e 's|\@prefix\@/share|\@datadir\@|g' \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' + @${REINPLACE_CMD} -e 's|\@prefix\@/share|\@datadir\@|g' \ ${WRKSRC}/stylesheets/docbook/catalog.in .include <bsd.port.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 334bc0fa290d..2aff136cd036 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1 +1 @@ -MD5 (gnome2/yelp-1.0.tar.bz2) = d95ab4c0b3d6c983a092466715864c86 +MD5 (gnome2/yelp-1.0.1.tar.bz2) = 6e8d1331d86d23c74a6166e16873b7d2 |