diff options
| author | tcberner <tcberner@FreeBSD.org> | 2016-08-24 16:20:31 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2016-08-24 16:20:31 +0800 |
| commit | a5fddeafcdb2cab1016827038e317a262dad4857 (patch) | |
| tree | b9dc00f333e96550a5732b38b9c9444035e4339c /net-p2p/amule-devel | |
| parent | 3832b190ef3ea2bbefdd61450bff8af422a2e9ae (diff) | |
| download | freebsd-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 'net-p2p/amule-devel')
| -rw-r--r-- | net-p2p/amule-devel/Makefile | 11 | ||||
| -rw-r--r-- | net-p2p/amule-devel/pkg-plist | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile index 122eb9c14e10..2ba28926440b 100644 --- a/net-p2p/amule-devel/Makefile +++ b/net-p2p/amule-devel/Makefile @@ -90,10 +90,11 @@ MMAP_CONFIGURE_ON= --enable-mmap MONOLITHIC_CONFIGURE_OFF= --disable-monolithic PLASMAMULE_CONFIGURE_ON= --enable-plasmamule -PLASMAMULE_USE= KDE4=kdelibs QT4=dbus,gui,moc_build +PLASMAMULE_USES= kde:4 +PLASMAMULE_USE= KDE=kdelibs QT4=dbus,gui,moc_build PLASMAMULE_CONFIGURE_ENV= \ - ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \ - KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \ + ac_cv_path_KDE4_CONFIG=${KDE_PREFIX}/bin/kde4-config \ + KBUILDSYCOCA=${KDE_PREFIX}/bin/kbuildsycoca4 \ UPDATE_MIME_DATABASE=/usr/bin/true UPNP_LIB_DEPENDS= libupnp.so:devel/upnp @@ -129,8 +130,8 @@ post-patch: .SILENT ${WRKSRC}/docs/Makefile.in .endif .if ${PORT_OPTIONS:MPLASMAMULE} - ${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \ - -e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \ + ${REINPLACE_CMD} -e 's|@prefix@|${KDE_PREFIX}|' \ + -e 's|LDFLAGS =|& -L${KDE_PREFIX}/lib |' \ ${WRKSRC}/src/utils/plasmamule/Makefile.in .endif diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist index bdef265a32c8..e65d12465c5a 100644 --- a/net-p2p/amule-devel/pkg-plist +++ b/net-p2p/amule-devel/pkg-plist @@ -1,4 +1,4 @@ -%%PLASMAMULE%%@cwd %%KDE4_PREFIX%% +%%PLASMAMULE%%@cwd %%KDE_PREFIX%% %%PLASMAMULE%%bin/plasmamule-engine-feeder %%PLASMAMULE%%lib/kde4/plasma-applet-plasmamule.so %%PLASMAMULE%%lib/kde4/plasma-engine-plasmamule.so |