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

use the MODGCC4* variables instead of hardcoding dependencies.

Browse Source 
convert to WANT_CXX even though it might not work yet.
bump the ports that didn't even the full spec
This commit is contained in:
espie 2017-05-26 09:52:16 +00:00
parent 0747a20659
commit 7cd7125698
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/qt-creator/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2017/04/28 16:00:10 rsadowski Exp $
# $OpenBSD: Makefile,v 1.22 2017/05/26 09:52:16 espie Exp $
COMMENT = cross-platform IDE for use with Qt
V = 4.2.2
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
REVISION = 0
# TODO:
# * Verify that patch for src/shared/qbs/src/lib/corelib/tools/processutils.cpp
@ -42,22 +43,21 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += GL Qt5Concurrent Qt5Core Qt5Designer Qt5DesignerComponents
WANTLIB += Qt5Gui Qt5Help Qt5Network Qt5PrintSupport Qt5Qml Qt5Quick
WANTLIB += Qt5QuickWidgets Qt5Script Qt5Sql Qt5Svg Qt5Widgets
WANTLIB += Qt5Xml c kvm m pthread
WANTLIB += Qt5Xml c kvm m pthread ${LIBECXX}
MASTER_SITES = https://download.qt.io/official_releases/qtcreator/${V:R}/${V}/
MODULES = x11/qt5 devel/qmake gcc4
MODULES = x11/qt5 devel/qmake
MODQMAKE_INSTALL_ROOT = ${PREFIX}
# qtcreator.sh is created with custom LINK?= in Makefile
MODQT5_USE_GCC4_MODULE = No
MODGCC4_LANGS = c++
MODGCC4_ARCHS = *
WANT_CXX = base gcc
BUILD_DEPENDS = x11/qt5/qtquickcontrols
RUN_DEPENDS = devel/gdb \
devel/gmake \
lang/gcc/${MODGCC4_VERSION},-c++ \
${MODGCC4_CPPDEP} \
x11/gtk+3,-guic \
x11/qt5/qtwebkit \
x11/qt5/qtquickcontrols

13
lang/node/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.56 2017/03/24 22:23:10 abieber Exp $
# $OpenBSD: Makefile,v 1.57 2017/05/26 09:52:16 espie Exp $
# XXX:
# - Needs __ARM_NR_cacheflush (or the like) to work on arm-based ports.
@ -17,6 +17,7 @@ DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 ${DISTNAME}.tar.gz
DISTNAME = node-${NODE_VERSION}
PKGNAME = ${DISTNAME:S/v//g}
REVISION = 0
MASTER_SITES0 = https://github.com/qbit/node-pledge/archive/
@ -31,13 +32,11 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${HOMEPAGE}dist/${NODE_VERSION}/
MODULES = gcc4 \
lang/python
MODULES = lang/python
MODGCC4_LANGS = c c++
MODGCC4_ARCHS = *
WANT_CXX = base gcc
WANTLIB += c execinfo kvm m pthread util z
WANTLIB += c execinfo kvm m pthread util z ${LIBECXX}
LIB_DEPENDS = devel/libexecinfo
@ -46,7 +45,7 @@ USE_GMAKE = Yes
BUILD_DEPENDS = sysutils/flock
RUN_DEPENDS = devel/gmake \
lang/gcc/${MODGCC4_VERSION},-c++ \
${MODGCC4_CPPDEP} \
sysutils/flock
TEST_TARGET = test

13
www/chromium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.322 2017/05/11 14:34:53 robert Exp $
# $OpenBSD: Makefile,v 1.323 2017/05/26 09:52:16 espie Exp $
USE_WXNEEDED= Yes
@ -30,10 +30,9 @@ PERMIT_PACKAGE_FTP = Yes
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
MASTER_SITES0= http://nerd.hu/distfiles/
MODULES= lang/clang lang/python gcc4
MODULES= lang/python
MODCLANG_ARCHS= *
MODCLANG_LANGS= c++
WANT_CXX = base clang gcc
MODPY_RUNDEP= No
@ -48,7 +47,7 @@ WANTLIB += png pthread
WANTLIB += xml2 xslt
WANTLIB += sndio
WANTLIB += Xcomposite
WANTLIB += estdc++>=17
WANTLIB += ${LIBECXX}
WANTLIB += Xi Xtst
WANTLIB += Xdamage
WANTLIB += Xcursor Xrandr gio-2.0
@ -73,14 +72,14 @@ BUILD_DEPENDS= archivers/bzip2 \
x11/gnome/libgnome-keyring \
devel/ninja \
x11/gtk+3 \
lang/gcc/4.9,-c++>=4.9,<4.10
${MODGCC4_CPPDEP}
LIB_DEPENDS= devel/libexecinfo \
security/nss \
devel/gconf2 \
textproc/libxslt \
x11/gtk+2 \
print/cups,-libs \
lang/gcc/4.9,-libs>=4.9,<4.10
${MODGCC4_CPPLIBDEP}
.include <bsd.own.mk>

13
www/iridium/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2017/04/28 22:22:36 robert Exp $
# $OpenBSD: Makefile,v 1.61 2017/05/26 09:52:16 espie Exp $
USE_WXNEEDED= Yes
@ -30,10 +30,9 @@ PERMIT_PACKAGE_FTP = Yes
MASTER_SITES= https://downloads.iridiumbrowser.de/source/ \
http://nerd.hu/distfiles/
MODULES= lang/clang lang/python gcc4
MODULES= lang/python
MODCLANG_ARCHS= *
MODCLANG_LANGS= c++
WANT_CXX = base clang gcc
MODPY_RUNDEP= No
@ -48,7 +47,7 @@ WANTLIB += png pthread
WANTLIB += xml2 xslt
WANTLIB += sndio
WANTLIB += Xcomposite
WANTLIB += estdc++>=17
WANTLIB += ${LIBECXX}
WANTLIB += Xi Xtst
WANTLIB += Xdamage
WANTLIB += Xcursor Xrandr gio-2.0
@ -73,14 +72,14 @@ BUILD_DEPENDS= archivers/bzip2 \
x11/gnome/libgnome-keyring \
devel/ninja \
x11/gtk+3 \
lang/gcc/4.9,-c++>=4.9,<4.10
${MODGCC4_CPPDEP}
LIB_DEPENDS= devel/libexecinfo \
security/nss \
devel/gconf2 \
textproc/libxslt \
x11/gtk+2 \
print/cups,-libs \
lang/gcc/4.9,-libs>=4.9,<4.10
${MODGCC4_CPPLIBDEP}
.include <bsd.own.mk>