aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorBoris Samorodov <bsam@FreeBSD.org>2013-08-07 10:10:06 +0000
committerBoris Samorodov <bsam@FreeBSD.org>2013-08-07 10:10:06 +0000
commitd02cae6600c398dd85984d66a1d9c11a0d129e55 (patch)
tree744d085a5e34c58ebf9614bd54ee52edbe4e7d6a /graphics
parent63986910ed6f7fc7f7964a3d3d5082184f8efb71 (diff)
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/oyranos/Makefile10
-rw-r--r--graphics/oyranos/pkg-plist5
2 files changed, 9 insertions, 6 deletions
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index 39cc9641b866..24589df70375 100644
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@@ -32,20 +32,20 @@ USE_GNOME= libxml2
USE_QT4= gui moc_build qmake_build rcc_build uic_build
USE_XORG= xfixes xinerama xrandr xxf86vm
CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
+LDFLAGS+= -L${LOCALBASE}/lib -liconv
MAN1= oyranos-config-fltk.1 oyranos-monitor-daemon.1 oyranos-monitor.1 \
oyranos-policy.1 oyranos-profile-graph.1 oyranos-profile-install.1 \
oyranos-profile.1 oyranos-profiles.1 oyranos-xforms-modules.1 qcmsevents.1
MAN3= oyranos-config.3 oyranos.3
-.if exists(/usr/bin/clang)
+.include <bsd.port.pre.mk>
+
+.if exists(/usr/bin/clang) && ${OSVERSION} > 901502
CC= /usr/bin/clang
-CPP= /usr/bin/clang-cpp
CXX= /usr/bin/clang++
-CONFIGURE_ENV+= CXXCPP="${CPP}"
.else
USE_GCC= 4.6+
-CONFIGURE_ENV+= CXXCPP="${CPP}"
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/oyranos/pkg-plist b/graphics/oyranos/pkg-plist
index 996af05de0ae..f17fad99ec3f 100644
--- a/graphics/oyranos/pkg-plist
+++ b/graphics/oyranos/pkg-plist
@@ -532,12 +532,15 @@ share/pixmaps/qcmsevents.svg
%%DOCSDIR%%/html/unionoyValue__u__coll__graph.png
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
-@dirrmtry share/color/settings
@dirrmtry share/applications
+@dirrmtry share/color/settings
+@dirrmtry share/color
@dirrmtry lib/pkgconfig
@dirrm lib/oyranos/cmake
@dirrm lib/oyranos
@dirrmtry lib/colour/modules
@dirrmtry lib/colour
+@comment @dirrmtry etc/xdg/autostart
+@comment @dirrmtry etc/xdg
@dirrm include/oyranos/alpha
@dirrm include/oyranos