diff options
| author | wiz <wiz@pkgsrc.org> | 2007-10-31 02:16:03 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-10-31 02:16:03 +0000 |
| commit | 5bc1930781d9f356e8594d06c9c081944414b587 (patch) | |
| tree | ae8e5259d65082f20fdc7439fa425a1adb4dd51a /sysutils | |
| parent | 3868e2ba1703f7648e38bdefbf91799d7e64b9be (diff) | |
| download | pkgsrc-5bc1930781d9f356e8594d06c9c081944414b587.tar.gz | |
Move CONFLICTS line to correct place.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-vfs/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/gnome-vfs/Makefile.common | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 224277d47c6..ffe88a19865 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:18 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2007/10/31 02:16:03 wiz Exp $ PKGREVISION= 3 PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in @@ -25,6 +25,8 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --enable-fam +ONFLICTS+= gnome-vfs2-[0-9]* + .include "../../devel/GConf/schemas.mk" .include "../../archivers/bzip2/buildlink3.mk" diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common index 6905c5ad3e6..97a6f754099 100644 --- a/sysutils/gnome-vfs/Makefile.common +++ b/sysutils/gnome-vfs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2007/10/13 13:13:16 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.5 2007/10/31 02:16:03 wiz Exp $ # GNOME_VFS_VERSION= 2.18.1 @@ -82,8 +82,6 @@ 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+= gnome-vfs2-[0-9]* - BUILD_TARGET= lib${GNOME_VFS_NAME}.la BUILD_DIRS= modules |