summaryrefslogtreecommitdiff
path: root/net/krdc
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-03-15 12:35:56 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-03-15 12:35:56 +0000
commit5f54a52585c868129348906dac16633ed8628098 (patch)
treef60db570486be7b15dba2ca7795eedbd4061fffc /net/krdc
parentmultimedia/libvpx: bundled fixes from Firefox (diff)
Change header installation location for kdelibs4-based ports.
Install x11/kdelibs4's headers into include/kde4 instead of include (which consequently causes several other ports to have their installation paths changed too). The idea behind this is to reduce path conflicts between KDE4 ports and the upcoming KDE Frameworks 5 ports that will be installed into include/KF5. If we continue installing the KDE4 headers into include/, we can end up in a situation like this: c++ [...] -I/usr/local/include -I/usr/local/include/KF5 file.cpp If the KDE4 and KF5 versions of a port have the same headers, the KDE4 port will unintentionally be picked up first and the build will fail. Most of this huge patch is just PORTREVISION bumps, pkg-plist changes and a few patches to FooConfig.cmake files to make them look into the kde4/ subdirectory in include/. Changes which don't fit into the above are: - deskutils/kdepimlibs4: Import an upstream patch to remove some double semicolons that cause base GCC to fail. They have always been present, but since the faulty header was referenced via -isystem /usr/local/include this never caused any problems. - devel/subversion, devel/subversion18: Update patch-configure. The current kwallet changes there date back to 2011 (r272490), at a time when the build could fail when both KDE3 and KDE4 were installed. Replace those bits with a change I've submitted upstream to use the kde4-config program to determine where KDE4's headers and libraries are installed instead of assuming the headers are always in include/. Once again, huge thanks to Tobias Berner <tcberner@gmail.com> for being the first one to notice this problem when working on the KDE Frameworks 5 ports, coming up with the solution and bugging me until I had time to work on this and ask for the exp-run :-) PR: 207906 (exp-run)
Notes
Notes: svn path=/head/; revision=411156
Diffstat (limited to 'net/krdc')
-rw-r--r--net/krdc/Makefile1
-rw-r--r--net/krdc/pkg-plist6
2 files changed, 4 insertions, 3 deletions
diff --git a/net/krdc/Makefile b/net/krdc/Makefile
index 365ea621d781..57b02105f109 100644
--- a/net/krdc/Makefile
+++ b/net/krdc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= krdc
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/net/krdc/pkg-plist b/net/krdc/pkg-plist
index 024ffb9a3255..9a06ab48eadf 100644
--- a/net/krdc/pkg-plist
+++ b/net/krdc/pkg-plist
@@ -1,8 +1,8 @@
bin/krdc
bin/krdc_rfb_approver
-include/krdc/hostpreferences.h
-include/krdc/remoteview.h
-include/krdc/remoteviewfactory.h
+include/kde4/krdc/hostpreferences.h
+include/kde4/krdc/remoteview.h
+include/kde4/krdc/remoteviewfactory.h
lib/kde4/kcm_krdc_rdpplugin.so
lib/kde4/kcm_krdc_vncplugin.so
lib/kde4/krdc_rdpplugin.so