diff options
77 files changed, 255 insertions, 235 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 62334b6a74b..c55ff0a6faf 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.72 2007/07/13 16:28:39 drochner Exp $ +# $NetBSD: Makefile,v 1.73 2007/09/19 23:13:12 wiz Exp $ # DISTNAME= file-roller-2.18.4 +PKGREVISION= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -23,7 +24,7 @@ USE_PKGLOCALEDIR= yes GCONF2_SCHEMAS= file-roller.schemas BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.10.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0 @@ -35,7 +36,7 @@ BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../devel/libglade2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common index 29dfd96ca4d..836b8c08721 100644 --- a/audio/bmp/Makefile.common +++ b/audio/bmp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2006/12/27 13:37:35 joerg Exp $ +# $NetBSD: Makefile.common,v 1.23 2007/09/19 23:13:12 wiz Exp $ # DISTNAME= bmp-0.9.7.1 @@ -53,7 +53,7 @@ PKG_SUPPORTED_OPTIONS= gnome inet6 xmms-eq CONFIGURE_ARGS+= --enable-gconf CONFIGURE_ARGS+= --enable-gnome-vfs . include "../../devel/GConf2/buildlink3.mk" -. include "../../sysutils/gnome-vfs2/buildlink3.mk" +. include "../../sysutils/gnome-vfs/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Minet6) diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile index 1015590cdc4..c002bed8a96 100644 --- a/audio/gmpc/Makefile +++ b/audio/gmpc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2007/06/05 05:37:20 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2007/09/19 23:13:12 wiz Exp $ # DISTNAME= gmpc-0.13.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= audio MASTER_SITES= http://download.qballcow.nl/programs/gmpc-0.13/ @@ -20,7 +20,7 @@ USE_DIRS+= xdg-1.1 .include "../../audio/libmpd/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index f22a39bf7ff..769bdb89bd7 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.49 2007/06/26 14:47:56 joerg Exp $ +# $NetBSD: Makefile,v 1.50 2007/09/19 23:13:12 wiz Exp $ # DISTNAME= rhythmbox-0.9.8 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/} EXTRACT_SUFX= .tar.bz2 @@ -43,7 +43,7 @@ BUILDLINK_API_DEPENDS.totem+= {totem,totem-xine}>=1.1.5 .include "../../net/libsoup-devel/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/nautilus-cd-burner/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile index 7b53923cb4b..430c2572851 100644 --- a/audio/tunesbrowser/Makefile +++ b/audio/tunesbrowser/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2007/06/05 05:37:21 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2007/09/19 23:13:13 wiz Exp $ # DISTNAME= tunesbrowser-0.3.0 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= audio MASTER_SITES= http://craz.net/programs/itunes/files/ EXTRACT_SUFX= .tar.bz2 @@ -25,7 +25,7 @@ BUILDLINK_API_DEPENDS.libopendaap+= libopendaap>=0.4.0 .include "../../audio/libopendaap/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../multimedia/gstreamer0.8/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index c641fca85c1..0c837b3ad5f 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2007/06/05 05:37:22 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2007/09/19 23:13:13 wiz Exp $ # DISTNAME= gossip-0.10.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gossip/0.10/} EXTRACT_SUFX= .tar.bz2 @@ -36,7 +36,7 @@ INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR} .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile index 32c28a2a9bb..a71a5a8fa52 100644 --- a/databases/gramps/Makefile +++ b/databases/gramps/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2007/06/15 17:12:27 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2007/09/19 23:13:13 wiz Exp $ # DISTNAME= gramps-1.0.11 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/} @@ -21,7 +21,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../graphics/py-imaging/buildlink3.mk" .include "../../textproc/py-xml/buildlink3.mk" diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile index 2e844cbf29a..69df1502253 100644 --- a/databases/gramps2/Makefile +++ b/databases/gramps2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2007/06/15 18:05:09 drochner Exp $ +# $NetBSD: Makefile,v 1.29 2007/09/19 23:13:13 wiz Exp $ # DISTNAME= gramps-2.2.8 +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gramps/} @@ -23,7 +24,7 @@ PYTHON_VERSIONS_ACCEPTED= 24 MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} GCONF2_SCHEMAS+= gramps.schemas -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../databases/py-bsddb3/buildlink3.mk" .include "../../graphics/py-imaging/buildlink3.mk" diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile index 8216b8200a6..412dd163acb 100644 --- a/devel/ArX2/Makefile +++ b/devel/ArX2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2007/06/05 05:37:24 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2007/09/19 23:13:14 wiz Exp $ # DISTNAME= ArX-2.2.4 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= devel scm MASTER_SITES= http://savannah.nongnu.org/download/arx/ @@ -40,5 +40,5 @@ do-install: cd ${WRKSRC} \ && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons install -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index 4c0b67f73a3..1e3631011e2 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.66 2007/07/06 18:26:14 drochner Exp $ +# $NetBSD: Makefile,v 1.67 2007/09/19 23:13:14 wiz Exp $ DISTNAME= eel-2.18.3 PKGNAME= ${DISTNAME:S/-/2-/} +PKGREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eel/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -18,7 +19,7 @@ GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= eel-2.0.pc.in BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.9.1 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.9.1 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.9.4 .include "../../devel/GConf2/buildlink3.mk" @@ -31,7 +32,7 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.9.4 .include "../../devel/pango/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/eel2/buildlink3.mk b/devel/eel2/buildlink3.mk index f295b73e3de..911f37d5a4f 100644 --- a/devel/eel2/buildlink3.mk +++ b/devel/eel2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2007/06/05 05:37:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2007/09/19 23:13:14 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EEL2_BUILDLINK3_MK:= ${EEL2_BUILDLINK3_MK}+ @@ -26,7 +26,7 @@ BUILDLINK_PKGSRCDIR.eel2?= ../../devel/eel2 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile index cf2a7954855..c1780ed8f1a 100644 --- a/devel/guile-gnome/Makefile +++ b/devel/guile-gnome/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2007/08/10 22:24:21 gdt Exp $ +# $NetBSD: Makefile,v 1.8 2007/09/19 23:13:14 wiz Exp $ DISTNAME= guile-gnome-platform-2.15.93 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/ @@ -34,7 +34,7 @@ INFO_FILES= YES .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile index 078369d67b4..a050836a030 100644 --- a/devel/libbonoboui/Makefile +++ b/devel/libbonoboui/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.58 2007/06/05 05:37:03 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2007/09/19 23:13:14 wiz Exp $ # DISTNAME= libbonoboui-2.18.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libbonoboui/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -35,7 +35,7 @@ BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.7 .include "../../devel/pango/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk index 8681a7e1d3a..4bff5c8b655 100644 --- a/devel/libbonoboui/buildlink3.mk +++ b/devel/libbonoboui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2007/09/19 23:13:15 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBBONOBOUI_BUILDLINK3_MK:= ${LIBBONOBOUI_BUILDLINK3_MK}+ @@ -24,7 +24,7 @@ BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui .include "../../devel/libgnome/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index 2dcdea2bbc0..ebf45e073cd 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.65 2007/06/05 05:37:05 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2007/09/19 23:13:15 wiz Exp $ # DISTNAME= libgnome-2.18.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnome/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -66,7 +66,7 @@ BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.13.0 .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index 710c49ce5c0..6be5e5aed75 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2007/09/19 23:13:16 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+ @@ -23,7 +23,7 @@ BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index 316bf7cccb1..31a7c335c37 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2007/06/05 05:37:10 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:17 wiz Exp $ # DISTNAME= libgnomeui-2.18.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomeui/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -50,7 +50,7 @@ post-configure: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index b9beb54c98f..eecd556843a 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2007/09/08 08:14:27 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2007/09/19 23:13:17 wiz Exp $ # DISTNAME= libgsf-1.14.7 +PKGREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgsf/1.14/} EXTRACT_SUFX= .tar.bz2 @@ -31,7 +32,7 @@ GCONF2_SCHEMAS= gsf-office-thumbnailer.schemas .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk index b65317117af..21e9183e9a0 100644 --- a/devel/libgsf/buildlink3.mk +++ b/devel/libgsf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2007/09/19 23:13:17 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGSF_BUILDLINK3_MK:= ${LIBGSF_BUILDLINK3_MK}+ @@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.libgsf?= ../../devel/libgsf .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile index bbeb9bbb4fb..c12c0209c28 100644 --- a/editors/dasher/Makefile +++ b/editors/dasher/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2007/07/17 10:29:54 drochner Exp $ +# $NetBSD: Makefile,v 1.43 2007/09/19 23:13:18 wiz Exp $ DISTNAME= dasher-4.4.2 +PKGREVISION= 1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dasher/4.4/} EXTRACT_SUFX= .tar.bz2 @@ -49,7 +50,7 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0 .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index edceeb25f6e..9566e2c26f8 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2007/07/13 16:35:14 drochner Exp $ +# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:18 wiz Exp $ # DISTNAME= gedit-2.18.2 +PKGREVISION= 1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gedit/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -32,7 +33,7 @@ BUILDLINK_API_DEPENDS.gtksourceview+= gtksourceview>=1.8.0 BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.6.0 BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.12.1 BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.16.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.16.0 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.16.0 .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -43,7 +44,7 @@ BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.16.0 .include "../../net/ORBit2/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile index b211a1aeae1..10d2cde0ab2 100644 --- a/editors/gtranslator/Makefile +++ b/editors/gtranslator/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2007/06/05 05:37:25 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2007/09/19 23:13:18 wiz Exp $ DISTNAME= gtranslator-1.1.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtranslator/1.1/} @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --disable-debug .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index ef600134079..e074c54a265 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2007/07/13 16:24:35 drochner Exp $ +# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:19 wiz Exp $ # DISTNAME= eog-2.18.2 +PKGREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/eog/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -38,7 +39,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gnome-desktop/buildlink3.mk" diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index 5717715846d..9e7c8c04961 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2007/09/03 16:11:06 drochner Exp $ +# $NetBSD: Makefile,v 1.34 2007/09/19 23:13:19 wiz Exp $ DISTNAME= gthumb-2.10.6 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gthumb/2.10/} @@ -35,7 +36,7 @@ BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../net/ORBit2/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 3a2c27e3f44..c6f3bd8941f 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2007/06/05 05:37:28 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2007/09/19 23:13:20 wiz Exp $ DISTNAME= inkscape-0.45.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} @@ -38,7 +38,7 @@ UNLIMIT_RESOURCES= datasize .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index fd6e5b241d5..83778538fc3 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.62 2007/08/30 15:57:10 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2007/09/19 23:13:20 wiz Exp $ DISTNAME= librsvg-2.18.2 PKGNAME= ${DISTNAME:S/-/2-/} +PKGREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/librsvg/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -46,7 +47,7 @@ post-install: .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.1 -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libcroco/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/modules.mk" diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index aff96f665aa..ee08786d877 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2007/06/05 05:37:29 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2007/09/19 23:13:20 wiz Exp $ DISTNAME= balsa-2.3.10 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= mail gnome MASTER_SITES= http://balsa.gnome.org/ \ ftp://ftp.newton.cx/pub/balsa/ @@ -52,7 +52,7 @@ BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.9 .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../www/gtkhtml38/buildlink3.mk" diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile index ff7f32207cd..26e1f566b33 100644 --- a/mail/evolution-data-server/Makefile +++ b/mail/evolution-data-server/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2007/07/06 18:36:44 drochner Exp $ +# $NetBSD: Makefile,v 1.57 2007/09/19 23:13:21 wiz Exp $ # DISTNAME= evolution-data-server-1.10.3.1 +PKGREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/1.10/} EXTRACT_SUFX= .tar.bz2 @@ -77,7 +78,7 @@ BUILDLINK_TRANSFORM+= rm:-ldl .include "../../lang/python/application.mk" .include "../../net/libsoup-devel/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 7d80f2af60e..83dd8c6f12e 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.121 2007/06/05 05:37:09 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2007/09/19 23:13:21 wiz Exp $ DISTNAME= evolution-2.10.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail time gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.10/} EXTRACT_SUFX= .tar.bz2 @@ -132,7 +132,7 @@ LDFLAGS+= -lsemaphore .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index 218292245cc..a570f14f3f6 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2007/06/05 05:37:29 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2007/09/19 23:13:22 wiz Exp $ # DISTNAME= mail-notification-4.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= mail gnome MASTER_SITES= http://savannah.nongnu.org/download/mailnotify/ @@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --disable-ssl .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mail/gmime/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile index 3a3ba701885..c6ff5dc1550 100644 --- a/meta-pkgs/gnome-base/Makefile +++ b/meta-pkgs/gnome-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/04/17 17:48:47 drochner Exp $ +# $NetBSD: Makefile,v 1.38 2007/09/19 23:13:22 wiz Exp $ DISTNAME= gnome-base-2.18.1 CATEGORIES= meta-pkgs x11 gnome @@ -35,9 +35,9 @@ DEPENDS+= GConf2-ui>=2.18.0:../../devel/GConf2-ui DEPENDS+= libbonobo>=2.18.0:../../devel/libbonobo DEPENDS+= libaudiofile>=0.2.6:../../audio/libaudiofile DEPENDS+= esound>=0.2.36:../../audio/esound -DEPENDS+= gnome-vfs2>=2.18.1:../../sysutils/gnome-vfs2 -DEPENDS+= gnome-vfs2-cdda>=2.18.1:../../audio/gnome-vfs2-cdda -DEPENDS+= gnome-vfs2-smb>=2.18.1:../../net/gnome-vfs2-smb +DEPENDS+= gnome-vfs>=2.18.1:../../sysutils/gnome-vfs +DEPENDS+= gnome-vfs-cdda>=2.18.1:../../audio/gnome-vfs-cdda +DEPENDS+= gnome-vfs-smb>=2.18.1:../../net/gnome-vfs-smb DEPENDS+= libgnome>=2.18.0:../../devel/libgnome DEPENDS+= libglade2>=2.6.0:../../devel/libglade2 DEPENDS+= libart2>=2.3.17:../../graphics/libart2 diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile index ffa17d19482..883c499235c 100644 --- a/misc/gnome2-utils/Makefile +++ b/misc/gnome2-utils/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.67 2007/06/05 05:37:30 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2007/09/19 23:13:23 wiz Exp $ # DISTNAME= gnome-utils-2.18.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-utils/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -29,7 +29,7 @@ GCONF2_SCHEMAS+= logview.schemas BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1 BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.13.4 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.4 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0 BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.2 BUILDLINK_API_DEPENDS.libgnomecanvas+= libgnomecanvas>=2.10.2 @@ -48,7 +48,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libgtop2/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile index ec2bbc0526f..c3c02cbb8c3 100644 --- a/misc/yelp/Makefile +++ b/misc/yelp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2007/07/17 10:17:11 drochner Exp $ +# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:24 wiz Exp $ # DISTNAME= yelp-2.18.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -50,7 +50,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../print/libgnomeprint/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile index 5a96c3a260e..07519abd0f4 100644 --- a/multimedia/gnome2-media/Makefile +++ b/multimedia/gnome2-media/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2007/06/10 08:52:30 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2007/09/19 23:13:26 wiz Exp $ DISTNAME= gnome-media-2.18.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-media/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -53,7 +53,7 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common index 10123fa3411..8b7785bf74c 100644 --- a/multimedia/totem/Makefile.common +++ b/multimedia/totem/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2007/06/15 18:47:22 drochner Exp $ +# $NetBSD: Makefile.common,v 1.32 2007/09/19 23:13:26 wiz Exp $ # DISTNAME= totem-2.18.2 @@ -28,7 +28,7 @@ GCONF2_SCHEMAS+= totem-video-thumbnail.schemas BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0 BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.2 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.2 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 .include "../../devel/GConf2/schemas.mk" @@ -39,7 +39,7 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk index 8934743a52b..8709ed7b1d7 100644 --- a/multimedia/totem/buildlink3.mk +++ b/multimedia/totem/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/06/26 14:47:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2007/09/19 23:13:26 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TOTEM_BUILDLINK3_MK:= ${TOTEM_BUILDLINK3_MK}+ @@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.totem?= {totem,totem-xine}>=2.18.1nb1 BUILDLINK_PKGSRCDIR.totem?= ../../multimedia/totem .endif # TOTEM_BUILDLINK3_MK -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile index 74f14350b75..7013fec8871 100644 --- a/net/bug-buddy/Makefile +++ b/net/bug-buddy/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2007/06/05 05:37:31 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2007/09/19 23:13:26 wiz Exp $ # DISTNAME= bug-buddy-2.18.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/bug-buddy/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -37,7 +37,7 @@ BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.96 .include "../../net/libsoup-devel/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libgtop2/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common index 81f754a6e0e..68c75320904 100644 --- a/print/evince/Makefile.common +++ b/print/evince/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2007/07/06 18:04:24 drochner Exp $ +# $NetBSD: Makefile.common,v 1.16 2007/09/19 23:13:26 wiz Exp $ # DISTNAME= evince-0.8.3 @@ -38,7 +38,7 @@ BUILDLINK_API_DEPENDS.poppler-glib+= poppler-glib>=0.5.3 .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../print/poppler-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile index dfd94b2205e..170f26f3b85 100644 --- a/security/seahorse-gedit/Makefile +++ b/security/seahorse-gedit/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2007/06/05 05:37:35 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/09/19 23:13:27 wiz Exp $ DISTNAME= seahorse-1.0.1 PKGNAME= seahorse-gedit-1.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/} EXTRACT_SUFX= .tar.bz2 @@ -41,7 +41,7 @@ INSTALL_DIRS= plugins/gedit .include "../../security/seahorse/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../editors/gedit/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile index 38b836d2ad0..94ab02f7eb0 100644 --- a/security/seahorse-nautilus/Makefile +++ b/security/seahorse-nautilus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2007/06/05 05:37:35 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2007/09/19 23:13:27 wiz Exp $ DISTNAME= seahorse-1.0.1 PKGNAME= seahorse-nautilus-1.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/} EXTRACT_SUFX= .tar.bz2 @@ -35,7 +35,7 @@ INSTALL_DIRS= plugins/nautilus-ext .include "../../net/libsoup-devel/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 815b9604f3a..8b43517301c 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2007/08/18 13:19:56 obache Exp $ +# $NetBSD: Makefile,v 1.66 2007/09/19 23:13:27 wiz Exp $ DISTNAME= seahorse-1.0.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNOME:=sources/seahorse/1.0/} EXTRACT_SUFX= .tar.bz2 @@ -48,7 +48,7 @@ BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2 .include "../../net/libsoup-devel/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk index 2c2d9f26503..c18cb46ac97 100644 --- a/security/seahorse/buildlink3.mk +++ b/security/seahorse/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2007/06/05 05:37:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2007/09/19 23:13:27 wiz Exp $ # XXX # XXX This file was created automatically using createbuildlink-3.10. # XXX After this file has been verified as correct, the comment lines @@ -38,7 +38,7 @@ BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse #.include "../../devel/libgnomeui/buildlink3.mk" #.include "../../net/libsoup-devel/buildlink3.mk" #.include "../../security/gpgme/buildlink3.mk" -#.include "../../sysutils/gnome-vfs2/buildlink3.mk" +#.include "../../sysutils/gnome-vfs/buildlink3.mk" #.include "../../x11/gtk2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile index 1a1cc28d204..eaff6b60bf8 100644 --- a/sysutils/gnome-menus/Makefile +++ b/sysutils/gnome-menus/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2007/07/12 19:30:36 drochner Exp $ +# $NetBSD: Makefile,v 1.31 2007/09/19 23:13:28 wiz Exp $ # DISTNAME= gnome-menus-2.18.3 +PKGREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -39,10 +40,10 @@ SUBST_SED.paths= -e 's|/usr/|${PREFIX}/|g' SUBST_SED.paths+= -e 's|/etc/X11/applnk|${PREFIX}/share/kde/applnk/|g' BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.10.0 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk index e4e7d23baf3..cdaf040a9bb 100644 --- a/sysutils/gnome-menus/buildlink3.mk +++ b/sysutils/gnome-menus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/06/05 05:37:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2007/09/19 23:13:28 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_MENUS_BUILDLINK3_MK:= ${GNOME_MENUS_BUILDLINK3_MK}+ @@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.gnome-menus?= ../../sysutils/gnome-menus .endif # GNOME_MENUS_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index f3a12e0b581..b4f86502c33 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2007/06/05 05:37:35 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:28 wiz Exp $ # DISTNAME= gnome-pkgview-1.0.6 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= sysutils gnome MASTER_SITES= http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/ @@ -21,7 +21,7 @@ GCONF2_SCHEMAS= gnome-pkgview.schemas .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile index c9683fd0dd3..e66fb15c66a 100644 --- a/sysutils/gnome-vfs-monikers/Makefile +++ b/sysutils/gnome-vfs-monikers/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2007/06/05 05:37:36 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2007/09/19 23:13:28 wiz Exp $ # DISTNAME= gnome-vfs-monikers-2.15.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs-monikers/2.15/} EXTRACT_SUFX= .tar.bz2 @@ -15,6 +15,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= intltool pkg-config gmake -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index c5d65df6d47..49c621c4b2d 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,10 +1,9 @@ -# $NetBSD: Makefile.common,v 1.44 2007/04/29 13:09:27 tnn Exp $ +# $NetBSD: Makefile.common,v 1.45 2007/09/19 23:13:28 wiz Exp $ # -GNOME_VFS2_VERSION= 2.18.1 +GNOME_VFS_VERSION= 2.18.1 -DISTNAME= gnome-vfs-${GNOME_VFS2_VERSION} -PKGNAME= ${DISTNAME:S/vfs/vfs2/} +DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} CATEGORIES?= sysutils CATEGORIES+= gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.18/} @@ -14,8 +13,8 @@ MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME Virtual File System (v2) -DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs2/distinfo -PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs2/patches +DISTINFO_FILE= ${.CURDIR}/../../sysutils/gnome-vfs/distinfo +PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs/patches GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES @@ -59,43 +58,45 @@ post-wrapper: # # The following stuff is to allow easy building of modules distributed within -# gnome-vfs2 as independent packages. +# gnome-vfs as independent packages. # -# GNOME_VFS2_NAME - Name of the module beeing built. Will be added to the +# GNOME_VFS_NAME - Name of the module beeing built. Will be added to the # package name, and also used as the library name. -# GNOME_VFS2_FLAG - Base name of the flag passed to configure to enable the +# GNOME_VFS_FLAG - Base name of the flag passed to configure to enable the # module. # -.if defined(GNOME_VFS2_NAME) && !empty(GNOME_VFS2_NAME) -GNOME_VFS2_FLAG?= ${GNOME_VFS2_NAME} +.if defined(GNOME_VFS_NAME) && !empty(GNOME_VFS_NAME) +GNOME_VFS_FLAG?= ${GNOME_VFS_NAME} -PKGNAME:= ${PKGNAME:S/gnome-vfs2/gnome-vfs2-${GNOME_VFS2_NAME}/} -CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS2_FLAG}/--enable-${GNOME_VFS2_FLAG}/} -COMMENT+= - ${GNOME_VFS2_NAME} plugin +PKGNAME:= ${PKGNAME:S/gnome-vfs/gnome-vfs-${GNOME_VFS_NAME}/} +CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/} +COMMENT+= - ${GNOME_VFS_NAME} plugin -BUILD_TARGET= lib${GNOME_VFS2_NAME}.la +CONFLICTS+= gnome-vfs2-[0-9]* + +BUILD_TARGET= lib${GNOME_VFS_NAME}.la BUILD_DIRS= ${WRKSRC}/modules -# Fix paths to already installed libraries (by the gnome-vfs2 package). +# Fix paths to already installed libraries (by the gnome-vfs package). SUBST_CLASSES+= libs SUBST_MESSAGE.libs= Fixing path to dependent libraries. SUBST_STAGE.libs= pre-configure SUBST_FILES.libs= modules/Makefile.in -SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g' +SUBST_SED.libs= -e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs}/lib/libgnomevfs-2.la|g' -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=${GNOME_VFS2_VERSION} -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=${GNOME_VFS_VERSION} +.include "../../sysutils/gnome-vfs/buildlink3.mk" PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \ - { print "@comment in gnome-vfs2: " $$0; next; } + { print "@comment in gnome-vfs: " $$0; next; } PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; } PRINT_PLIST_AWK+= /^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \ - { print "@comment in gnome-vfs2: " $$0; next; } + { print "@comment in gnome-vfs: " $$0; next; } do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/gnome-vfs-2.0/modules cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \ - ${INSTALL_DATA} lib${GNOME_VFS2_NAME}.la \ + ${INSTALL_DATA} lib${GNOME_VFS_NAME}.la \ ${PREFIX}/lib/gnome-vfs-2.0/modules cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \ ${PREFIX}/lib/gnome-vfs-2.0/modules diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk index 071ec44b5fa..af7ad5481f2 100644 --- a/sysutils/gnome-vfs2/buildlink3.mk +++ b/sysutils/gnome-vfs2/buildlink3.mk @@ -1,24 +1,24 @@ -# $NetBSD: buildlink3.mk,v 1.28 2007/06/05 05:36:59 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2007/09/19 23:13:29 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+ +GNOME_VFS_BUILDLINK3_MK:= ${GNOME_VFS_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-vfs2 +BUILDLINK_DEPENDS+= gnome-vfs .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs2} -BUILDLINK_PACKAGES+= gnome-vfs2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs2 +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-vfs} +BUILDLINK_PACKAGES+= gnome-vfs +BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs -.if !empty(GNOME_VFS2_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.0 -BUILDLINK_ABI_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.18.1nb2 -BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 +.if !empty(GNOME_VFS_BUILDLINK3_MK:M+) +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.8.0 +BUILDLINK_ABI_DEPENDS.gnome-vfs+= gnome-vfs>=2.18.1nb2 +BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs PRINT_PLIST_AWK+= /^@dirrm lib\/gnome-vfs-2.0\/modules/ \ - { print "@comment in gnome-vfs2: " $$0; next; } -.endif # GNOME_VFS2_BUILDLINK3_MK + { print "@comment in gnome-vfs: " $$0; next; } +.endif # GNOME_VFS_BUILDLINK3_MK .include "../../devel/GConf2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile index de2a87e5aa1..1d79f3c1915 100644 --- a/sysutils/gnome-vfsmm/Makefile +++ b/sysutils/gnome-vfsmm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2007/06/05 05:37:06 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2007/09/19 23:13:30 wiz Exp $ DISTNAME= gnome-vfsmm-2.18.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfsmm/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -18,5 +18,5 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomevfs/gnome-vfsmm-2.6.pc.in GNU_CONFIGURE= yes .include "../../devel/glibmm/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk index 67229536764..03299c1bb19 100644 --- a/sysutils/gnome-vfsmm/buildlink3.mk +++ b/sysutils/gnome-vfsmm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2007/06/05 05:37:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2007/09/19 23:13:30 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_VFSMM_BUILDLINK3_MK:= ${GNOME_VFSMM_BUILDLINK3_MK}+ @@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.gnome-vfsmm?= ../../sysutils/gnome-vfsmm .endif # GNOME_VFSMM_BUILDLINK3_MK .include "../../devel/glibmm/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile index bcdce185e10..3eda4d2a5ab 100644 --- a/sysutils/gnome2-system-monitor/Makefile +++ b/sysutils/gnome2-system-monitor/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.45 2007/06/05 05:37:36 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2007/09/19 23:13:30 wiz Exp $ # DISTNAME= gnome-system-monitor-2.15.92 PKGNAME= ${DISTNAME:S/gnome/gnome2/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.15/} EXTRACT_SUFX= .tar.bz2 @@ -36,7 +36,7 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libgtop2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile index f9a363a4b2b..09c8074a135 100644 --- a/sysutils/gst-plugins0.10-gnomevfs/Makefile +++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/06/08 12:58:45 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2007/09/19 23:13:30 wiz Exp $ # GST_PLUGINS0.10_NAME= gnomevfs @@ -6,6 +6,7 @@ GST_PLUGINS0.10_DIRS= ext/gnomevfs GST_PLUGINS0.10_FLAGS= gnome_vfs .include "../../multimedia/gst-plugins0.10-base/Makefile.common" +PKGREVISION= 1 -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gst-plugins0.8-gnomevfs/Makefile b/sysutils/gst-plugins0.8-gnomevfs/Makefile index 628ad7d16cd..c0de6beee56 100644 --- a/sysutils/gst-plugins0.8-gnomevfs/Makefile +++ b/sysutils/gst-plugins0.8-gnomevfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/06/05 05:37:36 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2007/09/19 23:13:30 wiz Exp $ # GST_PLUGINS0.8_NAME= gnomevfs @@ -6,7 +6,7 @@ GST_PLUGINS0.8_DIR= ext/gnomevfs GST_PLUGINS0.8_FLAG= gnome_vfs .include "../../multimedia/gst-plugins0.8/Makefile.common" -PKGREVISION= 7 +PKGREVISION= 8 -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 3462d9fe525..bb89b6a39c1 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2007/06/05 05:37:19 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2007/09/19 23:13:31 wiz Exp $ # DISTNAME= nautilus-cd-burner-2.14.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/} EXTRACT_SUFX= .tar.bz2 @@ -49,7 +49,7 @@ BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.13.4 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index 9edb50e0a85..fdd22bdbd43 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.80 2007/07/13 17:25:52 drochner Exp $ +# $NetBSD: Makefile,v 1.81 2007/09/19 23:13:31 wiz Exp $ # DISTNAME= nautilus-2.18.3 +PKGREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -24,7 +25,7 @@ GCONF2_SCHEMAS= apps_nautilus_preferences.schemas BUILDLINK_API_DEPENDS.eel2+= eel2>=2.15.91 BUILDLINK_API_DEPENDS.esound+= esound>=0.2.27 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.14.2 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.14.2 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8 @@ -46,7 +47,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index ccc0d92ec57..9d88eccf619 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2007/06/05 05:37:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2007/09/19 23:13:31 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NAUTILUS_BUILDLINK3_MK:= ${NAUTILUS_BUILDLINK3_MK}+ @@ -36,7 +36,7 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/nautilus\/extensions-1.0$$/ \ .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile index 09ba49e2abd..206a800e711 100644 --- a/sysutils/rox/Makefile +++ b/sysutils/rox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.40 2007/06/05 05:37:36 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2007/09/19 23:13:31 wiz Exp $ # DISTNAME= rox-2.4.1 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/} EXTRACT_SUFX= .tgz @@ -63,7 +63,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../databases/shared-mime-info/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile index d6559c4ae8c..417061d05b4 100644 --- a/time/gnotime/Makefile +++ b/time/gnotime/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2007/06/05 05:37:37 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2007/09/19 23:13:32 wiz Exp $ DISTNAME= gnotime-2.2.1 -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= time gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gttr/} @@ -27,7 +27,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../www/gtkhtml38/buildlink3.mk" diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile index 5c7ebd6dbb5..b38a1cbfd6e 100644 --- a/time/gtodo/Makefile +++ b/time/gtodo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2007/06/05 05:37:37 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2007/09/19 23:13:32 wiz Exp $ # DISTNAME= gtodo-0.14 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= time gnome MASTER_SITES= http://download.qballcow.nl/programs/gtodo/ @@ -20,7 +20,7 @@ GCONF2_SCHEMAS= gtodo.schemas .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/planner/Makefile b/time/planner/Makefile index 6712fc748b6..89fd5b2a699 100644 --- a/time/planner/Makefile +++ b/time/planner/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2007/06/09 08:01:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2007/09/19 23:13:32 wiz Exp $ # DISTNAME= planner-0.14.2 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/planner/0.14/} EXTRACT_SUFX= .tar.bz2 @@ -31,7 +32,7 @@ GCONF2_SCHEMAS= planner.schemas .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 96fc6a13456..895e0053b17 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2007/06/05 05:37:37 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:32 wiz Exp $ DISTNAME= bluefish-1.0.7 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= http://bluefish.mrball.net/stable/source/ \ ftp://ftp.ratisbona.com/pub/bluefish/stable/source/ \ @@ -31,7 +31,7 @@ CONFIGURE_ENV+= EXTERNAL_FIND=${TOOLS_FIND:Q} .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/www/drivel/Makefile b/www/drivel/Makefile index 49e5f689071..7ca484dff8c 100644 --- a/www/drivel/Makefile +++ b/www/drivel/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2007/06/05 05:37:38 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2007/09/19 23:13:33 wiz Exp $ # DISTNAME= drivel-2.0.3 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=drivel/} EXTRACT_SUFX= .tar.bz2 @@ -32,7 +32,7 @@ BUILDLINK_API_DEPENDS.curl+= curl>=7.14.0nb1 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gtkspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 89462b1445d..6d3982a5ef5 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2007/07/13 17:30:35 drochner Exp $ +# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:33 wiz Exp $ # DISTNAME= epiphany-2.18.3 +PKGREVISION= 1 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -27,7 +28,7 @@ GCONF2_SCHEMAS+= epiphany-lockdown.schemas GCONF2_SCHEMAS+= epiphany-pango.schemas BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.10.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.14.0 BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0 @@ -47,7 +48,7 @@ BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12 .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/iso-codes/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk index e458b15ee64..14bacafcd89 100644 --- a/www/epiphany/buildlink3.mk +++ b/www/epiphany/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2007/06/05 05:37:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2007/09/19 23:13:34 wiz Exp $ # # This Makefile fragment is included by packages that use epiphany. # @@ -26,7 +26,7 @@ BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" # XXX: should pull in ../../www/seamonkey/gecko-depends.mk diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index bfb65a01640..b5a9fe54c7b 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2007/06/05 05:37:06 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2007/09/19 23:13:34 wiz Exp $ # DISTNAME= libgtkhtml-2.6.3 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= www devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/} EXTRACT_SUFX= .tar.bz2 @@ -20,7 +20,7 @@ USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in .include "../../devel/gail/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk index 4c8fffe5f42..e2e06ceb49e 100644 --- a/www/libgtkhtml/buildlink3.mk +++ b/www/libgtkhtml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2007/06/05 05:37:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2007/09/19 23:13:34 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGTKHTML_BUILDLINK3_MK:= ${LIBGTKHTML_BUILDLINK3_MK}+ @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml .endif # LIBGTKHTML_BUILDLINK3_MK .include "../../devel/gail/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 59c49378c3b..53c676cba5b 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2007/07/12 19:38:18 drochner Exp $ +# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:34 wiz Exp $ # DISTNAME= gnome-desktop-2.18.3 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-desktop/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -30,7 +31,7 @@ post-install: .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk index e7ea96f4649..c66f2da6052 100644 --- a/x11/gnome-desktop/buildlink3.mk +++ b/x11/gnome-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2007/06/05 05:37:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2007/09/19 23:13:35 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_DESKTOP_BUILDLINK3_MK:= ${GNOME_DESKTOP_BUILDLINK3_MK}+ @@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.gnome-desktop?= ../../x11/gnome-desktop .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 6aa2491a737..d97b20b357b 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.88 2007/07/12 19:41:57 drochner Exp $ +# $NetBSD: Makefile,v 1.89 2007/09/19 23:13:35 wiz Exp $ # DISTNAME= gnome-panel-2.18.3 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -30,7 +31,7 @@ GCONF2_SCHEMAS+= workspace-switcher.schemas GCONF2_SCHEMAS+= window-list.schemas GCONF2_ENTRIES= panel-default-setup.entries -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.14.2 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.14.2 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.5.0 BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0 @@ -60,7 +61,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../net/ORBit2/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gnome-desktop/buildlink3.mk" diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk index 55278277ea1..8eb94560fc3 100644 --- a/x11/gnome-panel/buildlink3.mk +++ b/x11/gnome-panel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2007/06/05 05:37:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2007/09/19 23:13:35 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+ @@ -27,7 +27,7 @@ BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gnome-desktop/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 343b45bf608..57f36fa8333 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2007/07/15 21:44:41 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:36 wiz Exp $ # DISTNAME= gnome-screensaver-2.18.2 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.18/} @@ -70,7 +71,7 @@ post-install: .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index cbbb44719d0..1923783501e 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.79 2007/06/05 05:37:39 wiz Exp $ +# $NetBSD: Makefile,v 1.80 2007/09/19 23:13:36 wiz Exp $ # DISTNAME= gnome-applets-2.18.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -79,7 +79,7 @@ BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0 BUILDLINK_API_DEPENDS.gstreamer0.10+= gstreamer0.10>=0.10.2 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.2 BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.16.0 -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.16.0 +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.16.0 BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.13.4 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 @@ -100,7 +100,7 @@ PYTHON_PATCH_SCRIPTS+= invest-applet/invest/invest-chart .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/libgtop2/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 562ad336b15..b4f880a2c56 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.80 2007/07/25 18:02:32 rillig Exp $ +# $NetBSD: Makefile,v 1.81 2007/09/19 23:13:36 wiz Exp $ # DISTNAME= control-center-2.18.1 PKGNAME= gnome2-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -73,7 +73,7 @@ BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk index ebba02541cd..4cdd535f74a 100644 --- a/x11/gnome2-control-center/buildlink3.mk +++ b/x11/gnome2-control-center/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2007/06/05 05:37:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2007/09/19 23:13:37 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNOME2_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+ @@ -25,7 +25,7 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../wm/metacity/buildlink3.mk" diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index 12e13328797..60441a040eb 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.67 2007/07/06 18:44:10 drochner Exp $ +# $NetBSD: Makefile,v 1.68 2007/09/19 23:13:37 wiz Exp $ # DISTNAME= gnome-terminal-2.18.1 PKGNAME= ${DISTNAME:S/-/2-/} +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -28,7 +29,7 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/gtk2-sharp/Makefile b/x11/gtk2-sharp/Makefile index 56c12753576..17631c89928 100644 --- a/x11/gtk2-sharp/Makefile +++ b/x11/gtk2-sharp/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2007/06/05 05:37:40 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2007/09/19 23:13:37 wiz Exp $ # DISTNAME= gtk-sharp-2.8.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://go-mono.com/sources/gtk-sharp-2.8/ @@ -42,7 +42,7 @@ substpcprefix: .include "../../x11/gtk2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 32c10bde83b..4dda517eacd 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2007/09/03 09:51:55 drochner Exp $ +# $NetBSD: Makefile,v 1.47 2007/09/19 23:13:38 wiz Exp $ # DISTNAME= gnome-python-2.18.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 python MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-python/2.18/} EXTRACT_SUFX= .tar.bz2 @@ -34,8 +34,8 @@ BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.11.1 .include "../../graphics/libgnomecanvas/buildlink3.mk" BUILDLINK_API_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1 .include "../../net/py-ORBit/buildlink3.mk" -BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.9.3 -.include "../../sysutils/gnome-vfs2/buildlink3.mk" +BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.9.3 +.include "../../sysutils/gnome-vfs/buildlink3.mk" BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.6.2 .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" |