Hi ports --
Planned on updating these with veusz. Didn't need to, but was already
down the rabbit hole so figured I might as well finish.
math/veusz works with these updates. Build tested all dependent ports OK
on amd64.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 8 Nov 2013 22:37:16 -0000 1.27
+++ Makefile 18 Sep 2014 04:10:16 -0000
@@ -6,7 +6,7 @@ SHARED_ONLY= Yes
COMMENT= automatically generate Python bindings for C and C++ libs
-DISTNAME= sip-4.15.3
+DISTNAME= sip-4.16.3
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
@@ -29,9 +29,11 @@ CONFIGURE_ARGS= -b ${PREFIX}/bin \
-v ${PREFIX}/share/sip \
INCDIR=${LOCALBASE}/include \
LIBDIR=${LOCALBASE}/lib \
- CC=${CC} CXX=${CXX} \
+ CC="${CC}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}"
+
+MAKE_FLAGS= LINK="${CXX}"
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 8 Nov 2013 22:37:16 -0000 1.13
+++ distinfo 18 Sep 2014 04:10:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-4.15.3.tar.gz) = RvJFJShm29t/tayhlL2pkcyEuoCQ1ehkdl7n5RGgU9Q=
-SIZE (sip-4.15.3.tar.gz) = 773818
+SHA256 (sip-4.16.3.tar.gz) = /YplaTYS8dDF3NQYgc2SSW13CzueA6E45TPjr8iS9CE=
+SIZE (sip-4.16.3.tar.gz) = 794305
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 8 Nov 2013 22:37:17 -0000 1.5
+++ pkg/PLIST 18 Sep 2014 04:10:16 -0000
@@ -9,7 +9,6 @@ lib/python${MODPY_VERSION}/site-packages
share/doc/${MODPY_PY_PREFIX}sip/
share/doc/${MODPY_PY_PREFIX}sip/annotations.txt
share/doc/${MODPY_PY_PREFIX}sip/build_system.txt
-share/doc/${MODPY_PY_PREFIX}sip/builtin.txt
share/doc/${MODPY_PY_PREFIX}sip/c_api.txt
share/doc/${MODPY_PY_PREFIX}sip/command_line.txt
share/doc/${MODPY_PY_PREFIX}sip/directives.txt
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt4/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 8 Nov 2013 22:37:43 -0000 1.41
+++ Makefile 18 Sep 2014 17:44:22 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT-main= python Qt4 bindings
COMMENT-docs= py-qt4 documentation
-V= 4.10.3
+V= 4.11.2
DISTNAME= PyQt-x11-gpl-${V}
PKGNAME= py-qt4-${V}
PKGNAME-main= py-qt4-${V}
@@ -59,10 +59,11 @@ CONFIGURE_ARGS= --verbose \
INCDIR_QT=${MODQT_INCDIR} \
LIBDIR="${X11BASE}/lib ${LOCALBASE}/lib" \
LIBDIR_QT=${MODQT_LIBDIR} \
- CC=${CC} \
- CXX=${CXX} \
+ CC="${CC}" \
+ CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}"
+MAKE_FLAGS= CC="${CC}" CXX="${CXX}" LINK="${CXX}"
FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt4/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 8 Nov 2013 22:37:43 -0000 1.16
+++ distinfo 18 Sep 2014 17:44:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt-x11-gpl-4.10.3.tar.gz) = pxO+vvOUITssnh/gytVpm4adw1a7pQdm4GkBPrqL9jA=
-SIZE (PyQt-x11-gpl-4.10.3.tar.gz) = 11187362
+SHA256 (PyQt-x11-gpl-4.11.2.tar.gz) = Bd/EBg0l+B5dRfsCCtWdIa99xMAazk0rN/O0lJPQP24=
+SIZE (PyQt-x11-gpl-4.11.2.tar.gz) = 11120742
Index: patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/x11/py-qt4/patches/patch-configure_py,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure_py
--- patches/patch-configure_py 8 Nov 2013 22:37:43 -0000 1.12
+++ patches/patch-configure_py 18 Sep 2014 17:44:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_py,v 1.12 2013/11/08 22:37:43 sthen Exp $
---- configure.py.orig Wed Aug 21 06:50:47 2013
-+++ configure.py Fri Nov 8 08:58:17 2013
-@@ -1159,6 +1159,17 @@ def run_command(cmd, envvars=None):
+--- configure.py.orig Thu Sep 11 13:36:11 2014
++++ configure.py Thu Sep 18 00:03:25 2014
+@@ -1164,6 +1164,17 @@ def run_command(cmd, envvars=None):
cmd is the command to run.
"""
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure_py,v 1.12 2013
if opts.verbose:
sys.stdout.write(cmd + "\n")
-@@ -1841,7 +1852,7 @@ Type 'no' to decline the terms of the license.
+@@ -1778,7 +1789,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/x11/py-qt4/pkg/PLIST-docs,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-docs
--- pkg/PLIST-docs 8 Nov 2013 22:37:43 -0000 1.10
+++ pkg/PLIST-docs 18 Sep 2014 17:44:22 -0000
@@ -477,7 +477,7 @@ share/doc/${MODPY_PY_PREFIX}qt4/html/pho
share/doc/${MODPY_PY_PREFIX}qt4/html/phonon-volumeslider.html
share/doc/${MODPY_PY_PREFIX}qt4/html/phonon.html
share/doc/${MODPY_PY_PREFIX}qt4/html/pickle.html
-share/doc/${MODPY_PY_PREFIX}qt4/html/py-modindex.html
+share/doc/${MODPY_PY_PREFIX}qt4/html/${MODPY_PY_PREFIX}modindex.html
share/doc/${MODPY_PY_PREFIX}qt4/html/pyqt_qsettings.html
share/doc/${MODPY_PY_PREFIX}qt4/html/pyqt_qvariant.html
share/doc/${MODPY_PY_PREFIX}qt4/html/python_shell.html
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/py-qt4/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- pkg/PLIST-main 8 Nov 2013 22:37:43 -0000 1.15
+++ pkg/PLIST-main 18 Sep 2014 17:44:22 -0000
@@ -262,6 +262,7 @@ share/sip/QtDesigner/qpydesignertaskmenu
share/sip/QtDesigner/taskmenu.sip
share/sip/QtGui/
share/sip/QtGui/QtGuimod.sip
+share/sip/QtGui/opengl_types.sip
share/sip/QtGui/qabstractbutton.sip
share/sip/QtGui/qabstractitemdelegate.sip
share/sip/QtGui/qabstractitemview.sip
@@ -523,7 +524,6 @@ share/sip/QtNetwork/qudpsocket.sip
share/sip/QtNetwork/qurlinfo.sip
share/sip/QtOpenGL/
share/sip/QtOpenGL/QtOpenGLmod.sip
-share/sip/QtOpenGL/opengl_types.sip
share/sip/QtOpenGL/qgl.sip
share/sip/QtOpenGL/qglbuffer.sip
share/sip/QtOpenGL/qglcolormap.sip
