From 234fe4c8b3ec08c9b51bcce33895cdf0340069ab Mon Sep 17 00:00:00 2001 From: steven Date: Thu, 25 Oct 2007 10:00:03 +0000 Subject: [PATCH] make this use the python module, and switch to python 2.5 --- devel/subversion/Makefile | 27 +++--- devel/subversion/patches/patch-Makefile_in | 8 +- devel/subversion/patches/patch-configure | 4 +- devel/subversion/pkg/PFRAG.shared-python | 16 ++-- devel/subversion/pkg/PLIST-python | 98 +++++++++++----------- 5 files changed, 74 insertions(+), 79 deletions(-) diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index d47c38461c8..d902014da5e 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2007/10/08 08:22:40 steven Exp $ +# $OpenBSD: Makefile,v 1.41 2007/10/25 10:00:03 steven Exp $ COMMENT-main= subversion revision control system COMMENT-perl= perl interface to subversion @@ -11,7 +11,7 @@ DISTNAME= subversion-${VERSION} PKGNAME= ${DISTNAME} PKGNAME-main= ${DISTNAME} PKGNAME-perl= p5-SVN-${VERSION} -PKGNAME-python= py-subversion-${VERSION}p0 +PKGNAME-python= py-subversion-${VERSION}p1 PKGNAME-ruby= ruby-subversion-${VERSION}p0 PKGNAME-ap2= ap2-subversion-${VERSION} @@ -40,10 +40,6 @@ MASTER_SITES= ${HOMEPAGE}/tarballs/ PSEUDO_FLAVORS= no_bindings no_ap2 FLAVOR?= -PYTHON_VER= 2.4 - -SUBST_VARS= PYTHON_VER - MODULES= devel/gettext WANTLIB= apr-1 expat db z @@ -81,9 +77,8 @@ LIB_DEPENDS-perl+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversio . endfor WANTLIB-python= ${WANTLIB} crypto m ssl neon xml2 aprutil-1 -RUN_DEPENDS-python= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} -LIB_DEPENDS-python= python${PYTHON_VER}:python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \ - ${MODGETTEXT_LIB_DEPENDS} +RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} +LIB_DEPENDS-python= ${MODPY_LIB_DEPENDS} ${MODGETTEXT_LIB_DEPENDS} . for _lib in ${SVN_LIBS} LIB_DEPENDS-python+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main . endfor @@ -95,15 +90,14 @@ LIB_DEPENDS-ruby= ${MODGETTEXT_LIB_DEPENDS} LIB_DEPENDS-ruby+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main . endfor -MODULES+= lang/ruby -BUILD_DEPENDS+= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \ - ::devel/swig +MODULES+= lang/ruby lang/python +BUILD_DEPENDS+= ::devel/swig .endif USE_LIBTOOL= Yes SEPARATE_BUILD= simple CONFIGURE_STYLE=gnu -CONFIGURE_ENV= PYTHON2=${LOCALBASE}/bin/python${PYTHON_VER} +CONFIGURE_ENV= PYTHON2=${MODPY_BIN} CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ --with-neon=${LOCALBASE} \ --with-apr=${LOCALBASE} \ @@ -124,14 +118,15 @@ CONFIGURE_ARGS+=--with-apxs=${LOCALBASE}/sbin/apxs2 CONFIGURE_ARGS+=--without-apxs .endif -REGRESS_DEPENDS=::lang/python/${PYTHON_VER} +REGRESS_DEPENDS=::lang/python/${MODPY_VERSION} +MODPY_VERSION?= 2.5 pre-configure: @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE}," ${WRKSRC}/configure - @perl -pi -e "s,!!PYTHON_VER!!,${PYTHON_VER}," ${WRKSRC}/configure + @perl -pi -e "s,!!MODPY_VERSION!!,${MODPY_VERSION}," ${WRKSRC}/configure pre-build: - @perl -pi -e "s,!!PYTHON_VER!!,${PYTHON_VER}," ${WRKBUILD}/Makefile + @perl -pi -e "s,!!MODPY_VERSION!!,${MODPY_VERSION}," ${WRKBUILD}/Makefile .if !${FLAVOR:L:Mno_bindings} REGRESS_DEPENDS+= ::devel/p5-IO-String \ diff --git a/devel/subversion/patches/patch-Makefile_in b/devel/subversion/patches/patch-Makefile_in index d599f68e5bf..129e82d8bf9 100644 --- a/devel/subversion/patches/patch-Makefile_in +++ b/devel/subversion/patches/patch-Makefile_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-Makefile_in,v 1.6 2006/11/29 08:52:39 msf Exp $ +$OpenBSD: patch-Makefile_in,v 1.7 2007/10/25 10:00:03 steven Exp $ --- Makefile.in.orig Thu Aug 24 00:12:43 2006 +++ Makefile.in Mon Nov 20 15:31:13 2006 @@ -66,8 +66,8 @@ swig_pl_libdir = @libdir@ @@ -7,8 +7,8 @@ $OpenBSD: patch-Makefile_in,v 1.6 2006/11/29 08:52:39 msf Exp $ ### these possibly need further discussion -swig_pydir = @libdir@/svn-python/libsvn -swig_pydir_extra = @libdir@/svn-python/svn -+swig_pydir = @libdir@/python!!PYTHON_VER!!/site-packages/libsvn -+swig_pydir_extra = @libdir@/python!!PYTHON_VER!!/site-packages/svn ++swig_pydir = @libdir@/python!!MODPY_VERSION!!/site-packages/libsvn ++swig_pydir_extra = @libdir@/python!!MODPY_VERSION!!/site-packages/svn swig_pldir = @libdir@/svn-perl swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext @@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile_in,v 1.6 2006/11/29 08:52:39 msf Exp $ -SWIG_PY_LINK = @SWIG_PY_LINK@ -SWIG_PY_LIBS = @SWIG_PY_LIBS@ +SWIG_PY_LINK = @SWIG_PY_LINK@ -L@libdir@ -+SWIG_PY_LIBS = -lpython!!PYTHON_VER!! ++SWIG_PY_LIBS = -lpython!!MODPY_VERSION!! SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ diff --git a/devel/subversion/patches/patch-configure b/devel/subversion/patches/patch-configure index 7374110c596..15887cacf84 100644 --- a/devel/subversion/patches/patch-configure +++ b/devel/subversion/patches/patch-configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.8 2007/06/18 06:34:48 steven Exp $ +$OpenBSD: patch-configure,v 1.9 2007/10/25 10:00:03 steven Exp $ --- configure.orig Wed May 30 02:49:24 2007 +++ configure Mon Jun 11 08:38:35 2007 @@ -3012,7 +3012,7 @@ if test "$INSTALL" = "build/install-sh -c"; then @@ -33,7 +33,7 @@ $OpenBSD: patch-configure,v 1.8 2007/06/18 06:34:48 steven Exp $ -PYTHON="`$abs_srcdir/build/find_python.sh`" -+PYTHON="python!!PYTHON_VER!!" ++PYTHON="python!!MODPY_VERSION!!" if test -z "$PYTHON"; then { echo "$as_me:$LINENO: WARNING: Python 2.0 or later is required to run the testsuite" >&5 echo "$as_me: WARNING: Python 2.0 or later is required to run the testsuite" >&2;} diff --git a/devel/subversion/pkg/PFRAG.shared-python b/devel/subversion/pkg/PFRAG.shared-python index 1e94a76d15d..af1bcd4eb8f 100644 --- a/devel/subversion/pkg/PFRAG.shared-python +++ b/devel/subversion/pkg/PFRAG.shared-python @@ -1,9 +1,9 @@ -@comment $OpenBSD: PFRAG.shared-python,v 1.2 2006/01/07 01:10:11 steven Exp $ +@comment $OpenBSD: PFRAG.shared-python,v 1.3 2007/10/25 10:00:03 steven Exp $ @lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION} -lib/python${PYTHON_VER}/site-packages/libsvn/_client.so -lib/python${PYTHON_VER}/site-packages/libsvn/_core.so -lib/python${PYTHON_VER}/site-packages/libsvn/_delta.so -lib/python${PYTHON_VER}/site-packages/libsvn/_fs.so -lib/python${PYTHON_VER}/site-packages/libsvn/_ra.so -lib/python${PYTHON_VER}/site-packages/libsvn/_repos.so -lib/python${PYTHON_VER}/site-packages/libsvn/_wc.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_client.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_core.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.so +lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.so diff --git a/devel/subversion/pkg/PLIST-python b/devel/subversion/pkg/PLIST-python index f709a44548a..c5125e2fc37 100644 --- a/devel/subversion/pkg/PLIST-python +++ b/devel/subversion/pkg/PLIST-python @@ -1,52 +1,52 @@ -@comment $OpenBSD: PLIST-python,v 1.3 2006/12/21 08:58:04 steven Exp $ +@comment $OpenBSD: PLIST-python,v 1.4 2007/10/25 10:00:03 steven Exp $ %%SHARED%% lib/libsvn_swig_py-1.a lib/libsvn_swig_py-1.la -lib/python${PYTHON_VER}/site-packages/libsvn/ -lib/python${PYTHON_VER}/site-packages/libsvn/__init__.py -lib/python${PYTHON_VER}/site-packages/libsvn/__init__.pyc -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_client.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_client.la -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_core.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_core.la -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_delta.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_delta.la -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_fs.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_fs.la -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_ra.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_ra.la -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_repos.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_repos.la -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_wc.a -@comment lib/python${PYTHON_VER}/site-packages/libsvn/_wc.la -lib/python${PYTHON_VER}/site-packages/libsvn/client.py -lib/python${PYTHON_VER}/site-packages/libsvn/client.pyc -lib/python${PYTHON_VER}/site-packages/libsvn/core.py -lib/python${PYTHON_VER}/site-packages/libsvn/core.pyc -lib/python${PYTHON_VER}/site-packages/libsvn/delta.py -lib/python${PYTHON_VER}/site-packages/libsvn/delta.pyc -lib/python${PYTHON_VER}/site-packages/libsvn/fs.py -lib/python${PYTHON_VER}/site-packages/libsvn/fs.pyc -lib/python${PYTHON_VER}/site-packages/libsvn/ra.py -lib/python${PYTHON_VER}/site-packages/libsvn/ra.pyc -lib/python${PYTHON_VER}/site-packages/libsvn/repos.py -lib/python${PYTHON_VER}/site-packages/libsvn/repos.pyc -lib/python${PYTHON_VER}/site-packages/libsvn/wc.py -lib/python${PYTHON_VER}/site-packages/libsvn/wc.pyc -lib/python${PYTHON_VER}/site-packages/svn/ -lib/python${PYTHON_VER}/site-packages/svn/__init__.py -lib/python${PYTHON_VER}/site-packages/svn/__init__.pyc -lib/python${PYTHON_VER}/site-packages/svn/client.py -lib/python${PYTHON_VER}/site-packages/svn/client.pyc -lib/python${PYTHON_VER}/site-packages/svn/core.py -lib/python${PYTHON_VER}/site-packages/svn/core.pyc -lib/python${PYTHON_VER}/site-packages/svn/delta.py -lib/python${PYTHON_VER}/site-packages/svn/delta.pyc -lib/python${PYTHON_VER}/site-packages/svn/fs.py -lib/python${PYTHON_VER}/site-packages/svn/fs.pyc -lib/python${PYTHON_VER}/site-packages/svn/ra.py -lib/python${PYTHON_VER}/site-packages/svn/ra.pyc -lib/python${PYTHON_VER}/site-packages/svn/repos.py -lib/python${PYTHON_VER}/site-packages/svn/repos.pyc -lib/python${PYTHON_VER}/site-packages/svn/wc.py -lib/python${PYTHON_VER}/site-packages/svn/wc.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/ +lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.py +lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.pyc +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_client.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_client.la +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_core.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_core.la +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_delta.la +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_fs.la +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_ra.la +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_repos.la +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.a +@comment lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.la +lib/python${MODPY_VERSION}/site-packages/libsvn/client.py +lib/python${MODPY_VERSION}/site-packages/libsvn/client.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/core.py +lib/python${MODPY_VERSION}/site-packages/libsvn/core.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/delta.py +lib/python${MODPY_VERSION}/site-packages/libsvn/delta.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/fs.py +lib/python${MODPY_VERSION}/site-packages/libsvn/fs.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/ra.py +lib/python${MODPY_VERSION}/site-packages/libsvn/ra.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/repos.py +lib/python${MODPY_VERSION}/site-packages/libsvn/repos.pyc +lib/python${MODPY_VERSION}/site-packages/libsvn/wc.py +lib/python${MODPY_VERSION}/site-packages/libsvn/wc.pyc +lib/python${MODPY_VERSION}/site-packages/svn/ +lib/python${MODPY_VERSION}/site-packages/svn/__init__.py +lib/python${MODPY_VERSION}/site-packages/svn/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/svn/client.py +lib/python${MODPY_VERSION}/site-packages/svn/client.pyc +lib/python${MODPY_VERSION}/site-packages/svn/core.py +lib/python${MODPY_VERSION}/site-packages/svn/core.pyc +lib/python${MODPY_VERSION}/site-packages/svn/delta.py +lib/python${MODPY_VERSION}/site-packages/svn/delta.pyc +lib/python${MODPY_VERSION}/site-packages/svn/fs.py +lib/python${MODPY_VERSION}/site-packages/svn/fs.pyc +lib/python${MODPY_VERSION}/site-packages/svn/ra.py +lib/python${MODPY_VERSION}/site-packages/svn/ra.pyc +lib/python${MODPY_VERSION}/site-packages/svn/repos.py +lib/python${MODPY_VERSION}/site-packages/svn/repos.pyc +lib/python${MODPY_VERSION}/site-packages/svn/wc.py +lib/python${MODPY_VERSION}/site-packages/svn/wc.pyc