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

Use MODPY_DEFAULT_VERSION_3 via SUBST_VARS and SUBST_CMD in

Browse Source 
patch-configure, so that this builds fine with python 3.6 instead of
hardcoding 3.4.
This commit is contained in:
landry 2017-01-03 19:30:57 +00:00
parent 4e4c86ee1e
commit f3bb4a5219
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.154 2016/12/26 19:04:31 robert Exp $
# $OpenBSD: Makefile,v 1.155 2017/01/03 19:30:57 landry Exp $
USE_WXNEEDED= Yes
@ -19,6 +19,7 @@ PKGNAME-kde= libreoffice-kde-${VERSION}
PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel tag:kde4
REVISION= 0
EPOCH= 0
@ -364,7 +365,7 @@ OA= x86
OA= x86_64
.endif
SUBST_VARS+= BV OA
SUBST_VARS+= BV OA MODPY_DEFAULT_VERSION_3
pre-patch:
@ln -fs /bin/md5 ${WRKDIR}/bin/md5sum
@ -374,6 +375,9 @@ pre-patch:
@ln -fs /usr/local/bin/gtouch ${WRKDIR}/bin/touch
touch ${WRKSRC}/src.downloaded ${WRKSRC}/autogen.lastrun
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/soffice.sh ${PREFIX}/bin/soffice
${SUBST_CMD} ${PREFIX}/bin/soffice

8
editors/libreoffice/patches/patch-configure
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert Exp $
$OpenBSD: patch-configure,v 1.17 2017/01/03 19:30:58 landry Exp $
--- configure.orig.port Mon Oct 31 15:43:29 2016
+++ configure Mon Oct 31 15:46:17 2016
@@ -1,4 +1,4 @@
@ -38,7 +38,7 @@ $OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert Exp $
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3.4 python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python${MODPY_DEFAULT_VERSION_3} python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@ -47,7 +47,7 @@ $OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert Exp $
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3.4 python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python${MODPY_DEFAULT_VERSION_3} python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
@ -56,7 +56,7 @@ $OpenBSD: patch-configure,v 1.16 2016/11/02 14:33:47 robert Exp $
else
- for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python3.4 python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
+ for am_cv_pathless_PYTHON in python${MODPY_DEFAULT_VERSION_3} python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
test "$am_cv_pathless_PYTHON" = none && break
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros