diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 49800875923..90b29ef186d 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.45 2016/08/03 05:47:09 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.46 2016/12/25 14:34:39 zhuk Exp $ COMMENT= free open source planetarium DISTNAME= stellarium-0.15.0 +REVISION= 0 CATEGORIES= astro x11 @@ -22,6 +23,12 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stellarium/} MODULES= devel/cmake \ x11/qt5 +LIB_DEPENDS= x11/qt5/qtdeclarative \ + x11/qt5/qtmultimedia \ + x11/qt5/qtscript \ + x11/qt5/qtserialport \ + x11/qt5/qtxmlpatterns + # used to download more stars definitions RUN_DEPENDS= net/curl \ devel/desktop-file-utils \ diff --git a/audio/mscore/Makefile b/audio/mscore/Makefile index 9a2695fa949..8b37daf476a 100644 --- a/audio/mscore/Makefile +++ b/audio/mscore/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2016/06/30 08:28:42 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.28 2016/12/25 14:34:39 zhuk Exp $ BROKEN-hppa = ICE on moc_qtsingleapplication.cxx BROKEN-powerpc = libmscore/pitchspelling.h:56:42: error: enumerator value -1 is too large for underlying type 'char' @@ -9,7 +9,7 @@ DISTNAME = MuseScore-${V} PKGNAME = musescore-${V} EXTRACT_SUFX = .zip CATEGORIES = audio x11 -REVISION = 0 +REVISION = 1 HOMEPAGE = http://musescore.org/ @@ -31,7 +31,12 @@ BUILD_DEPENDS = audio/lame \ misc/findutils LIB_DEPENDS = audio/portaudio-svn \ - audio/libsndfile>=1.0.25p0 + audio/libsndfile>=1.0.25p0 \ + x11/qt5/qtdeclarative \ + x11/qt5/qtsvg \ + x11/qt5/qttools \ + x11/qt5/qtwebkit \ + x11/qt5/qtxmlpatterns RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile index 5c08c13ac02..ca68dc4c5b1 100644 --- a/databases/pgmodeler/Makefile +++ b/databases/pgmodeler/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2016/06/20 09:45:38 feinerer Exp $ +# $OpenBSD: Makefile,v 1.2 2016/12/25 14:34:39 zhuk Exp $ COMMENT = PostgreSQL Database Modeler VERSION = 0.8.2 DISTNAME = pgmodeler-${VERSION} +REVISION = 0 GH_ACCOUNT = pgmodeler GH_PROJECT = pgmodeler @@ -30,23 +31,36 @@ WANTLIB += Qt5Widgets X11 Xext c execinfo m pq pthread xml2 MODULES = devel/qmake \ x11/qt5 -MODQMAKE_PROJECTS = pgmodeler.pro +MODQMAKE_PROJECTS = pgmodeler.pro tests/tests.pro MODQMAKE_ARGS = DOCDIR=${PREFIX}/share/doc/pgmodeler \ NO_UPDATE_CHECK=1 \ PREFIX=${PREFIX} \ SAMPLESDIR=${PREFIX}/share/examples/pgmodeler -LIB_DEPENDS = databases/postgresql +LIB_DEPENDS = databases/postgresql \ + x11/qt5/qtsvg SEPARATE_BUILD = No USE_GMAKE = Yes -NO_TEST = Yes - post-patch: sed -i -e 's/linux/unix/' \ -e 's/^ BUILDNUM=.*/ BUILDNUM=${VERSION}/' ${WRKSRC}/pgmodeler.pri post-install: - mkdir ${PREFIX}/lib/pgmodeler/plugins + rm -Rf ${PREFIX}/bin/tests + ${INSTALL_DATA_DIR} ${PREFIX}/lib/pgmodeler/plugins + +do-test: + cd ${WRKBUILD}; \ + for d in lib*/; do \ + LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$${LD_LIBRARY_PATH}:}$$PWD/$${d%/}; \ + done; \ + export LD_LIBRARY_PATH; \ + ln -sf ../../../schemas tests/src/databasemodeltest/schemas; \ + okay=true; \ + for t in ${WRKBUILD}/tests/src/*test; do \ + (cd $$t; ./*test) || okay=false; \ + done; \ + $$okay .include diff --git a/devel/libqtelegram-aseman-edition/Makefile b/devel/libqtelegram-aseman-edition/Makefile index 4aff21a6221..c19ef01c8f3 100644 --- a/devel/libqtelegram-aseman-edition/Makefile +++ b/devel/libqtelegram-aseman-edition/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/26 20:37:35 zhuk Exp $ +# $OpenBSD: Makefile,v 1.7 2016/12/25 14:34:39 zhuk Exp $ V = 4.1 COMMENT = Qt5 library for Telegram messaging service DISTNAME = ${GH_PROJECT}-${V} CATEGORIES = devel -REVISION = 0 +REVISION = 1 SHARED_LIBS += qtelegram-ae 1.0 # 2.0 @@ -20,6 +20,8 @@ WANTLIB += pthread ssl z MODULES = devel/qmake x11/qt5 +LIB_DEPENDS = x11/qt5/qtmultimedia + NO_TEST = Yes post-configure: diff --git a/devel/zeal/Makefile b/devel/zeal/Makefile index 6dcb6d9309e..e7d1fa0f4fc 100644 --- a/devel/zeal/Makefile +++ b/devel/zeal/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2016/04/18 16:57:04 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2016/12/25 14:34:39 zhuk Exp $ COMMENT = simple offline API documentation browser GH_ACCOUNT = zealdocs GH_PROJECT = zeal GH_TAGNAME = v0.2.1 -REVISION = 0 +REVISION = 1 CATEGORIES = devel @@ -22,7 +22,9 @@ WANTLIB += xcb-keysyms MODULES = devel/qmake x11/qt5 RUN_DEPENDS = devel/desktop-file-utils x11/gtk+3,-guic -LIB_DEPENDS = archivers/libarchive +LIB_DEPENDS = archivers/libarchive \ + x11/qt5/qtwebkit \ + x11/qt5/qtx11extras NO_TEST = Yes diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile index 1e5909f7778..c9d97b5354e 100644 --- a/emulators/mgba/Makefile +++ b/emulators/mgba/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2016/10/06 06:25:31 bentley Exp $ +# $OpenBSD: Makefile,v 1.13 2016/12/25 14:34:39 zhuk Exp $ COMMENT-main = Game Boy Color/Advance emulator COMMENT-qt = Game Boy Color/Advance emulator with GUI @@ -9,6 +9,7 @@ DISTNAME = mgba-$V PKGNAME-main = mgba-$V PKGNAME-qt = mgba-qt-$V PKGNAME-libretro = libretro-mgba-$V +REVISION-qt = 0 MULTI_PACKAGES = -main -qt -libretro @@ -47,7 +48,8 @@ LIB_DEPENDS-main = archivers/libzip \ devel/sdl2 LIB_DEPENDS-qt = ${LIB_DEPENDS-main} \ ${MODQT_LIB_DEPENDS} \ - emulators/mgba,-main + emulators/mgba,-main \ + x11/qt5/qtmultimedia LIB_DEPENDS-libretro = RUN_DEPENDS-qt = devel/desktop-file-utils \ x11/gtk+3,-guic diff --git a/games/dustrac/Makefile b/games/dustrac/Makefile index 96b83962f3a..8bd5374bfda 100644 --- a/games/dustrac/Makefile +++ b/games/dustrac/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.6 2015/12/24 12:52:56 bentley Exp $ +# $OpenBSD: Makefile,v 1.7 2016/12/25 14:34:39 zhuk Exp $ COMMENT = traditional top-down car racing game V = 1.11.0 DISTNAME = dustrac-$V -REVISION = 0 +REVISION = 1 CATEGORIES = games @@ -19,14 +19,12 @@ WANTLIB += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets Qt5Xml MASTER_SITES = https://github.com/juzzlin/DustRacing2D/releases/download/$V/ MODULES = devel/cmake \ - gcc4 \ x11/qt5 -MODGCC4_ARCHS = * -MODGCC4_LANGS = c c++ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic -LIB_DEPENDS = audio/openal +LIB_DEPENDS = audio/libvorbis \ + audio/openal CONFIGURE_ARGS += -DReleaseBuild=ON \ -DDATA_PATH=${PREFIX}/share/dustrac \ diff --git a/games/gottcode/connectagram/Makefile b/games/gottcode/connectagram/Makefile index cac85273204..54de69076c3 100644 --- a/games/gottcode/connectagram/Makefile +++ b/games/gottcode/connectagram/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2015/05/28 10:17:23 pascal Exp $ +# $OpenBSD: Makefile,v 1.6 2016/12/25 14:34:39 zhuk Exp $ GAME = connectagram COMMENT = word unscrambling game DISTNAME = ${GAME}-1.2.1-src QT5 = Yes WANTLIB += Qt5Network -REVISION = 0 +REVISION = 1 .include diff --git a/games/gottcode/peg-e/Makefile b/games/gottcode/peg-e/Makefile index cb69a068791..3aff84cc5a3 100644 --- a/games/gottcode/peg-e/Makefile +++ b/games/gottcode/peg-e/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2015/06/08 06:42:14 czarkoff Exp $ +# $OpenBSD: Makefile,v 1.7 2016/12/25 14:34:39 zhuk Exp $ GAME = peg-e COMMENT = basic peg solitaire game DISTNAME = ${GAME}-1.2.1-src QT5=Yes -REVISION = 1 +REVISION = 2 .include diff --git a/games/gottcode/simsu/Makefile b/games/gottcode/simsu/Makefile index 92b8fad3aeb..fbcdc9819e8 100644 --- a/games/gottcode/simsu/Makefile +++ b/games/gottcode/simsu/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2016/02/01 07:50:13 benoit Exp $ +# $OpenBSD: Makefile,v 1.7 2016/12/25 14:34:39 zhuk Exp $ GAME = simsu COMMENT = basic sudoku game DISTNAME = ${GAME}-1.3.2-src +REVISION = 0 QT5 = Yes diff --git a/games/gottcode/tanglet/Makefile b/games/gottcode/tanglet/Makefile index 462e23ea530..f6136851bce 100644 --- a/games/gottcode/tanglet/Makefile +++ b/games/gottcode/tanglet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/05/28 10:17:23 pascal Exp $ +# $OpenBSD: Makefile,v 1.7 2016/12/25 14:34:39 zhuk Exp $ GAME = tanglet COMMENT = word finding game @@ -6,7 +6,7 @@ DISTNAME = ${GAME}-1.3.1-src WANTLIB += z QT5 = Yes -REVISION = 2 +REVISION = 3 post-install: mv ${PREFIX}/share/man/man6/${GAME}.6 ${PREFIX}/man/man6 diff --git a/games/pentobi/Makefile b/games/pentobi/Makefile index 4e252e7536a..7a7d14c4c19 100644 --- a/games/pentobi/Makefile +++ b/games/pentobi/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2015/11/01 09:43:24 benoit Exp $ +# $OpenBSD: Makefile,v 1.4 2016/12/25 14:34:39 zhuk Exp $ COMMENT = free clone of Blokus board game DISTNAME = pentobi-10.1 EXTRACT_SUFX = .tar.xz CATEGORIES = games x11 +REVISION = 0 HOMEPAGE = http://pentobi.sourceforge.net/ diff --git a/games/solarus/solarus/Makefile b/games/solarus/solarus/Makefile index 1981264aeb2..a2aff8eae56 100644 --- a/games/solarus/solarus/Makefile +++ b/games/solarus/solarus/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2016/12/05 18:41:09 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2016/12/25 14:34:39 zhuk Exp $ V = 1.5.1 COMMENT = open-source Zelda-like 2D game engine DISTNAME = solarus-${V}-src PKGNAME = solarus-${V} +REVISION = 0 SHARED_LIBS += solarus 0.0 # 1.5 diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 4fa96c90246..f764a101754 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2016/12/19 12:29:01 kirby Exp $ +# $OpenBSD: Makefile,v 1.31 2016/12/25 14:34:39 zhuk Exp $ ONLY_FOR_ARCHS= amd64 i386 @@ -8,6 +8,7 @@ DISTNAME= warzone2100-3.2.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/} EXTRACT_SUFX= .tar.xz +REVISION= 0 HOMEPAGE= http://wz2100.net/ @@ -31,7 +32,9 @@ LIB_DEPENDS= audio/libogg \ devel/sdl2 \ graphics/glew \ graphics/png \ - multimedia/libtheora + multimedia/libtheora \ + x11/qt5/qtscript + BUILD_DEPENDS= archivers/unzip \ archivers/zip \ textproc/asciidoc diff --git a/graphics/cstitch/Makefile b/graphics/cstitch/Makefile index 2d3ebb27891..725d381687c 100644 --- a/graphics/cstitch/Makefile +++ b/graphics/cstitch/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2016/03/28 09:27:10 zhuk Exp $ +# $OpenBSD: Makefile,v 1.3 2016/12/25 14:34:39 zhuk Exp $ COMMENT = convert images to cross stitch patterns GH_ACCOUNT = kleintom GH_PROJECT = cstitch GH_TAGNAME = 0.9.7 +REVISION = 0 DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME}-icons{icons}.zip:0 diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile index b682f1763e6..bd74265ddaf 100644 --- a/graphics/nomacs/Makefile +++ b/graphics/nomacs/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2016/09/13 08:21:36 kirby Exp $ +# $OpenBSD: Makefile,v 1.5 2016/12/25 14:34:39 zhuk Exp $ COMMENT = small and fast Qt image viewer GH_ACCOUNT = nomacs GH_PROJECT = nomacs GH_TAGNAME = 3.4 +REVISION = 0 CATEGORIES = graphics @@ -37,7 +38,8 @@ LIB_DEPENDS = archivers/quazip \ graphics/lcms2 \ graphics/libraw \ graphics/opencv \ - graphics/tiff + graphics/tiff \ + x11/qt5/qtsvg CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ -DDISABLE_QT_DEBUG:Bool=ON diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile index da23a4e440d..d1c05ddd42f 100644 --- a/mail/trojita/Makefile +++ b/mail/trojita/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.19 2016/09/06 08:50:50 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.20 2016/12/25 14:34:39 zhuk Exp $ COMMENT = fast Qt IMAP e-mail client DISTNAME = trojita-0.7 +REVISION = 0 SHARED_LIBS = trojita_plugins 2.0 # 2.0 @@ -27,7 +28,8 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic LIB_DEPENDS = mail/mimetic \ security/qtkeychain,qt5 \ - x11/kde-applications/gpgmepp + x11/kde-applications/gpgmepp \ + x11/qt5/qtwebkit CONFIGURE_ENV += QTDIR="${MODQT_LIBDIR}" CONFIGURE_ARGS += -DWITH_RAGEL=OFF \ @@ -35,6 +37,9 @@ CONFIGURE_ARGS += -DWITH_RAGEL=OFF \ TEST_IS_INTERACTIVE = X11 +post-configure: + ln -sf ${MODQT_LIBDIR}/bin/lconvert ${WRKDIR}/bin + do-test: cd ${WRKBUILD} && ${LOCALBASE}/bin/ctest --output-on-failure diff --git a/misc/spdrs60/Makefile b/misc/spdrs60/Makefile index a3c895258a3..ddfda5518dd 100644 --- a/misc/spdrs60/Makefile +++ b/misc/spdrs60/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2016/06/02 21:03:48 sebastia Exp $ +# $OpenBSD: Makefile,v 1.8 2016/12/25 14:34:39 zhuk Exp $ COMMENT = graphical SRCP client to control a digital model railway DISTNAME = spdrs60-0.6.3 CATEGORIES = misc x11 +REVISION = 0 HOMEPAGE = http://spdrs60.sourceforge.net/ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=spdrs60/} diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index c922be37353..e7af95c6716 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2016/12/05 09:01:16 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.63 2016/12/25 14:34:39 zhuk Exp $ COMMENT= create, alter and inspect Matroska files @@ -6,6 +6,7 @@ DISTNAME= mkvtoolnix-9.6.0 CATEGORIES= multimedia x11 MASTER_SITES= ${HOMEPAGE}sources/ EXTRACT_SUFX= .tar.xz +REVISION= 0 HOMEPAGE = https://www.bunkus.org/videotools/mkvtoolnix/ diff --git a/multimedia/phonon-backend/gstreamer/Makefile b/multimedia/phonon-backend/gstreamer/Makefile index 087624d884d..80d4ac3c9d9 100644 --- a/multimedia/phonon-backend/gstreamer/Makefile +++ b/multimedia/phonon-backend/gstreamer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2016/05/27 03:41:30 zhuk Exp $ +# $OpenBSD: Makefile,v 1.18 2016/12/25 14:34:39 zhuk Exp $ COMMENT-main = GStreamer-based Phonon backend COMMENT-icons = GStreamer-based Phonon backend icons @@ -7,8 +7,8 @@ DISTNAME = phonon-backend-gstreamer-${VERSION} PKGNAME-main = ${PKGNAME} PKGNAME-icons = phonon-gstreamer-icons-${VERSION} HOMEPAGE = https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer -REVISION-main = 3 -REVISION-icons =0 +REVISION-main = 4 +REVISION-icons =1 FULLPKGNAME-main = ${PKGNAME} FULLPKGPATH-main = ${PKGPATH},${FLAVOR},-main diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index f1a31a17941..8917a6c9374 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.20 2016/04/28 11:13:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2016/12/25 14:34:39 zhuk Exp $ COMMENT = multimedia layer for Qt4/KDE4 CATEGORIES = multimedia devel VERSION = 4.8.3 DISTNAME = phonon-${VERSION} HOMEPAGE = http://phonon.kde.org/ -REVISION = 3 +REVISION = 4 # The phonon_s* are for KDE4-only; the phonon4qt5* are Qt5-only # Renamed to avoid clashing with Qt4's one diff --git a/net/cutegram/Makefile b/net/cutegram/Makefile index 4b47a51c4f9..fcbb7a7e8d5 100644 --- a/net/cutegram/Makefile +++ b/net/cutegram/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2015/08/25 13:18:27 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2016/12/25 14:34:39 zhuk Exp $ V = 2.4.0 COMMENT = Qt5 Telegram messaging service client DISTNAME = cutegram-src-${V} PKGNAME = cutegram-${V} CATEGORIES = net x11 -REVISION = 0 +REVISION = 1 HOMEPAGE = http://aseman.co/en/products/cutegram/ @@ -18,19 +18,22 @@ WANTLIB += Qt5Xml c crypto m pthread qtelegram-ae ssl z MASTER_SITES = http://aseman.co/downloads/cutegram/2/ -MODULES = x11/qt5 +MODULES = devel/qmake x11/qt5 -LIB_DEPENDS = devel/libqtelegram-aseman-edition +LIB_DEPENDS = devel/libqtelegram-aseman-edition \ + x11/qt5/qtbase \ + x11/qt5/qtdeclarative \ + x11/qt5/qtmultimedia \ + x11/qt5/qtwebkit RUN_DEPENDS = devel/desktop-file-utils \ x11/faenza-icon-theme \ - x11/gtk+3,-guic + x11/gtk+3,-guic \ + x11/qt5/qtgraphicaleffects \ + x11/qt5/qtquickcontrols NO_TEST = Yes -do-configure: - cd ${WRKSRC} && qmake-qt5 PREFIX="${DESTDIR}${PREFIX}" - post-install: @rm ${PREFIX}/share/icons/cutegram.png diff --git a/net/owncloudclient/Makefile b/net/owncloudclient/Makefile index ff7542cfe5a..05f9ebececa 100644 --- a/net/owncloudclient/Makefile +++ b/net/owncloudclient/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.16 2016/10/04 12:14:51 kirby Exp $ +# $OpenBSD: Makefile,v 1.17 2016/12/25 14:34:39 zhuk Exp $ COMMENT = owncloud sync client DISTNAME = owncloudclient-2.2.4 +REVISION = 0 SHARED_LIBS = owncloudsync 2.0 SHARED_LIBS += ocsync 2.0 @@ -47,7 +48,8 @@ FLAVOR ?= MODULES += x11/qt5 WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Sql WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml qt5keychain -LIB_DEPENDS += security/qtkeychain,qt5 +LIB_DEPENDS += security/qtkeychain,qt5 \ + x11/qt5/qtwebkit CONFIGURE_ARGS += -DBUILD_WITH_QT4=OFF .else MODULES += x11/qt4 diff --git a/net/qsyncthingtray/Makefile b/net/qsyncthingtray/Makefile index e49354f76a3..d2862be4eb2 100644 --- a/net/qsyncthingtray/Makefile +++ b/net/qsyncthingtray/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2016/11/17 14:16:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2016/12/25 14:34:39 zhuk Exp $ COMMENT = system tray app for Syncthing @@ -6,6 +6,7 @@ GH_ACCOUNT = sieren GH_PROJECT = QSyncthingTray GH_TAGNAME = 0.5.5rc1 PKGNAME = qsyncthingtray-${GH_TAGNAME} +REVISION = 0 CATEGORIES = net x11 HOMEPAGE = https://github.com/sieren/QSyncthingTray @@ -15,15 +16,12 @@ MAINTAINER = Edd Barrett PERMIT_PACKAGE_CDROM = Yes MODULES = devel/cmake \ - gcc4 \ x11/qt5 WANTLIB += Qt5Core Qt5Gui Qt5Network Qt5PrintSupport WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets c m pthread -# C++11 -MODGCC4_LANGS = c++ -MODGCC4_ARCHS = * +LIB_DEPENDS = x11/qt5/qtwebkit # The correct way is to set QTDIR env, but it doesn't work on OpenBSD, so we # have to manually specify pkg-config paths manually. diff --git a/net/seafile/client/Makefile b/net/seafile/client/Makefile index 3288388ccfa..b5627374e9e 100644 --- a/net/seafile/client/Makefile +++ b/net/seafile/client/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2016/12/16 08:58:43 kirby Exp $ +# $OpenBSD: Makefile,v 1.15 2016/12/25 14:34:39 zhuk Exp $ COMMENT = seafile client GH_PROJECT = seafile-client +REVISION = 0 WANTLIB += Qt5Core Qt5Gui Qt5Network Qt5Test Qt5Widgets c ccnet WANTLIB += crypto event_core event_extra gio-2.0 glib-2.0 gobject-2.0 diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 54dc407d508..8e2687c6a62 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.108 2016/11/04 11:35:20 sthen Exp $ +# $OpenBSD: Makefile,v 1.109 2016/12/25 14:34:39 zhuk Exp $ COMMENT-main= BitTorrent command line and daemon client COMMENT-gtk= BitTorrent client with GTK+ interface @@ -13,6 +13,7 @@ REVISION= 1 CATEGORIES= net HOMEPAGE= http://www.transmissionbt.com/ MAINTAINER= Josh Grosse +REVISION-qt= 0 # GPLv2+ PERMIT_PACKAGE_CDROM= Yes diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index cbb2d270d04..44a9b76293e 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2016/12/15 10:00:15 sthen Exp $ +# $OpenBSD: Makefile,v 1.47 2016/12/25 14:34:39 zhuk Exp $ # XXX should add pledge to dumpcap. @@ -15,6 +15,7 @@ DISTNAME = wireshark-${WVER} PKGNAME-main = wireshark-${WVER} PKGNAME-gtk = wireshark-gtk-${WVER} PKGNAME-text = tshark-${WVER} +REVISION-main = 0 SHARED_LIBS += wscodecs 0.0 # 0.0 SHARED_LIBS += wsutil 3.0 # 5.0 @@ -85,7 +86,8 @@ LIB_DEPENDS-text = ${MODLUA_LIB_DEPENDS} \ security/libssh LIB_DEPENDS-main += ${LIB_DEPENDS} \ - tshark-${WVER}:${BUILD_PKGPATH:S/,$//},-text + tshark-${WVER}:${BUILD_PKGPATH:S/,$//},-text \ + x11/qt5/qtmultimedia LIB_DEPENDS-gtk += tshark-${WVER}:${BUILD_PKGPATH:S/,$//},-text \ x11/gtk+3 \ diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 655e9ba214e..ffe7fd93027 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.115 2016/12/25 13:54:34 zhuk Exp $ +# $OpenBSD: Makefile,v 1.116 2016/12/25 14:34:39 zhuk Exp $ COMMENT-main= PDF rendering library COMMENT-qt= qt interface to PDF rendering library @@ -18,7 +18,7 @@ OLDSHIT = poppler-0.16.7 REVISION-main= 0 REVISION-qt= 0 REVISION-qt4= 0 -REVISION-qt5= 1 +REVISION-qt5= 2 REVISION-utils= 0 SHARED_LIBS += poppler 43.0 # 66.0 diff --git a/productivity/vym/Makefile b/productivity/vym/Makefile index e3537eefd89..87a5a399395 100644 --- a/productivity/vym/Makefile +++ b/productivity/vym/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2016/03/26 20:37:35 zhuk Exp $ +# $OpenBSD: Makefile,v 1.23 2016/12/25 14:34:39 zhuk Exp $ COMMENT= generate and manipulate maps of your thoughts DISTNAME= vym-2.5.0 CATEGORIES= productivity x11 +REVISION= 0 HOMEPAGE= http://www.insilmaril.de/vym/ @@ -24,6 +25,8 @@ RUN_DEPENDS= archivers/zip \ archivers/unzip \ textproc/libxslt +LIB_DEPENDS= x11/qt5/qtsvg + PORTHOME= ${WRKDIR} NO_TEST= Yes diff --git a/security/qtkeychain/Makefile b/security/qtkeychain/Makefile index d54689ca571..972e92da802 100644 --- a/security/qtkeychain/Makefile +++ b/security/qtkeychain/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/05/06 06:45:43 kirby Exp $ +# $OpenBSD: Makefile,v 1.5 2016/12/25 14:34:39 zhuk Exp $ COMMENT = Qt API to store passwords and other secret data @@ -39,6 +39,7 @@ LIBNAME = QtKeychain LIBNAME_L = qtkeychain QT = qt4 .endif +REVISION = 0 SUBST_VARS += LIBNAME LIBNAME_L QT diff --git a/security/xca/Makefile b/security/xca/Makefile index cbec6938cfd..d504d516f68 100644 --- a/security/xca/Makefile +++ b/security/xca/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2016/12/20 13:52:01 zhuk Exp $ +# $OpenBSD: Makefile,v 1.12 2016/12/25 14:34:39 zhuk Exp $ COMMENT= create and manage certificates, CSRs, keys, etc DISTNAME= xca-1.3.2 CATEGORIES= security x11 -REVISION= 0 +REVISION= 1 HOMEPAGE= http://xca.sourceforge.net/ diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile index 120674551d0..54eb2692d7a 100644 --- a/sysutils/tarsnap-gui/Makefile +++ b/sysutils/tarsnap-gui/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2016/05/30 21:31:16 jturner Exp $ +# $OpenBSD: Makefile,v 1.8 2016/12/25 14:34:40 zhuk Exp $ COMMENT = frontend to the popular Tarsnap backup service V = 0.9 DISTNAME = tarsnap-gui-${V} CATEGORIES = sysutils +REVISION = 0 MAINTAINER = Josh Grosse diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile index 395270450f9..0067defb4ae 100644 --- a/textproc/calibre/Makefile +++ b/textproc/calibre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2016/06/27 23:05:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.55 2016/12/25 14:34:40 zhuk Exp $ COMMENT = ebook management application @@ -6,6 +6,7 @@ V = 2.60.0 DISTNAME = calibre-$V CATEGORIES = textproc EXTRACT_SUFX = .tar.xz +REVISION = 0 HOMEPAGE = http://calibre-ebook.com/ diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile index 43ce9c15fdc..3ba1ae9b51e 100644 --- a/www/otter-browser/Makefile +++ b/www/otter-browser/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.20 2016/12/06 13:00:19 awolk Exp $ +# $OpenBSD: Makefile,v 1.21 2016/12/25 14:34:40 zhuk Exp $ COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=otter-browser/} DISTNAME = otter-browser-0.9.12-dev152 PKGNAME = ${DISTNAME:S/-dev/pre/} +REVISION = 0 EXTRACT_SUFX = .tar.bz2 @@ -24,7 +25,11 @@ WANTLIB += hunspell-1.3 RUN_DEPENDS = devel/desktop-file-utils x11/gtk+3,-guic -LIB_DEPENDS = textproc/hunspell +LIB_DEPENDS = textproc/hunspell \ + x11/qt5/qtdeclarative \ + x11/qt5/qtmultimedia \ + x11/qt5/qtwebkit \ + x11/qt5/qtxmlpatterns MODULES = devel/cmake x11/qt5 diff --git a/www/ruby-capybara-webkit/Makefile b/www/ruby-capybara-webkit/Makefile index fc731f0240e..1d2136e2863 100644 --- a/www/ruby-capybara-webkit/Makefile +++ b/www/ruby-capybara-webkit/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2016/11/04 21:26:38 jeremy Exp $ +# $OpenBSD: Makefile,v 1.14 2016/12/25 14:34:40 zhuk Exp $ COMMENT = capybara driver that uses WebKit DISTNAME = capybara-webkit-1.11.1 -REVISION = 0 +REVISION = 1 CATEGORIES = www HOMEPAGE= https://github.com/thoughtbot/capybara-webkit @@ -23,4 +23,6 @@ BUILD_DEPENDS = ${RUN_DEPENDS} RUN_DEPENDS = www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<2.8.0 \ x11/qt5 +LIB_DEPENDS = x11/qt5/qtwebkit + .include diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile index a9e5db87652..48b3530968d 100644 --- a/x11/cool-retro-term/Makefile +++ b/x11/cool-retro-term/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/26 20:37:36 zhuk Exp $ +# $OpenBSD: Makefile,v 1.10 2016/12/25 14:34:40 zhuk Exp $ COMMENT = good looking terminal emulator which mimics old CRT displays DISTNAME = cool-retro-term-1.0.0 CATEGORIES = x11 -REVISION = 4 +REVISION = 5 HOMEPAGE = https://github.com/Swordfish90/cool-retro-term @@ -20,6 +20,8 @@ MODULES = devel/qmake x11/qt5 RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic +LIB_DEPENDS = x11/qt5/qtdeclarative + MAKE_FLAGS = CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" NO_TEST = Yes diff --git a/x11/kde-applications/gpgmepp/Makefile b/x11/kde-applications/gpgmepp/Makefile index 0a12644e2be..2a27c179997 100644 --- a/x11/kde-applications/gpgmepp/Makefile +++ b/x11/kde-applications/gpgmepp/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2016/09/09 09:47:42 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.3 2016/12/25 14:34:40 zhuk Exp $ COMMENT = C++ bindings/wrapper for gpgme DISTNAME = gpgmepp-${VERSION} -REVISION = 0 +REVISION = 1 CATEGORIES = security SHARED_LIBS = KF5QGpgme 0.0 # 4.80 diff --git a/x11/lumina/Makefile b/x11/lumina/Makefile index f44de61d76b..d78a050ce14 100644 --- a/x11/lumina/Makefile +++ b/x11/lumina/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.20 2016/10/31 17:49:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2016/12/25 14:34:40 zhuk Exp $ COMMENT= Lumina Desktop Environment GH_ACCOUNT= trueos GH_PROJECT= lumina GH_TAGNAME= v1.1.0 +REVISION= 0 SHARED_LIBS += LuminaUtils 1.1 # 1.1 @@ -24,12 +25,16 @@ NO_TEST= Yes MODULES= x11/qt5 RUN_DEPENDS= devel/desktop-file-utils \ + devel/kf5/oxygen-icons \ multimedia/gstreamer1/plugins-base \ - x11/kde4/oxygen-icons \ x11/fluxbox \ x11/numlockx \ x11/xscreensaver +LIB_DEPENDS= x11/qt5/qtmultimedia \ + x11/qt5/qtsvg \ + x11/qt5/qtx11extras + MAKE_FLAGS= LIBLuminaUtils_VERSION=${LIBLuminaUtils_VERSION} FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}/ diff --git a/x11/polkit-qt/Makefile b/x11/polkit-qt/Makefile index cfd3d9a3e65..7ed871c1e79 100644 --- a/x11/polkit-qt/Makefile +++ b/x11/polkit-qt/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2016/03/18 23:12:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2016/12/25 14:34:40 zhuk Exp $ COMMENT= PolicyKit authentication agent for Qt V= 0.112.0 DISTNAME= polkit-qt-1-${V} -REVISION= 2 +REVISION= 3 SHARED_LIBS += polkit-qt-agent-1 2.0 # 0.99 SHARED_LIBS += polkit-qt-core-1 2.0 # 0.99 diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index f385204f1f7..3f59749dddb 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/08/30 16:02:17 landry Exp $ +# $OpenBSD: Makefile,v 1.6 2016/12/25 14:34:40 zhuk Exp $ COMMENT-main= python Qt5 bindings COMMENT-docs= py-qt5 documentation @@ -8,6 +8,7 @@ DISTNAME= PyQt5_gpl-${V} PKGNAME= py-qt5-${V} PKGNAME-main= py-qt5-${V} PKGNAME-docs= py-qt5-docs-${V} +REVISION-main= 0 CATEGORIES= x11 devel @@ -45,8 +46,20 @@ FULLPKGPATH-docs= x11/py-qt5,-docs${MODPY_FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=4.18.1 \ x11/dbus-python${MODPY_FLAVOR} -LIB_DEPENDS= ${MODQT5_LIB_DEPENDS}>=5.5 \ - ${MODPY_LIB_DEPENDS} +LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \ + x11/qt5/qtconnectivity \ + x11/qt5/qtdeclarative \ + x11/qt5/qtenginio \ + x11/qt5/qtlocation \ + x11/qt5/qtmultimedia \ + x11/qt5/qtserialport \ + x11/qt5/qtsensors \ + x11/qt5/qttools \ + x11/qt5/qtwebchannel \ + x11/qt5/qtwebkit \ + x11/qt5/qtwebsockets \ + x11/qt5/qtx11extras \ + x11/qt5/qtxmlpatterns NO_TEST= Yes diff --git a/x11/py-qt5/patches/patch-sip_QtCore_QtCoremod_sip b/x11/py-qt5/patches/patch-sip_QtCore_QtCoremod_sip new file mode 100644 index 00000000000..d60680383f4 --- /dev/null +++ b/x11/py-qt5/patches/patch-sip_QtCore_QtCoremod_sip @@ -0,0 +1,14 @@ +$OpenBSD: patch-sip_QtCore_QtCoremod_sip,v 1.1 2016/12/25 14:34:40 zhuk Exp $ +Add Qt 5.6.2 support. +Already included in the upcoming PyQt5-5.7.1. +--- sip/QtCore/QtCoremod.sip.orig Sun Dec 25 01:41:19 2016 ++++ sip/QtCore/QtCoremod.sip Sun Dec 25 01:41:37 2016 +@@ -22,7 +22,7 @@ + + %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) + +-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} ++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0} + + %Platforms {WS_X11 WS_WIN WS_MACX} + diff --git a/x11/smplayer/Makefile b/x11/smplayer/Makefile index 2ec0ed978d4..f0d8d85140f 100644 --- a/x11/smplayer/Makefile +++ b/x11/smplayer/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.30 2016/11/18 01:04:19 gonzalo Exp $ +# $OpenBSD: Makefile,v 1.31 2016/12/25 14:34:40 zhuk Exp $ COMMENT = complete front-end for MPlayer DISTNAME = smplayer-16.11.0 +REVISION = 0 CATEGORIES = multimedia x11 @@ -25,6 +26,8 @@ RUN_DEPENDS = x11/mplayer>=20090708 \ devel/desktop-file-utils \ x11/gtk+3,-guic +LIB_DEPENDS = x11/qt5/qtscript + USE_GMAKE = Yes NO_TEST = Yes diff --git a/x11/smtube/Makefile b/x11/smtube/Makefile index 0c992fe9516..b21ccd32223 100644 --- a/x11/smtube/Makefile +++ b/x11/smtube/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/08/31 04:46:21 gonzalo Exp $ +# $OpenBSD: Makefile,v 1.21 2016/12/25 14:34:40 zhuk Exp $ USE_WXNEEDED = Yes @@ -27,6 +27,9 @@ RUN_DEPENDS = x11/smplayer \ devel/desktop-file-utils \ x11/gtk+3,-guic +LIB_DEPENDS = x11/qt5/qtscript \ + x11/qt5/qtwebkit + USE_GMAKE = Yes NO_TEST = Yes