diff options
| author | marcus <marcus@FreeBSD.org> | 2004-01-30 11:31:01 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-01-30 11:31:01 +0800 |
| commit | 889768c56adff1cce1dbd66de82d5553a5ef5779 (patch) | |
| tree | 1a1ff44de90e070c4ed0db9643810743e3f6c0b7 /x11-toolkits/py-gnome2 | |
| parent | b884c54d1fab9fb82ef905c29b2c3c512276f88a (diff) | |
| download | freebsd-ports-gnome-889768c56adff1cce1dbd66de82d5553a5ef5779.tar.gz freebsd-ports-gnome-889768c56adff1cce1dbd66de82d5553a5ef5779.tar.zst freebsd-ports-gnome-889768c56adff1cce1dbd66de82d5553a5ef5779.zip | |
Add CONFLICTS for py-gnome and py-gnome2 on each other.
Reported by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Diffstat (limited to 'x11-toolkits/py-gnome2')
| -rw-r--r-- | x11-toolkits/py-gnome2/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome2/pkg-install | 16 |
2 files changed, 2 insertions, 16 deletions
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 |