diff options
author | drochner <drochner@pkgsrc.org> | 2007-10-31 19:58:13 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2007-10-31 19:58:13 +0000 |
commit | 48d21b185c1e79532e9c14db1ccbccc646514521 (patch) | |
tree | 35641d0369005c02514205f0178ee23430150da4 | |
parent | 6f1ed76f7e93585e809f6a65895550a6328a48e6 (diff) | |
download | pkgsrc-48d21b185c1e79532e9c14db1ccbccc646514521.tar.gz |
update to 2.20.0
This switches to the new gnome-2.20 branch.
Also fix the CONFLICTS handling resulting from the recent rename.
-rw-r--r-- | sysutils/gnome-vfs/Makefile | 5 | ||||
-rw-r--r-- | sysutils/gnome-vfs/Makefile.common | 8 | ||||
-rw-r--r-- | sysutils/gnome-vfs/PLIST | 4 | ||||
-rw-r--r-- | sysutils/gnome-vfs/distinfo | 8 |
4 files changed, 14 insertions, 11 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index ffe88a19865..8f037d6fbbb 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.64 2007/10/31 02:16:03 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2007/10/31 19:58:13 drochner Exp $ -PKGREVISION= 3 PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in @@ -25,7 +24,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-fam -ONFLICTS+= gnome-vfs2-[0-9]* +CONFLICTS+= gnome-vfs2-[0-9]* .include "../../devel/GConf/schemas.mk" diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index 97a6f754099..cc4832ae0e6 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -1,12 +1,12 @@ -# $NetBSD: Makefile.common,v 1.5 2007/10/31 02:16:03 wiz Exp $ +# $NetBSD: Makefile.common,v 1.6 2007/10/31 19:58:13 drochner Exp $ # -GNOME_VFS_VERSION= 2.18.1 +GNOME_VFS_VERSION= 2.20.0 DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} CATEGORIES?= sysutils CATEGORIES+= gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.18/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.20/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -82,6 +82,8 @@ PKGNAME:= ${DISTNAME: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 +CONFLICTS+= ${DISTNAME:S/gnome-vfs/gnome-vfs2-${GNOME_VFS_NAME}/} + BUILD_TARGET= lib${GNOME_VFS_NAME}.la BUILD_DIRS= modules diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST index 94cffe71318..12c2aad6809 100644 --- a/sysutils/gnome-vfs/PLIST +++ b/sysutils/gnome-vfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2007/09/25 10:54:18 hira Exp $ +@comment $NetBSD: PLIST,v 1.18 2007/10/31 19:58:13 drochner Exp $ bin/gnomevfs-cat bin/gnomevfs-copy bin/gnomevfs-df @@ -198,6 +198,7 @@ share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/nso/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/oc/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/or/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo @@ -214,6 +215,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/te/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo index 75d29562396..0acf1f50319 100644 --- a/sysutils/gnome-vfs/distinfo +++ b/sysutils/gnome-vfs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.20 2007/09/19 22:22:36 wiz Exp $ +$NetBSD: distinfo,v 1.21 2007/10/31 19:58:13 drochner Exp $ -SHA1 (gnome-vfs-2.18.1.tar.bz2) = e939fe4fe2e75516ae6c4d476f8fb44f59ec8bdc -RMD160 (gnome-vfs-2.18.1.tar.bz2) = ff2fc7a7c47b85a03d65964a8ad1d7d585698f3d -Size (gnome-vfs-2.18.1.tar.bz2) = 1916897 bytes +SHA1 (gnome-vfs-2.20.0.tar.bz2) = 3ce1959b820f420f67e18e6f9da7bc9a87dd4349 +RMD160 (gnome-vfs-2.20.0.tar.bz2) = 880e1c1afcb0c22131adfad4e5a5aa3605c136bb +Size (gnome-vfs-2.20.0.tar.bz2) = 1918358 bytes SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5 SHA1 (patch-ae) = 05b28610539d22491b8694ef3850b77be47c7c6c |