summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-01-17 03:40:30 +0000
committermarcus <marcus@FreeBSD.org>2006-01-17 03:40:30 +0000
commit462bd8585f917f09c40064dc6b9f2d47c1bd4ef1 (patch)
treee809fed1d59b2eead621d31766e2e9a104532458
parentd19e026ca4db8f4aa6adca26e3eb3952a724a674 (diff)
downloadFreeBSD-ports-462bd8585f917f09c40064dc6b9f2d47c1bd4ef1.zip
FreeBSD-ports-462bd8585f917f09c40064dc6b9f2d47c1bd4ef1.tar.gz
Add CONFLICTS on py-gobject.
-rw-r--r--x11-toolkits/py-gtk/Makefile2
-rw-r--r--x11-toolkits/py-gtk2/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 6b31288..a53d469 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gtk
-CONFLICTS= py*-gtk-2*
+CONFLICTS= py*-gtk-2* py*-gobject-[0-9]*
.if !defined(NOPORTDOCS)
post-install:
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 8452d99..5fef4bf 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -35,7 +35,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
EG_SRC_DIR= ${WRKSRC}/examples
EG_DST_DIR= ${PREFIX}/share/examples/py-gtk
-CONFLICTS= py*-gtk-0*
+CONFLICTS= py*-gtk-0* py*-gobject-[0-9]*
#
# Use the same way as the Python port to determine if we want
OpenPOWER on IntegriCloud