summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-09-23 17:16:45 +0000
committerwiz <wiz@pkgsrc.org>2007-09-23 17:16:45 +0000
commitd4c91cf89508a13612f0c3ffe0f46b658c83d1e0 (patch)
tree72625f2ba5323218a41fbb17492aefad33669c4e /devel
parent836524a2c64029b18bacd65d72df2bb106810db3 (diff)
downloadpkgsrc-d4c91cf89508a13612f0c3ffe0f46b658c83d1e0.tar.gz
Fix CONFLICTS pattern.
Diffstat (limited to 'devel')
-rw-r--r--devel/GConf/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index fcce77dcfcf..0fbdb04bc70 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/09/21 12:58:12 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/23 17:16:45 wiz Exp $
#
.include "../../devel/GConf/Makefile.common"
@@ -8,7 +8,7 @@ PKGREVISION= 1
CONFIGURE_ARGS+= --disable-gtk
CONFIGURE_ARGS+= ac_cv_header_ldap_h=no
-CONFLICTS+= GConf-[0-9]*
+CONFLICTS+= GConf2-[0-9]*
OWN_DIRS= ${PKG_SYSCONFDIR}/2
OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults