cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subversion: build both py2 and py3 bindings. note that unlike many py-* ports

Browse Source 
they conflict due to the /usr/local/lib/libsvn_swig_py-1 files being present in
both. ok stsp@
This commit is contained in:
sthen 2020-05-31 19:29:32 +00:00
parent 9b530bf287
commit 7eefa654e1
5 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1980 2020/05/31 19:01:19 kili Exp $
# $OpenBSD: Makefile,v 1.1981 2020/05/31 19:29:32 sthen Exp $
SUBDIR =
SUBDIR += 64tass
@ -1928,6 +1928,7 @@
SUBDIR += stm32loader
SUBDIR += stp
SUBDIR += subversion
SUBDIR += subversion,python3
SUBDIR += swig
SUBDIR += t1lib
SUBDIR += tbb

28
devel/subversion/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.180 2020/05/28 12:25:27 stsp Exp $
# $OpenBSD: Makefile,v 1.181 2020/05/31 19:29:32 sthen Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@ -8,12 +8,13 @@ COMMENT-ap2= apache2 subversion modules
COMMENT-gnome-keyring= GNOME keyring support for subversion
VERSION= 1.14.0
REVISION= 0
DISTNAME= subversion-${VERSION:S/rc/-rc/}
PKGNAME-main= subversion-${VERSION}
FULLPKGNAME-main= subversion-${VERSION}${FLAVOR_EXT:S/-python3//}
FULLPKGPATH-main= devel/subversion,-main${FLAVOR_EXT:S/-python3//:S/-/,/g}
FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl
FULLPKGNAME-python= py-subversion-${VERSION}
FULLPKGPATH-python= devel/subversion,-python
FULLPKGNAME-ruby= ruby${MODRUBY_BINREV}-subversion-${VERSION}
FULLPKGPATH-ruby= devel/subversion,-ruby
FULLPKGNAME-ap2= ap2-subversion-${VERSION}
@ -25,10 +26,6 @@ MODRUBY_REV ?= 2.7
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
MODRUBY_BINREV= ${MODRUBY_REV:S/.//}
# Subversion supports either python2 or python3 bindings. Consumers in the
# ports tree are not yet ready for python3. So keep using python 2.7 for now.
MODPY_VERSION ?= 2.7
SO_VERSION= 6.0
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_fs_x-1 \
@ -57,12 +54,24 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=subversion/}
EXTRACT_SUFX= .tar.bz2
PSEUDO_FLAVORS= no_bindings no_ap2 no_perl no_python no_ruby no_gnome-keyring
FLAVORS= maintainer_mode
FLAVORS= maintainer_mode python3
FLAVOR?=
.if ${FLAVOR:Mno_bindings}
FLAVOR += no_perl no_python no_ruby
.endif
.if ${FLAVOR:Mpython3}
FULLPKGNAME-python= py3-subversion-${VERSION}
FULLPKGPATH-python= devel/subversion,python3,-python
# py-subversion and py3-subversion both install libsvn_swig_py-1;
# conflict with the other flavour
PY_CONFLICT= py-subversion-*
.else
FULLPKGNAME-python= py-subversion-${VERSION}
FULLPKGPATH-python= devel/subversion,-python
PY_CONFLICT= py3-subversion-*
.endif
MODULES= lang/python
WANTLIB= expat iconv intl lz4 m pthread z
@ -196,7 +205,8 @@ CONFIGURE_ARGS+=--without-gnome-keyring
TEST_DEPENDS=${MODPY_RUN_DEPENDS}
TEST_DEPENDS+= ${FULLPKGNAME-gnome-keyring}:${BUILD_PKGPATH},-gnome-keyring
SUBST_VARS+= LOCALBASE SO_VERSION MODRUBY_BINREV LIBsvn_swig_ruby-1_VERSION
SUBST_VARS+= LOCALBASE SO_VERSION MODRUBY_BINREV
SUBST_VARS+= LIBsvn_swig_ruby-1_VERSION MODPY_WANTLIB PY_CONFLICT
pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python

4
devel/subversion/patches/patch-Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_in,v 1.19 2020/05/28 12:25:27 stsp Exp $
$OpenBSD: patch-Makefile_in,v 1.20 2020/05/31 19:29:32 sthen Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@ -24,7 +24,7 @@ Index: Makefile.in
-SWIG_PY_LINK = @SWIG_PY_LINK@
-SWIG_PY_LIBS = @SWIG_PY_LIBS@
+SWIG_PY_LINK = @SWIG_PY_LINK@ -L@libdir@
+SWIG_PY_LIBS = -lpython${MODPY_VERSION}
+SWIG_PY_LIBS = -l${MODPY_WANTLIB}
SWIG_PY_ERRMSG = @SWIG_PY_ERRMSG@
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
SWIG_PL_ERRMSG = @SWIG_PL_ERRMSG@

4
devel/subversion/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.22 2020/05/15 14:47:40 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.23 2020/05/31 19:29:32 sthen Exp $
@conflict subversion-*-gnome_keyring
@pkgpath devel/subversion,no_bindings
@pkgpath devel/subversion,-main,gnome_keyring
@ -122,8 +122,6 @@ lib/libsvn_subr-1.la
@static-lib lib/libsvn_wc-1.a
lib/libsvn_wc-1.la
@lib lib/libsvn_wc-1.so.${LIBsvn_wc-1_VERSION}
@comment lib/python${MODPY_VERSION}/
@comment lib/python${MODPY_VERSION}/site-packages/
@man man/man1/svn.1
@man man/man1/svnadmin.1
@man man/man1/svndumpfilter.1

47
devel/subversion/pkg/PLIST-python
View File

@ -1,11 +1,21 @@
@comment $OpenBSD: PLIST-python,v 1.11 2020/05/15 14:47:40 ajacoutot Exp $
@comment $OpenBSD: PLIST-python,v 1.12 2020/05/31 19:29:32 sthen Exp $
@conflict ${PY_CONFLICT}
@pkgpath devel/subversion,-python,gnome_keyring
@static-lib lib/libsvn_swig_${MODPY_PY_PREFIX}1.a
lib/libsvn_swig_${MODPY_PY_PREFIX}1.la
@lib lib/libsvn_swig_${MODPY_PY_PREFIX}1.so.${LIBsvn_swig_${MODPY_PY_PREFIX}1_VERSION}
@static-lib lib/libsvn_swig_py-1.a
lib/libsvn_swig_py-1.la
@lib lib/libsvn_swig_py-1.so.${LIBsvn_swig_py-1_VERSION}
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
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}ra.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}repos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/${MODPY_PYCACHE}wc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/libsvn/_client.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_client.la
@so lib/python${MODPY_VERSION}/site-packages/libsvn/_client.so
@ -31,37 +41,30 @@ lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.a
lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.la
@so lib/python${MODPY_VERSION}/site-packages/libsvn/_wc.so
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/diff.py
lib/python${MODPY_VERSION}/site-packages/libsvn/diff.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
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}diff.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}ra.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}repos.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/svn/${MODPY_PYCACHE}wc.${MODPY_PYC_MAGIC_TAG}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/diff.py
lib/python${MODPY_VERSION}/site-packages/svn/diff.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