diff options
| author | marcus <marcus@FreeBSD.org> | 2004-01-30 11:29:15 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-01-30 11:29:15 +0800 |
| commit | b884c54d1fab9fb82ef905c29b2c3c512276f88a (patch) | |
| tree | 3744a164d61c1682e96f5d38f3ad87d47ff8fae7 /x11-toolkits | |
| parent | 108ea9bcc693b43c186caa614b0b829b560fe4ba (diff) | |
| download | freebsd-ports-gnome-b884c54d1fab9fb82ef905c29b2c3c512276f88a.tar.gz freebsd-ports-gnome-b884c54d1fab9fb82ef905c29b2c3c512276f88a.tar.zst freebsd-ports-gnome-b884c54d1fab9fb82ef905c29b2c3c512276f88a.zip | |
Add CONFLICTS from py-gtk2 and py-gtk to each other.
Reported by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/py-gtk/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-gtk2/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-gtk2/pkg-install | 16 |
3 files changed, 4 insertions, 16 deletions
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile index 543fe6fc1d7d..b37eaa9f8286 100644 --- a/x11-toolkits/py-gtk/Makefile +++ b/x11-toolkits/py-gtk/Makefile @@ -33,6 +33,8 @@ 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* + .if !defined(NOPORTDOCS) post-install: ${MKDIR} ${EG_DST_DIR} diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile index 3de788e93d5b..0a83317ecc33 100644 --- a/x11-toolkits/py-gtk2/Makefile +++ b/x11-toolkits/py-gtk2/Makefile @@ -28,6 +28,8 @@ USE_LIBTOOL= yes EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gtk +CONFLICTS= py*-gtk-0* + # # Use the same way as the Python port to determine if we want # threading support. diff --git a/x11-toolkits/py-gtk2/pkg-install b/x11-toolkits/py-gtk2/pkg-install deleted file mode 100644 index a26468bf3372..000000000000 --- a/x11-toolkits/py-gtk2/pkg-install +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -if [ -n "${PACKAGE_BUILDING}" ]; then - exit 0 -fi - -PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} -export PATH - -if [ "$2" = "PRE-INSTALL" ]; then - if pkg_info | grep "^py-gtk-[0-9]"; then - echo "py-gtk for GTK+ 1.x was detected." - echo "This packages cannot coexist with py-gtk." - false - fi -fi |