Skip to content

Commit

Permalink
*/*: sync with upstream
Browse files Browse the repository at this point in the history
Taken from: HardenedBSD
  • Loading branch information
fichtner committed Jun 29, 2018
1 parent 3f64cc6 commit 375b68a
Show file tree
Hide file tree
Showing 1,484 changed files with 21,926 additions and 3,267 deletions.
4 changes: 2 additions & 2 deletions accessibility/jovie-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ COMMENT= KDE text-to-speech system

LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher

USES= cmake:outsource kde:4 tar:xz
USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= xml qmake_build moc_build uic_build rcc_build
USE_QT= xml qmake_build moc_build uic_build rcc_build
USE_LDCONFIG= yes

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions accessibility/kaccessible-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ COMMENT= Accessibility services for KDE

LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher

USES= cmake:outsource kde:4 tar:xz
USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= corelib dbus gui xml \
USE_QT= corelib dbus gui xml \
qmake_build moc_build rcc_build uic_build

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions accessibility/kmag-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ CATEGORIES= accessibility kde kde-kde4
MAINTAINER= [email protected]
COMMENT= KDE Screen magnifier

USES= cmake:outsource kde:4 tar:xz
USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_QT= qmake_build moc_build rcc_build uic_build

# Somebody has to create port for libkdeaccessibilityclient first
CMAKE_ARGS+= -DWITH_QAccessibilityClient=off
Expand Down
4 changes: 2 additions & 2 deletions accessibility/kmag/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ COMMENT= KDE Screen magnifier
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

USES= cmake:outsource gettext kde:5 tar:xz
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm \
i18n kio service widgetsaddons xmlgui
USE_QT5= core dbus gui printsupport widgets xml \
USE_QT= core dbus gui printsupport widgets xml \
buildtools_build qmake_build

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions accessibility/kmousetool-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ CATEGORIES= accessibility kde kde-kde4
MAINTAINER= [email protected]
COMMENT= Automatic mouse click tool for KDE

USES= cmake:outsource kde:4 tar:xz
USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_QT= qmake_build moc_build rcc_build uic_build
USE_XORG= xtst

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions accessibility/kmousetool/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ COMMENT= Automatic mouse click tool for KDE
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

USES= cmake:outsource gettext kde:5 tar:xz
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
ecm i18n iconthemes notifications widgetsaddons xmlgui
USE_QT5= core dbus gui phonon4 widgets xml \
USE_QT= core dbus gui phonon4 widgets xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xtst

Expand Down
4 changes: 2 additions & 2 deletions accessibility/kmouth-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ CATEGORIES= accessibility kde kde-kde4
MAINTAINER= [email protected]
COMMENT= Speech synthesizer frontend for KDE

USES= cmake:outsource kde:4 tar:xz
USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= qmake_build moc_build rcc_build uic_build
USE_QT= qmake_build moc_build rcc_build uic_build

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions accessibility/kmouth/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ COMMENT= Speech synthesizer frontend for KDE
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING

USES= cmake:outsource gettext kde:5 tar:xz
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
ecm i18n jobwidgets kio service widgetsaddons xmlgui
USE_QT5= core dbus gui network printsupport speech widgets xml \
USE_QT= core dbus gui network printsupport speech widgets xml \
buildtools_build qmake_build

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions accessibility/qt4-accessible/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ PKGNAMEPREFIX= qt4-
MAINTAINER= [email protected]
COMMENT= Qt accessibility widgets

USE_QT4= qmake_build moc_build qt3support corelib gui network sql xml
QT_DIST= yes
USES= qmake:no_env qt-dist:4
USE_QT= moc_build qt3support corelib gui network sql xml
USE_CXXSTD= gnu++98

HAS_CONFIGURE= yes
Expand Down
5 changes: 2 additions & 3 deletions accessibility/qt5-speech/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ COMMENT= Accessibilty features for Qt5

LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher

USES= pkgconfig qmake:outsource
USE_QT5= core gui buildtools_build qmake_build
QT_DIST= ${PORTNAME}
USES= pkgconfig qmake:outsource qt-dist:5,speech
USE_QT= core gui buildtools_build qmake_build

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions archivers/ark-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson@qt4
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

USES= cmake:outsource kde:4 libarchive cpe tar:xz
USES= cmake:outsource kde:4 libarchive cpe qt:4 tar:xz
USE_KDE= automoc4 kdelibs libkonq
CPE_VENDOR= kde
USE_QT4= qtestlib qmake_build moc_build rcc_build uic_build
USE_QT= qtestlib qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes

OPTIONS_DEFINE= 7ZIP RAR ZIP
Expand Down
4 changes: 2 additions & 2 deletions archivers/ark/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ COMMENT= Archiving tool for KDE
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

USES= cmake:outsource gettext libarchive kde:5 tar:xz
USES= cmake:outsource gettext libarchive kde:5 qt:5 tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n iconthemes \
itemmodels itemviews jobwidgets khtml kio parts pty service \
solid sonnet textwidgets widgetsaddons xmlgui
USE_QT5= concurrent core dbus gui network widgets xml \
USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build

USE_LDCONFIG= yes
Expand Down
4 changes: 2 additions & 2 deletions archivers/kf5-karchive/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ COMMENT= KF5 library that provides classes for handling archive formats
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING.LIB

USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz
USES= cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm
USE_QT5= buildtools_build core qmake_build
USE_QT= buildtools_build core qmake_build

.include <bsd.port.mk>
8 changes: 5 additions & 3 deletions archivers/quazip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ LICENSE= LGPL21
FLAVORS= qt4 qt5
FLAVOR?= ${FLAVORS:[1]}

USES= cmake:outsource
USES= cmake:outsource
USE_LDCONFIG= yes

. if ${FLAVOR} == qt4
USE_QT4= corelib moc_build network_build qmake_build rcc_build uic_build
USES+= qt:4
USE_QT= corelib moc_build network_build qmake_build rcc_build uic_build
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=TRUE
. else
USE_QT5= core buildtools_build qmake_build
USES+= qt:5
USE_QT= core buildtools_build qmake_build
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE
QTVER_SUFFIX= 5
. endif
Expand Down
9 changes: 5 additions & 4 deletions astro/gpsbabel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@ USE_GITHUB= yes

CONFLICTS= gpsbabel14-[0-9]*

USE_QT5= core qmake_build
USE_QT= core qmake_build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib=system
USES= localbase
USES= localbase qt:5 qt:5

OPTIONS_DEFINE= GUI
OPTIONS_SUB= yes

GUI_ALL_TARGET= gui
GUI_USE= QT5=gui,xml,network,webkit
GUI_USE+= QT5=linguisttools_build,moc_build,rcc_build,uic_build
GUI_USES= qt:5 qt:5
GUI_USE= QT=gui,xml,network,webkit
GUI_USE+= QT=linguisttools_build,moc_build,rcc_build,uic_build
GUI_VARS= MAKE_JOBS_UNSAFE=yes

post-patch:
Expand Down
3 changes: 2 additions & 1 deletion astro/gpsd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ TIMING_MAKE_ARGS_OFF= timing=no
# Client-side options
NCURSES_MAKE_ARGS_OFF= ncurses=no
NCURSES_USES= ncurses
QTBIND_USE= QT4=network,corelib
QTBIND_USES= qt:4
QTBIND_USE= QT=network,corelib
QTBIND_MAKE_ARGS= qt=yes
QTBIND_MAKE_ARGS_OFF= qt=no
QTBIND_PLIST_SUB= QTBIND=""
Expand Down
4 changes: 2 additions & 2 deletions astro/kstars-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ LIB_DEPENDS= libcfitsio.so:astro/cfitsio \
BUILD_DEPENDS= xplanet:astro/xplanet
RUN_DEPENDS= xplanet:astro/xplanet

USES= cmake:outsource compiler:c++11-lib eigen:3 kde:4 tar:xz
USES= cmake:outsource compiler:c++11-lib eigen:3 kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= opengl qmake_build moc_build rcc_build uic_build
USE_QT= opengl qmake_build moc_build rcc_build uic_build

OPTIONS_DEFINE= PYKDE

Expand Down
4 changes: 2 additions & 2 deletions astro/kstars/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ BUILD_DEPENDS= xplanet:astro/xplanet
RUN_DEPENDS= xplanet:astro/xplanet

USES= cmake:outsource compiler:c++11-lib eigen:3 gettext kde:5 \
pkgconfig tar:xz
pkgconfig qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets\
coreaddons crash dbusaddons doctools ecm guiaddons i18n \
iconthemes init itemviews jobwidgets kio newstuff notifications \
notifyconfig parts plotting service solid texteditor \
widgetsaddons xmlgui
USE_QT5= concurrent core dbus gui multimedia network opengl printsupport \
USE_QT= concurrent core dbus gui multimedia network opengl printsupport \
qml quick sql svg testlib widgets xml \
buildtools_build qmake_build

Expand Down
4 changes: 2 additions & 2 deletions astro/libkgeomap-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ LICENSE_COMB= multi

BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs

USES= cmake:outsource kde:4 pathfix tar:xz
USES= cmake:outsource kde:4 pathfix qt:4 tar:xz
USE_KDE= kdelibs automoc4 marble
USE_LDCONFIG= yes
USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build
USE_QT= network phonon xml moc_build qmake_build rcc_build uic_build

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions astro/libkgeomap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ LICENSE_COMB= multi
BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
LIB_DEPENDS= libopencv_video.so:graphics/opencv

USES= cmake:outsource gettext kde:5 pkgconfig tar:xz
USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n kio marble service textwidgets
USE_QT5= concurrent core gui network webkit widgets xml \
USE_QT= concurrent core gui network webkit widgets xml \
buildtools_build qmake_build

USE_LDCONFIG= yes
Expand Down
4 changes: 2 additions & 2 deletions astro/marble-kde4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ COMMENT= Virtual globe and world atlas for KDE

LIB_DEPENDS= libquazip.so:archivers/quazip@qt4

USES= cmake:outsource kde:4 shared-mime-info tar:xz
USES= cmake:outsource kde:4 qt:4 shared-mime-info tar:xz
USE_KDE= kdelibs automoc4
USE_QT4= corelib dbus declarative designer_build gui network phonon \
USE_QT= corelib dbus declarative designer_build gui network phonon \
qtestlib script sql svg webkit xml \
qmake_build moc_build rcc_build uic_build
USE_LDCONFIG= yes
Expand Down
4 changes: 2 additions & 2 deletions astro/marble/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt

LIB_DEPENDS= libquazip5.so:archivers/quazip@qt5

USES= cmake:outsource desktop-file-utils gettext kde:5 tar:xz
USES= cmake:outsource desktop-file-utils gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n jobwidgets kio newstuff package parts \
plasma-framework runner service sonnet textwidgets wallet \
widgetsaddons xmlgui
USE_QT5= concurrent core dbus designer gui location network opengl \
USE_QT= concurrent core dbus designer gui location network opengl \
phonon4 printsupport qml quick script sql svg webkit widgets xml \
buildtools_build qmake_build

Expand Down
7 changes: 4 additions & 3 deletions astro/merkaartor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \

USE_GITHUB= yes
GH_ACCOUNT= openstreetmap
USES= pkgconfig sqlite:3 qmake
USES= pkgconfig qt:5 sqlite:3 qmake
USE_LDCONFIG= yes

QMAKE_ARGS= SYSTEM_QUAZIP=1
USE_QT5= buildtools_build \
USE_QT= buildtools_build \
concurrent core gui imageformats network printsupport svg \
webkit widgets xml

Expand All @@ -45,7 +45,8 @@ ZBAR_BROKEN= Does not build with option ZBAR selected

DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1

NLS_USE= QT5=linguisttools_build
NLS_USES= qt:5
NLS_USE= QT=linguisttools_build

INSTALLS_ICONS= yes

Expand Down
4 changes: 2 additions & 2 deletions astro/qlandkartegt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \
libproj.so:graphics/proj \
libgps.so:astro/gpsd

USES= cmake desktop-file-utils
USE_QT4= dbus gui opengl network sql xml linguist_build \
USES= cmake desktop-file-utils qt:4
USE_QT= dbus gui opengl network sql xml linguist_build \
moc_build uic_build rcc_build qmake_build
USE_GL= glu

Expand Down
4 changes: 2 additions & 2 deletions astro/qmapshack/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \
libroutino.so:astro/routino
RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks

USES= cmake compiler:c++11-lib desktop-file-utils jpeg
USE_QT5= buildtools core dbus gui linguisttools network printsupport \
USES= cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
USE_QT= buildtools core dbus gui linguisttools network printsupport \
qmake script sql sql-sqlite3 uitools webkit widgets xml

.include <bsd.port.mk>
8 changes: 4 additions & 4 deletions astro/stellarium-qt4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ LICENSE= GPLv2+
CONFLICTS_INSTALL= ${PORTNAME}-0.17.*
PORTSCOUT= limit:^0\.12\. # track only 0.12.x (legacy)

USES= cmake gettext iconv
USE_QT4= moc_build rcc_build uic_build qmake_build \
USES= cmake gettext iconv qt:4
USE_QT= moc_build rcc_build uic_build qmake_build \
corelib gui network opengl

PORTDOCS= AUTHORS ChangeLog README
Expand Down Expand Up @@ -55,13 +55,13 @@ PLIST_SUB+= TEXTURES="@comment "
.endif

.if ${PORT_OPTIONS:MMULTIMEDIA}
USE_QT4+= phonon
USE_QT+= phonon
.else
CMAKE_ARGS+= -DENABLE_SOUND:BOOL=OFF
.endif

.if ${PORT_OPTIONS:MSCRIPTING}
USE_QT4+= script
USE_QT+= script
PLIST_SUB+= SCRIPTS=""
.else
CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF
Expand Down
12 changes: 7 additions & 5 deletions astro/stellarium/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ CONFLICTS_INSTALL= ${PORTNAME}-qt4-0.12.*
USE_GITHUB= yes
GH_ACCOUNT= Stellarium

USES= cmake gettext
USE_QT5= qmake_build buildtools_build linguisttools_build \
USES= cmake gettext qt:5
USE_QT= qmake_build buildtools_build linguisttools_build \
concurrent core gui network opengl printsupport widgets

CMAKE_ARGS= -DENABLE_GPS:BOOL=OFF # XXX: requires Qt5Positioning
Expand All @@ -44,10 +44,12 @@ DOCS_DISTFILES= stellarium_user_guide-${GUIDE_VERSION}-1.pdf:ug
TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx
TEXTURES_DISTFILES= textures-1K.zip:gfx

MULTIMEDIA_USE= QT5=multimedia
MULTIMEDIA_USES= qt:5
MULTIMEDIA_USE= QT=multimedia
MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF

TELESCOPE_USE= QT5=serialport
TELESCOPE_USES= qt:5
TELESCOPE_USE= QT=serialport
TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF

.include <bsd.port.options.mk>
Expand All @@ -65,7 +67,7 @@ PLIST_SUB+= MORE_STARS="@comment "
.endif

.if ${PORT_OPTIONS:MSCRIPTING}
USE_QT5+= script
USE_QT+= script
PLIST_SUB+= SCRIPTS=""
.else
CMAKE_ARGS+= -DENABLE_SCRIPTING:BOOL=OFF
Expand Down
Loading

0 comments on commit 375b68a

Please sign in to comment.