diff options
author | marcus <marcus@FreeBSD.org> | 2004-08-26 02:38:39 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-08-26 02:38:39 +0800 |
commit | 878be031020de81b058020391917b16a8dc9a4b8 (patch) | |
tree | 571d672ba0e303265826841918710f9e74f23955 /devel | |
parent | b6e2df68849262aa9f4e1abb95cab8e2fed93e2f (diff) | |
download | freebsd-ports-gnome-878be031020de81b058020391917b16a8dc9a4b8.tar.gz freebsd-ports-gnome-878be031020de81b058020391917b16a8dc9a4b8.tar.zst freebsd-ports-gnome-878be031020de81b058020391917b16a8dc9a4b8.zip |
* Correct the ORBIT_CONFIG [1]
* Use the new libtool scheme
* Make CONFLICTS for portlint friendly
PR: 69484 [1]
Diffstat (limited to 'devel')
-rw-r--r-- | devel/py-orbit2/Makefile | 7 | ||||
-rw-r--r-- | devel/py-orbit2/files/patch-configure | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile index d2e948c9bcfc..9554b0b0fe26 100644 --- a/devel/py-orbit2/Makefile +++ b/devel/py-orbit2/Makefile @@ -6,7 +6,7 @@ PORTNAME= orbit PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/pyorbit/2.0 @@ -17,12 +17,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Python bindings for ORBit2 -CONFLICTS= py*-omniorb* +CONFLICTS= py*-omniorb-[0-9]* USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack orbit2 USE_PYTHON= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 +ORBIT_CONFIG= ${LOCALBASE}/bin/orbit2-config .include <bsd.port.mk> diff --git a/devel/py-orbit2/files/patch-configure b/devel/py-orbit2/files/patch-configure deleted file mode 100644 index 1a4d7b938e7b..000000000000 --- a/devel/py-orbit2/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Sun Mar 23 23:40:57 2003 -+++ configure Sun Mar 23 23:41:17 2003 -@@ -7821,6 +7821,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' |