From ed298848a3065b84b78e2144c52536c4155a742f Mon Sep 17 00:00:00 2001 From: zhuk Date: Sat, 26 Mar 2016 20:37:34 +0000 Subject: [PATCH] Zap more lines from qmake-based ports by moving them from the "MODULES=x11/qtX + CONFIGURE_STYLE=qmake" logic to the "MODULES=devel/qmake x11/qtX" logic. Discussed with espie@ a few weeks ago. --- audio/mumble/Makefile | 5 ++--- audio/musique/Makefile | 6 ++---- cad/fritzing/Makefile | 5 ++--- cad/openscad/Makefile | 4 ++-- comms/qtserialport/Makefile | 5 ++--- devel/beediff/Makefile | 5 ++--- devel/libqtelegram-aseman-edition/Makefile | 5 ++--- devel/qgit/Makefile | 5 ++--- devel/qmake/qmake.port.mk | 6 +++++- editors/focuswriter/Makefile | 5 ++--- editors/qscintilla/Makefile | 5 ++--- editors/teaqt/Makefile | 6 ++---- editors/texmaker/Makefile | 5 ++--- editors/texworks/Makefile | 9 +++++---- editors/tiled/Makefile | 5 ++--- emulators/gambatte/Makefile | 6 +++--- games/jag/Makefile | 5 ++--- games/pokerth/Makefile | 4 ++-- geo/gpsbabel/Makefile | 4 ++-- graphics/opencsg/Makefile | 5 ++--- net/qsynergy/Makefile | 5 ++--- net/retroshare/Makefile | 6 +++--- productivity/entomologist/Makefile | 6 ++---- productivity/fet/Makefile | 7 ++----- productivity/vym/Makefile | 5 ++--- security/kqoauth/Makefile | 6 ++---- security/qca-gnupg/Makefile | 5 ++--- security/qca-ossl/Makefile | 5 ++--- security/qoauth/Makefile | 5 ++--- security/yubico/yubikey-personalization-gui/Makefile | 5 ++--- sysutils/tarsnap-gui/Makefile | 5 ++--- textproc/xxdiff/Makefile | 6 +++--- www/arora/Makefile | 6 ++---- www/minitube/Makefile | 6 ++---- x11/cool-retro-term/Makefile | 5 ++--- x11/qrfcview/Makefile | 7 +++---- x11/qt4/qt4.port.mk | 4 +--- x11/qt5/qt5.port.mk | 4 +--- x11/qwt/Makefile | 7 +++---- 39 files changed, 87 insertions(+), 123 deletions(-) diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index 67593918c22..e19667d290f 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2016/03/18 23:12:15 naddy Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/26 20:37:35 zhuk Exp $ COMMENT = low-latency voice chat client @@ -19,8 +19,7 @@ WANTLIB += lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtSvg WANTLIB += lib/qt4/QtXml m opus portaudio protobuf WANTLIB += pthread sndfile speex speexdsp ssl stdc++ -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 SEPARATE_BUILD = No BUILD_DEPENDS = audio/celt07 \ diff --git a/audio/musique/Makefile b/audio/musique/Makefile index e81cabfe5cc..4c577e1386c 100644 --- a/audio/musique/Makefile +++ b/audio/musique/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2016/03/10 17:27:11 zhuk Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/26 20:37:35 zhuk Exp $ COMMENT = graphical music player focused on a clean ui DISTNAME = musique-1.4 @@ -16,7 +16,7 @@ WANTLIB += ICE QtDBus QtGui QtNetwork QtSql QtXml SM WANTLIB += X11 Xext Xi Xinerama Xrender c fontconfig WANTLIB += freetype m phonon pthread stdc++ tag -MODULES = x11/qt4 +MODULES = devel/qmake x11/qt4 LIB_DEPENDS = audio/taglib @@ -25,8 +25,6 @@ RUN_DEPENDS = devel/desktop-file-utils \ multimedia/gstreamer-0.10/plugins-ffmpeg \ x11/gtk+3,-guic -CONFIGURE_STYLE = qmake - WRKDIST = ${WRKDIR}/musique NO_TEST = Yes diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile index f1e4b9e9c3f..3fae0060670 100644 --- a/cad/fritzing/Makefile +++ b/cad/fritzing/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2016/03/07 11:54:12 zhuk Exp $ +# $OpenBSD: Makefile,v 1.26 2016/03/26 20:37:35 zhuk Exp $ COMMENT= interactive electronics designing software @@ -25,8 +25,7 @@ MASTER_SITES0= https://github.com/fritzing/fritzing-parts/archive/${GH_TAGNAME}/ # Rest: CreativeCommons:BY-SA PERMIT_PACKAGE_CDROM = Yes -MODULES= x11/qt4 -CONFIGURE_STYLE=qmake +MODULES= devel/qmake x11/qt4 NO_TEST= Yes LIB_DEPENDS= comms/qtserialport diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index fe011ffcbc5..0a66c13ed19 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2016/03/07 12:24:17 zhuk Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/26 20:37:35 zhuk Exp $ COMMENT = the programmer's solid 3D CAD modeller#' BROKEN-sparc64= SIGILL on src/cgalutils.cc with CGAL-4.6.3 @@ -23,6 +23,7 @@ MASTER_SITES = http://files.openscad.org/ DISTFILES = openscad-${V}.src.tar.gz MODULES = devel/gettext \ + devel/qmake \ x11/qt4 BUILD_DEPENDS = devel/bison \ math/eigen3 @@ -38,7 +39,6 @@ LIB_DEPENDS = devel/boost \ RUN_DEPENDS = devel/desktop-file-utils \ fonts/liberation-fonts -CONFIGURE_STYLE = qmake MODQMAKE_ARGS = VERSION=${V} SEPARATE_BUILD = No diff --git a/comms/qtserialport/Makefile b/comms/qtserialport/Makefile index 6040d23cd3f..a7c6aa5fe91 100644 --- a/comms/qtserialport/Makefile +++ b/comms/qtserialport/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2016/03/07 12:01:19 zhuk Exp $ +# $OpenBSD: Makefile,v 1.3 2016/03/26 20:37:35 zhuk Exp $ COMMENT = provides functions to access serial ports @@ -20,8 +20,7 @@ MASTER_SITES = https://deftly.net/ # This lib is included in later versions of QT PERMIT_PACKAGE_CDROM = Yes -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 FAKE_FLAGS = INSTALL_ROOT=${WRKINST} NO_TEST = Yes diff --git a/devel/beediff/Makefile b/devel/beediff/Makefile index b02b20f1a8c..782ddbf02c1 100644 --- a/devel/beediff/Makefile +++ b/devel/beediff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2016/03/07 12:06:14 zhuk Exp $ +# $OpenBSD: Makefile,v 1.16 2016/03/26 20:37:35 zhuk Exp $ COMMENT= graphical file comparator @@ -20,10 +20,9 @@ WANTLIB += lib/qt4/QtGui ICE SM Xi Xinerama Xrender fontconfig freetype WRKDIST= ${WRKDIR}/beediff MODULES= devel/gettext \ + devel/qmake \ x11/qt4 -CONFIGURE_STYLE= qmake - NO_TEST= Yes do-install: diff --git a/devel/libqtelegram-aseman-edition/Makefile b/devel/libqtelegram-aseman-edition/Makefile index f236ce0c608..4aff21a6221 100644 --- a/devel/libqtelegram-aseman-edition/Makefile +++ b/devel/libqtelegram-aseman-edition/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/03/07 10:36:35 zhuk Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/26 20:37:35 zhuk Exp $ V = 4.1 COMMENT = Qt5 library for Telegram messaging service @@ -18,8 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += GL Qt5Core Qt5Gui Qt5Multimedia Qt5Network crypto m WANTLIB += pthread ssl z -MODULES = x11/qt5 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt5 NO_TEST = Yes diff --git a/devel/qgit/Makefile b/devel/qgit/Makefile index 962ca02b77d..c9546b5bc52 100644 --- a/devel/qgit/Makefile +++ b/devel/qgit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2016/03/07 12:19:53 zhuk Exp $ +# $OpenBSD: Makefile,v 1.11 2016/03/26 20:37:35 zhuk Exp $ COMMENT = qt git repository viewer @@ -17,8 +17,7 @@ WANTLIB += freetype m pthread stdc++ MASTER_SITES = http://libre.tibirna.org/attachments/download/9/ -MODULES = x11/qt4 -CONFIGURE_STYLE=qmake +MODULES = devel/qmake x11/qt4 RUN_DEPENDS = devel/git diff --git a/devel/qmake/qmake.port.mk b/devel/qmake/qmake.port.mk index 34fdbcb318d..fccd86c9391 100644 --- a/devel/qmake/qmake.port.mk +++ b/devel/qmake/qmake.port.mk @@ -1,4 +1,8 @@ -# $OpenBSD: qmake.port.mk,v 1.1 2016/03/10 17:45:11 zhuk Exp $ +# $OpenBSD: qmake.port.mk,v 1.2 2016/03/26 20:37:34 zhuk Exp $ + +.if empty(CONFIGURE_STYLE) +CONFIGURE_STYLE = qmake +.endif .if ${CONFIGURE_STYLE:Mqmake} . if ${MODULES:Mx11/qt?} == ${MODULES} diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index f7c235042cf..2098ab2f9b6 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/07 12:26:39 zhuk Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/26 20:37:35 zhuk Exp $ COMMENT = simple, distraction-free writing environment @@ -16,6 +16,7 @@ MASTER_SITES = ${HOMEPAGE} PERMIT_PACKAGE_CDROM = Yes MODULES += devel/gettext \ + devel/qmake \ x11/qt4 RUN_DEPENDS += devel/desktop-file-utils \ x11/gtk+3,-guic @@ -23,8 +24,6 @@ LIB_DEPENDS += textproc/hunspell WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype WANTLIB += QtNetwork z QtGui c m pthread stdc++ hunspell-1.3 -CONFIGURE_STYLE = qmake - NO_TEST = Yes post-install: diff --git a/editors/qscintilla/Makefile b/editors/qscintilla/Makefile index 11d6627d979..6bbac44c7d3 100644 --- a/editors/qscintilla/Makefile +++ b/editors/qscintilla/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2016/03/07 12:27:49 zhuk Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/26 20:37:35 zhuk Exp $ COMMENT = Qt4 port of the Scintilla source code editor @@ -20,9 +20,8 @@ WANTLIB += freetype m pthread stdc++ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyqt/} -MODULES = devel/gettext x11/qt4 +MODULES = devel/gettext devel/qmake x11/qt4 -CONFIGURE_STYLE = qmake SEPARATE_BUILD = No CONFIGURE_ENV = HOME=${WRKDIR} diff --git a/editors/teaqt/Makefile b/editors/teaqt/Makefile index e7fc7639727..d9a58fac9ec 100644 --- a/editors/teaqt/Makefile +++ b/editors/teaqt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2016/03/07 12:28:33 zhuk Exp $ +# $OpenBSD: Makefile,v 1.20 2016/03/26 20:37:35 zhuk Exp $ COMMENT = powerful and simple qt4 editor @@ -18,11 +18,9 @@ LIB_DEPENDS = textproc/aspell/core WANTLIB += c m pthread stdc++ z QtGui QtXml aspell WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype -MODULES = x11/qt4 +MODULES = devel/qmake x11/qt4 CONFIGURE_ENV = USE_ASPELL=true USE_HUNSPELL=false -CONFIGURE_STYLE = qmake - NO_TEST = Yes do-install: diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index da2d200c53f..2b729b65357 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2016/03/07 12:41:34 zhuk Exp $ +# $OpenBSD: Makefile,v 1.32 2016/03/26 20:37:35 zhuk Exp $ COMMENT= LaTeX development environment DISTNAME= texmaker-4.5 @@ -18,8 +18,7 @@ WANTLIB += ICE QtGui QtNetwork QtScript QtWebKit QtXml SM X11 WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.3 WANTLIB += m poppler-qt4 pthread stdc++ z -MODULES= x11/qt4 -CONFIGURE_STYLE= qmake +MODULES= devel/qmake x11/qt4 MODQMAKE_ARGS= DESKTOPDIR=${LOCALBASE}/share/applications \ ICONDIR=${LOCALBASE}/share/pixmaps diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 6d0bfdadb14..4f6b0ab32a2 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2016/03/20 16:12:24 naddy Exp $ +# $OpenBSD: Makefile,v 1.28 2016/03/26 20:37:35 zhuk Exp $ COMMENT-main = easy to use LaTeX and ConTeXt editor COMMENT-python = Python scripting for TeXworks @@ -25,10 +25,11 @@ MAINTAINER = Edd Barrett # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MODULES = x11/qt4 \ +MODULES = devel/qmake \ lang/python \ - lang/lua -CONFIGURE_STYLE = qmake + lang/lua \ + x11/qt4 + MODQMAKE_PROJECTS = plugins-src/TWLuaPlugin/TWLuaPlugin.pro \ plugins-src/TWPythonPlugin/TWPythonPlugin.pro \ TeXworks.pro diff --git a/editors/tiled/Makefile b/editors/tiled/Makefile index 3948931f4ad..f2d40d1e0b8 100644 --- a/editors/tiled/Makefile +++ b/editors/tiled/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/07 12:37:28 zhuk Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/26 20:37:35 zhuk Exp $ COMMENT = tile map editor @@ -23,8 +23,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/} RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused DPB_PROPERTIES = nojunk diff --git a/emulators/gambatte/Makefile b/emulators/gambatte/Makefile index 7c232555775..d648703a051 100644 --- a/emulators/gambatte/Makefile +++ b/emulators/gambatte/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2016/03/09 17:24:51 zhuk Exp $ +# $OpenBSD: Makefile,v 1.15 2016/03/26 20:37:35 zhuk Exp $ COMMENT-main = highly accurate Game Boy Color emulator COMMENT-qt = highly accurate Game Boy Color emulator with GUI @@ -30,10 +30,10 @@ WANTLIB-qt = ${cWANTLIB} GL QtCore QtGui QtOpenGL X11 Xext Xrandr Xv ossaudio us MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gambatte/} -MODULES = lang/python x11/qt4 +MODULES = devel/qmake lang/python x11/qt4 MODQMAKE_PROJECTS = gambatte_qt SEPARATE_BUILD = No -CONFIGURE_STYLE = qmake specific # avoid qt4.port.mk add do-build +CONFIGURE_STYLE = qmake specific # avoid qmake.port.mk add do-build LIB_DEPENDS-main = devel/sdl diff --git a/games/jag/Makefile b/games/jag/Makefile index deb7a929ef6..7b250f17d0c 100644 --- a/games/jag/Makefile +++ b/games/jag/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/03/07 12:51:49 zhuk Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/26 20:37:35 zhuk Exp $ COMMENT = arcade-puzzle game V = 0.3.2 DISTNAME = jag-${V} @@ -15,8 +15,7 @@ WANTLIB += pthread stdc++ MASTER_SITES = http://jag.xlabsoft.com/files/ DISTFILES = jag-${V}-src.zip jag-${V}-data.zip -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 BUILD_DEPENDS = archivers/unzip LIB_DEPENDS = devel/sdl \ devel/sdl-mixer diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile index 85d2d395d57..36b164acd1f 100644 --- a/games/pokerth/Makefile +++ b/games/pokerth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2016/03/07 13:30:31 zhuk Exp $ +# $OpenBSD: Makefile,v 1.32 2016/03/26 20:37:35 zhuk Exp $ COMMENT= texas hold'em poker game with online capabilities BROKEN-hppa = needs atomic ops @@ -26,9 +26,9 @@ WANTLIB += freetype gsasl ircclient protobuf sqlite3 ssl tinyxml MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pokerth/} MODULES= converters/libiconv \ + devel/qmake \ x11/qt4 -CONFIGURE_STYLE= qmake MODQMAKE_PROJECTS= pokerth.pro RUN_DEPENDS= devel/desktop-file-utils diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile index a065d705649..19a032232c2 100644 --- a/geo/gpsbabel/Makefile +++ b/geo/gpsbabel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2016/03/10 16:07:27 zhuk Exp $ +# $OpenBSD: Makefile,v 1.28 2016/03/26 20:37:35 zhuk Exp $ COMMENT-main= GPS waypoint, track, and route conversion tool COMMENT-tk= Tk front-end to gpsbabel @@ -36,7 +36,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ MULTI_PACKAGES= -main -tk -qt -MODULES= x11/tk x11/qt4 +MODULES= devel/qmake x11/tk x11/qt4 MODQMAKE_PROJECTS = gui/app.pro SEPARATE_BUILD= No diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile index 31d24dac721..1666aa01276 100644 --- a/graphics/opencsg/Makefile +++ b/graphics/opencsg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/18 23:12:17 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/26 20:37:35 zhuk Exp $ COMMENT = constructive solid geometry rendering library @@ -18,8 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += GL GLEW lib/qt4/QtGui m stdc++ pthread WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 SEPARATE_BUILD = No LIB_DEPENDS = graphics/glew diff --git a/net/qsynergy/Makefile b/net/qsynergy/Makefile index be9a15c3b12..1277a6ef6d6 100644 --- a/net/qsynergy/Makefile +++ b/net/qsynergy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/03/07 13:01:28 zhuk Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/26 20:37:35 zhuk Exp $ COMMENT= GUI for synergy @@ -13,8 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qsynergy/} -MODULES= x11/qt4 -CONFIGURE_STYLE= qmake +MODULES= devel/qmake x11/qt4 WANTLIB += ICE QtGui QtNetwork SM X11 Xext Xi Xinerama Xrender WANTLIB += c fontconfig freetype m pthread stdc++ diff --git a/net/retroshare/Makefile b/net/retroshare/Makefile index 557ab488154..7e98d09a6da 100644 --- a/net/retroshare/Makefile +++ b/net/retroshare/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/18 23:12:19 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2016/03/26 20:37:35 zhuk Exp $ COMMENT = secure decentralised communication platform V = 0.5.5c @@ -17,8 +17,8 @@ WANTLIB += freetype gpgme gnome-keyring ixml m pthread protobuf speex WANTLIB += speexdsp ssh ssh_threads ssl stdc++ upnp xml2 xslt z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=retroshare/RetroShare/${V}/} -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 + RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic LIB_DEPENDS = audio/speex \ diff --git a/productivity/entomologist/Makefile b/productivity/entomologist/Makefile index 9f508a5b4e3..a3f45beda29 100644 --- a/productivity/entomologist/Makefile +++ b/productivity/entomologist/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2016/03/07 13:16:49 zhuk Exp $ +# $OpenBSD: Makefile,v 1.11 2016/03/26 20:37:35 zhuk Exp $ COMMENT = bug tracker client DISTNAME = entomologist-1.1 @@ -11,10 +11,8 @@ HOMEPAGE = http://entomologist.sourceforge.net # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MODULES = x11/qt4 +MODULES = devel/qmake x11/qt4 -CONFIGURE_STYLE = qmake -QMAKE_ARGS = LOCALE_PREFIX=${PREFIX} SEPARATE_BUILD = No RUN_DEPENDS = devel/desktop-file-utils \ diff --git a/productivity/fet/Makefile b/productivity/fet/Makefile index 99de58c80fb..5b74c1daeec 100644 --- a/productivity/fet/Makefile +++ b/productivity/fet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/03/07 13:58:28 zhuk Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/26 20:37:35 zhuk Exp $ COMMENT= automatically create timetables @@ -20,12 +20,9 @@ MASTER_SITES= ${HOMEPAGE}/download/ \ EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext \ + devel/qmake \ x11/qt4 -CONFIGURE_STYLE= qmake - -LIB_DEPENDS= x11/qt4 - PORTHOME= ${WRKDIR} NO_TEST= Yes diff --git a/productivity/vym/Makefile b/productivity/vym/Makefile index e7fbb8b958f..e3537eefd89 100644 --- a/productivity/vym/Makefile +++ b/productivity/vym/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2016/03/07 11:14:02 zhuk Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/26 20:37:35 zhuk Exp $ COMMENT= generate and manipulate maps of your thoughts @@ -17,10 +17,9 @@ WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread MODULES= devel/gettext \ + devel/qmake \ x11/qt5 -CONFIGURE_STYLE= qmake - RUN_DEPENDS= archivers/zip \ archivers/unzip \ textproc/libxslt diff --git a/security/kqoauth/Makefile b/security/kqoauth/Makefile index 47b0b439676..81f9a6a65b4 100644 --- a/security/kqoauth/Makefile +++ b/security/kqoauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/03/18 23:12:19 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/26 20:37:35 zhuk Exp $ COMMENT = OAuth support library for Qt-based applications V = 0.97 @@ -20,9 +20,7 @@ MASTER_SITES = ${HOMEPAGE}/archive/ DIST_SUBDIR = kqoauth WRKDIST = ${WRKDIR}/kQOAuth-${V} -MODULES = x11/qt4 - -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 MAKE_FLAGS = LIBkqoauth_VERSION=${LIBkqoauth_VERSION} DESTDIRNAME = INSTALL_ROOT diff --git a/security/qca-gnupg/Makefile b/security/qca-gnupg/Makefile index 920c0d1cab2..891eae58acd 100644 --- a/security/qca-gnupg/Makefile +++ b/security/qca-gnupg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/03/18 23:12:19 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2016/03/26 20:37:36 zhuk Exp $ COMMENT = GnuPG plugin for QCA2 DISTNAME = qca-gnupg-2.0.0-beta3 @@ -14,8 +14,7 @@ EXTRACT_SUFX = .tar.bz2 WANTLIB += m pthread qca2 stdc++ -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 LIB_DEPENDS = security/qca2 diff --git a/security/qca-ossl/Makefile b/security/qca-ossl/Makefile index 315e44d8967..d1f250899df 100644 --- a/security/qca-ossl/Makefile +++ b/security/qca-ossl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2016/03/18 23:12:19 naddy Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/26 20:37:36 zhuk Exp $ COMMENT = SSL/TLS plugin for QCA2 DISTNAME = qca-ossl-2.0.0-beta3 @@ -17,8 +17,7 @@ MASTER_SITES = http://delta.affinix.com/download/qca/2.0/plugins/ EXTRACT_SUFX = .tar.bz2 -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 LIB_DEPENDS = security/qca2 NO_TEST = Yes diff --git a/security/qoauth/Makefile b/security/qoauth/Makefile index af37d5eb728..1cba556e5dd 100644 --- a/security/qoauth/Makefile +++ b/security/qoauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/03/18 23:12:19 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/26 20:37:36 zhuk Exp $ COMMENT = OAuth support library for Qt-based applications V = 1.0.1 @@ -17,8 +17,7 @@ WANTLIB = lib/qt4/QtNetwork m pthread qca2 stdc++ MASTER_SITES = http://files.ayoy.net/qoauth/$V/ EXTRACT_SUFX = .tar.bz2 -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 SEPARATE_BUILD = No MODQMAKE_ARGS = PREFIX=${PREFIX} diff --git a/security/yubico/yubikey-personalization-gui/Makefile b/security/yubico/yubikey-personalization-gui/Makefile index e46b91e7b5e..264a05f5c58 100644 --- a/security/yubico/yubikey-personalization-gui/Makefile +++ b/security/yubico/yubikey-personalization-gui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/03/07 14:39:27 zhuk Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/26 20:37:36 zhuk Exp $ COMMENT= Qt GUI to configure YubiKeys @@ -14,8 +14,7 @@ RUN_DEPENDS= devel/desktop-file-utils LIB_DEPENDS= security/yubico/yubico-c \ security/yubico/yubikey-personalization -MODULES= x11/qt4 -CONFIGURE_STYLE=qmake +MODULES= devel/qmake x11/qt4 NO_TEST= Yes R = ${WRKSRC}/resources/lin/yubikey-personalization-gui diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile index 3148d7f2d6e..f181242c66f 100644 --- a/sysutils/tarsnap-gui/Makefile +++ b/sysutils/tarsnap-gui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2016/03/07 10:52:30 zhuk Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/26 20:37:36 zhuk Exp $ COMMENT = frontend to the popular Tarsnap backup service @@ -19,8 +19,7 @@ GH_ACCOUNT = Tarsnap GH_PROJECT = tarsnap-gui GH_TAGNAME = v${V} -MODULES = x11/qt5 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt5 RUN_DEPENDS = sysutils/tarsnap do-install: diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index 2f84782c71f..fa57e437109 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2016/03/07 14:51:53 zhuk Exp $ +# $OpenBSD: Makefile,v 1.39 2016/03/26 20:37:36 zhuk Exp $ COMMENT= graphical file comparator and merge tool @@ -17,11 +17,11 @@ WANTLIB += freetype m pthread stdc++ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xxdiff/} EXTRACT_SUFX= .tar.bz2 -MODULES= lang/python \ +MODULES= devel/qmake \ + lang/python \ x11/qt4 BUILD_DEPENDS= devel/bison -CONFIGURE_STYLE= qmake SEPARATE_BUILD= No MODPY_ADJ_FILES= ../bin/termdiff diff --git a/www/arora/Makefile b/www/arora/Makefile index 773e571137c..f5e10ab15b0 100644 --- a/www/arora/Makefile +++ b/www/arora/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2016/03/18 23:12:19 naddy Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/26 20:37:36 zhuk Exp $ COMMENT= simple Qt4-based browser using WebKit @@ -19,9 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += QtGui QtNetwork QtScript QtSql QtWebKit c m pthread stdc++ WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype -MODULES= x11/qt4 - -CONFIGURE_STYLE= qmake +MODULES= devel/qmake x11/qt4 RUN_DEPENDS= devel/desktop-file-utils \ multimedia/gstreamer-0.10/plugins-ffmpeg \ diff --git a/www/minitube/Makefile b/www/minitube/Makefile index e4940555a48..d3d97a5b909 100644 --- a/www/minitube/Makefile +++ b/www/minitube/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2016/03/07 14:54:16 zhuk Exp $ +# $OpenBSD: Makefile,v 1.46 2016/03/26 20:37:36 zhuk Exp $ COMMENT = standalone YouTube.com video browser/player @@ -15,9 +15,7 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = https://distfiles.bsdfrog.org/ -MODULES = x11/qt4 - -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c fontconfig WANTLIB += freetype lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile index 1c132a88ae7..a9e5db87652 100644 --- a/x11/cool-retro-term/Makefile +++ b/x11/cool-retro-term/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/10 17:24:38 zhuk Exp $ +# $OpenBSD: Makefile,v 1.9 2016/03/26 20:37:36 zhuk Exp $ COMMENT = good looking terminal emulator which mimics old CRT displays DISTNAME = cool-retro-term-1.0.0 @@ -15,8 +15,7 @@ WANTLIB += Qt5Widgets c m pthread MASTER_SITES = http://mirrors.nycbug.org/pub/distfiles/ -MODULES = x11/qt5 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt5 RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic diff --git a/x11/qrfcview/Makefile b/x11/qrfcview/Makefile index 81b2a55c092..e1175ec5c6b 100755 --- a/x11/qrfcview/Makefile +++ b/x11/qrfcview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/03/08 14:36:38 zhuk Exp $ +# $OpenBSD: Makefile,v 1.21 2016/03/26 20:37:36 zhuk Exp $ COMMENT= viewer for IETF RFCs @@ -20,10 +20,9 @@ GH_ACCOUNT= saghul GH_PROJECT= qrfcview-osx GH_COMMIT= dff3ee489a6aca0c20800219f7c207884f918023 -MODULES= x11/qt4 -NO_TEST= Yes +MODULES= devel/qmake x11/qt4 -CONFIGURE_STYLE= qmake +NO_TEST= Yes do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/bin/qRFCView ${PREFIX}/bin diff --git a/x11/qt4/qt4.port.mk b/x11/qt4/qt4.port.mk index 8067338aa96..82ecbcda892 100644 --- a/x11/qt4/qt4.port.mk +++ b/x11/qt4/qt4.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: qt4.port.mk,v 1.11 2016/03/10 17:45:11 zhuk Exp $ +# $OpenBSD: qt4.port.mk,v 1.12 2016/03/26 20:37:35 zhuk Exp $ # This fragment defines MODQT_* variables to make it easier to substitute # qt1/qt2/qt3 in a port. @@ -42,5 +42,3 @@ WANTLIB += ${MODQT4_WANTLIB} CONFIGURE_ENV +=${_MODQT4_SETUP} MAKE_ENV += ${_MODQT4_SETUP} MAKE_FLAGS += ${_MODQT4_SETUP} - -MODULES += devel/qmake diff --git a/x11/qt5/qt5.port.mk b/x11/qt5/qt5.port.mk index d0e03ce26e4..7d58ba1db80 100644 --- a/x11/qt5/qt5.port.mk +++ b/x11/qt5/qt5.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: qt5.port.mk,v 1.10 2016/03/10 17:45:11 zhuk Exp $ +# $OpenBSD: qt5.port.mk,v 1.11 2016/03/26 20:37:35 zhuk Exp $ # This fragment defines MODQT_* variables to make it easier to substitute # qt4/qt5 in a port. @@ -86,5 +86,3 @@ MODQT5_USE_GCC4_MODULE ?= Yes MODGCC4_LANGS += c++ MODGCC4_ARCHS ?= * .endif - -MODULES += devel/qmake diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile index dbc5fd2a7c5..d11978aa004 100644 --- a/x11/qwt/Makefile +++ b/x11/qwt/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.18 2016/03/18 23:12:22 naddy Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/26 20:37:36 zhuk Exp $ COMMENT = Qt Widgets for Technical Applications DISTNAME = qwt-5.2.1 SHARED_LIBS = qwt 6.0 CATEGORIES = x11 EXTRACT_SUFX = .tar.bz2 -REVISION = 3 +REVISION = 4 HOMEPAGE = http://qwt.sourceforge.net/ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qwt/} @@ -14,8 +14,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qwt/} # http://qwt.sourceforge.net/qwtlicense.html PERMIT_PACKAGE_CDROM = Yes -MODULES = x11/qt4 -CONFIGURE_STYLE = qmake +MODULES = devel/qmake x11/qt4 MODQMAKE_INSTALL_ROOT = NO_TEST = Yes USE_GMAKE = Yes