From owner-svn-ports-head@FreeBSD.ORG Wed Aug 7 10:10:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B6E0753F; Wed, 7 Aug 2013 10:10:07 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8AED72D5B; Wed, 7 Aug 2013 10:10:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r77AA759043747; Wed, 7 Aug 2013 10:10:07 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r77AA7NY043745; Wed, 7 Aug 2013 10:10:07 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201308071010.r77AA7NY043745@svn.freebsd.org> From: Boris Samorodov Date: Wed, 7 Aug 2013 10:10:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324338 - head/graphics/oyranos X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Aug 2013 10:10:07 -0000 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 + +.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 +.include 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%% -@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