diff options
| -rw-r--r-- | x11-toolkits/py-gnome/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome2/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome2/pkg-install | 16 |
3 files changed, 4 insertions, 16 deletions
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile index 19876329b364..dd26c9efe9f6 100644 --- a/x11-toolkits/py-gnome/Makefile +++ b/x11-toolkits/py-gnome/Makefile @@ -33,6 +33,8 @@ CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ EG_SRC_DIR= ${WRKSRC}/pygnome/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gnome +CONFLICTS= py*-gnome-2* + .if !defined(NOPORTDOCS) post-install: ${MKDIR} ${EG_DST_DIR} diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index 6005d04884b9..3740e5aacda7 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -33,6 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ EG_SRC_DIR= ${WRKSRC}/examples EG_DST_DIR= ${PREFIX}/share/examples/py-gnome +CONFLICTS= py*-gnome-1* + .if !defined(PACKAGE_BUILDING) pre-build: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/x11-toolkits/py-gnome2/pkg-install b/x11-toolkits/py-gnome2/pkg-install deleted file mode 100644 index 128d42c2f686..000000000000 --- a/x11-toolkits/py-gnome2/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-gnome-1\.4\.[0-9]"; then - echo "py-gnome for GTK+ 1.x was detected." - echo "This packages cannot coexist with py-gnome." - false - fi -fi |