From tijl@coosemans.org  Wed Jul 17 13:28:08 2013
Return-Path: <tijl@coosemans.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id A28BDB89
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Jul 2013 13:28:08 +0000 (UTC)
	(envelope-from tijl@coosemans.org)
Received: from mailrelay006.isp.belgacom.be (mailrelay006.isp.belgacom.be [195.238.6.172])
	by mx1.freebsd.org (Postfix) with ESMTP id 48231F60
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Jul 2013 13:28:07 +0000 (UTC)
Received: from 50.172-241-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.241.172.50])
  by relay.skynet.be with ESMTP; 17 Jul 2013 15:28:01 +0200
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1])
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id r6HDRxLX003127
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Jul 2013 15:28:00 +0200 (CEST)
	(envelope-from tijl@kalimero.tijl.coosemans.org)
Received: (from tijl@localhost)
	by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id r6HDRxGU003126;
	Wed, 17 Jul 2013 15:27:59 +0200 (CEST)
	(envelope-from tijl)
Message-Id: <201307171327.r6HDRxGU003126@kalimero.tijl.coosemans.org>
Date: Wed, 17 Jul 2013 15:27:59 +0200 (CEST)
From: Tijl Coosemans <tijl@FreeBSD.org>
Reply-To: Tijl Coosemans <tijl@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] graphics/oyranos: fix package build
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         180608
>Category:       ports
>Synopsis:       [patch] graphics/oyranos: fix package build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 17 13:30:00 UTC 2013
>Closed-Date:    Wed Aug 07 10:10:49 UTC 2013
>Last-Modified:  Wed Aug  7 10:20:00 UTC 2013
>Originator:     Tijl Coosemans
>Release:        FreeBSD 10.0-CURRENT i386
>Organization:
>Environment:
>Description:
Fix for this package build error:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.8.20130716075822.pointyhat/oyranos-0.9.4.log

Apparently the INDEX is built on a machine with clang while the package
is not, so add a limit on OSVERSION like editors/libreoffice does.

Also, it may be better to replace USE_GCC with a build dependency on
lang/clang. USE_GCC adds a run dependency on gcc which makes the package
a lot heavier to download and install.
>How-To-Repeat:
>Fix:

--- oyranos.patch begins here ---
Index: graphics/oyranos/Makefile
===================================================================
--- graphics/oyranos/Makefile	(revision 323099)
+++ graphics/oyranos/Makefile	(working copy)
@@ -38,7 +38,7 @@ MAN1=		oyranos-config-fltk.1 oyranos-mon
 		oyranos-profile.1 oyranos-profiles.1 oyranos-xforms-modules.1 qcmsevents.1
 MAN3=		oyranos-config.3 oyranos.3
 
-.if exists(/usr/bin/clang)
+.if exists(/usr/bin/clang) && ${OSVERSION} > 901502
 CC=		/usr/bin/clang
 CPP=		/usr/bin/clang-cpp
 CXX=		/usr/bin/clang++
--- oyranos.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bsam 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jul 17 13:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180608 
State-Changed-From-To: open->closed 
State-Changed-By: bsam 
State-Changed-When: Wed Aug 7 10:10:49 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180608 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180608: commit references a PR
Date: Wed,  7 Aug 2013 10:10:19 +0000 (UTC)

 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%%
 -@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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
