aboutsummaryrefslogtreecommitdiffstats
path: root/graphics/gnash
diff options
context:
space:
mode:
authortcberner <tcberner@FreeBSD.org>2016-08-24 16:20:31 +0800
committertcberner <tcberner@FreeBSD.org>2016-08-24 16:20:31 +0800
commita5fddeafcdb2cab1016827038e317a262dad4857 (patch)
treeb9dc00f333e96550a5732b38b9c9444035e4339c /graphics/gnash
parent3832b190ef3ea2bbefdd61450bff8af422a2e9ae (diff)
downloadfreebsd-ports-gnome-a5fddeafcdb2cab1016827038e317a262dad4857.tar.gz
freebsd-ports-gnome-a5fddeafcdb2cab1016827038e317a262dad4857.tar.zst
freebsd-ports-gnome-a5fddeafcdb2cab1016827038e317a262dad4857.zip
Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and
Plasma5 ports At the moment KDE ports use bsd.kde4.mk to handle their dependencies. When working on the ports for KDE Frameworks and Plasma5 it seemed to be more reasonable to create a new kde.mk instead of adding an bsd.kde5.mk. The kde.mk in this review is a stripped down version of the one we are using in the KDE Test repositories plasma5 branch [1] to only contain the parts relevant to the current KDE4 ports in the portstree [2]. Changes to the KDE Ports needed by this: Replace USE_KDE4 by USE_KDE [3] Add USES=kde:4 [4] [1] http://src.mouf.net/area51/view/branches/plasma5/KDE/Mk/Uses/kde.mk [2] The version in the plasma5 branch also handles frameworks/plasma5 and handles MASTER_SITES via a KDE_DIST variable similar to bsd.qt.mk for Qt Ports -- I chose to leave this out for now, as the diff is already large enough. [3] I chose USE_KDE instead of USE_KDE4, USE_KDE5, USE_KDEX as the version we want is already specified as argument to kde:<arg> [4] For KDE Frameworks and Plasma5 ports this would be kde:5 PR: 210667 Approved by: portmgr, mat (mentor), rakuco (mentor) Reviewed by: mat, rakuco Differential Revision: https://reviews.freebsd.org/D6961
Diffstat (limited to 'graphics/gnash')
-rw-r--r--graphics/gnash/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 28560561345a..a321684ba2dd 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
CONFLICTS= gnash-devel-[0-9]*
-USES= cpe gmake jpeg libtool pkgconfig tar:bzip2
+USES= cpe gmake jpeg kde:4 libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_GCC= any
WANT_GSTREAMER= yes
@@ -106,8 +106,8 @@ CONFIGURE_ARGS+= --disable-npapi
.endif
.if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN}
-PLIST_SUB+= KPARTS4="${KDE4_PREFIX}"
-CONFIGURE_ARGS+= --with-kde4_prefix=${KDE4_PREFIX}
+PLIST_SUB+= KPARTS4="${KDE_PREFIX}"
+CONFIGURE_ARGS+= --with-kde4_prefix=${KDE_PREFIX}
.else
PLIST_SUB+= KPARTS4="@comment "
CONFIGURE_ARGS+= --disable-kparts4
@@ -127,8 +127,8 @@ GNASH_GUIS+= gtk
GNASH_GUIS+= kde4
USE_QT4= moc_build
QT_NONSTANDARD= yes
-USE_KDE4= kdelibs
-CONFIGURE_ENV+= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+USE_KDE= kdelibs
+CONFIGURE_ENV+= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config"
.endif
.if ${GNASH_GUIS} == ""