diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2003-12-24 20:24:20 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2003-12-24 20:24:20 +0000 |
| commit | 707d96d94ce1ff9f2ec3992135d96fe5a8a570aa (patch) | |
| tree | 45c68ec7ec179653568cf6161a08101499ac8e99 | |
| parent | - Update to version 9.4 (diff) | |
Revert the part of the previous commit that involved innocent
bystander py-orbit.
Notes
Notes:
svn path=/head/; revision=96547
| -rw-r--r-- | devel/py-omniorb/Makefile | 2 | ||||
| -rw-r--r-- | devel/py-orbit/Makefile | 2 | ||||
| -rw-r--r-- | devel/py-orbit2/Makefile | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile index ca21c5eb2d26..6222daedc960 100644 --- a/devel/py-omniorb/Makefile +++ b/devel/py-omniorb/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= omniidl:${PORTSDIR}/devel/omniORB # see also the "post-extract" target below. BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/omniORB:patch -CONFLICTS= py*-orbit-* +CONFLICTS= py*-orbit-2* CONFIGURE_WRKSRC= ${WRKSRC}/build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index 82dc1e8b8112..8baf87cb0f3f 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -18,8 +18,6 @@ COMMENT= Python bindings for ORBit, a CORBA 2.2-compliant ORB LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit -CONFLICTS= py*-omniorb* py*-orbit-2* - USE_GMAKE= yes USE_GNOME= glib12 GNU_CONFIGURE= yes diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile index 91a40f104110..a9f94c4ebada 100644 --- a/devel/py-orbit2/Makefile +++ b/devel/py-orbit2/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Python bindings for ORBit2 -CONFLICTS= py*-omniorb* py*-orbit-0* +CONFLICTS= py*-omniorb* USE_BZIP2= yes USE_GMAKE= yes |