svn commit: r324338 - head/graphics/oyranos

[Boris Samorodov]

Author: bsam
Date: Wed Aug  7 10:10:06 2013
New Revision: 324338
URL: http://svnweb.freebsd.org/changeset/ports/324338

Log:
  . fix package build error when apparently the INDEX is built on     [1]
    a machine with clang while the package is not;
  . remove CPP configuration (it's not used with this port);
  . add "-L${LOCALBASE}/lib -liconv" to LDFLAGS due to the error:
  -----
  [ 86%] Building CXX object src/tests/CMakeFiles/test2-static.dir/test2.cpp.o
  Linking CXX executable test2-static
  /usr/bin/ld: ^^^A: invalid DSO for symbol `libiconv_open' definition
  /usr/local/lib/libiconv.so.3: could not read symbols: Bad value
  -----
  
  PR:		ports/180608  [1]
  Submitted by:	tijl  [1]

Modified:
  head/graphics/oyranos/Makefile
  head/graphics/oyranos/pkg-plist

Modified: head/graphics/oyranos/Makefile
==============================================================================
--- head/graphics/oyranos/Makefile	Wed Aug  7 09:35:04 2013	(r324337)
+++ head/graphics/oyranos/Makefile	Wed Aug  7 10:10:06 2013	(r324338)
@@ -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>

Modified: head/graphics/oyranos/pkg-plist
==============================================================================
--- head/graphics/oyranos/pkg-plist	Wed Aug  7 09:35:04 2013	(r324337)
+++ head/graphics/oyranos/pkg-plist	Wed Aug  7 10:10:06 2013	(r324338)
@@ -532,12 +532,15 @@ share/pixmaps/qcmsevents.svg
 %%DOCSDIR%%/html/unionoyValue__u__coll__graph.png
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
- at dirrmtry share/color/settings
 @dirrmtry share/applications
+ at dirrmtry share/color/settings
+ at dirrmtry share/color
 @dirrmtry lib/pkgconfig
 @dirrm lib/oyranos/cmake
 @dirrm lib/oyranos
 @dirrmtry lib/colour/modules
 @dirrmtry lib/colour
+ at comment @dirrmtry etc/xdg/autostart
+ at comment @dirrmtry etc/xdg
 @dirrm include/oyranos/alpha
 @dirrm include/oyranos