From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 30 20:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93224D1F for ; Mon, 30 Dec 2013 20:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 6A15C1976 for ; Mon, 30 Dec 2013 20:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBUK00U6082958 for ; Mon, 30 Dec 2013 20:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBUK00jC082957; Mon, 30 Dec 2013 20:00:00 GMT (envelope-from gnats) Resent-Date: Mon, 30 Dec 2013 20:00:00 GMT Resent-Message-Id: <201312302000.rBUK00jC082957@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tijl Coosemans 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 ESMTPS id 81530BE8 for ; Mon, 30 Dec 2013 19:53:16 +0000 (UTC) Received: from mailrelay008.isp.belgacom.be (mailrelay008.isp.belgacom.be [195.238.6.174]) by mx1.freebsd.org (Postfix) with ESMTP id 18AF11927 for ; Mon, 30 Dec 2013 19:53:15 +0000 (UTC) Received: from 251.67-129-109.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([109.129.67.251]) by relay.skynet.be with ESMTP; 30 Dec 2013 20:52:05 +0100 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 rBUJq3uB026005 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 30 Dec 2013 20:52:04 +0100 (CET) (envelope-from tijl@kalimero.tijl.coosemans.org) Received: (from tijl@localhost) by kalimero.tijl.coosemans.org (8.14.7/8.14.7/Submit) id rBUJq3aY026004; Mon, 30 Dec 2013 20:52:03 +0100 (CET) (envelope-from tijl) Message-Id: <201312301952.rBUJq3aY026004@kalimero.tijl.coosemans.org> Date: Mon, 30 Dec 2013 20:52:03 +0100 (CET) From: Tijl Coosemans To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/185306: [patch] lang/ofc: depend on lang/gcc instead of lang/gcc46 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Tijl Coosemans List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2013 20:00:00 -0000 >Number: 185306 >Category: ports >Synopsis: [patch] lang/ofc: depend on lang/gcc instead of lang/gcc46 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 30 20:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 11.0-CURRENT i386 >Organization: >Environment: >Description: Currently lang/ofc depends on lang/gcc46 which conflicts with lang/gcc that many other ports use (USE_GCC=yes). This means that when you try to install the ofc package you can easily get a conflict error. The attached patch makes the port use USE_GCC=4.6. This sets up CC, CXX, LDFLAGS, BUILD_DEPENDS and RUN_DEPENDS for lang/gcc (and later for lang/gcc46 when lang/gcc is eventually updated to version 4.7). The patch also uses the new LIB_DEPENDS syntax and adds stage support. >How-To-Repeat: >Fix: --- ofc.patch begins here --- Index: lang/ofc/Makefile =================================================================== --- lang/ofc/Makefile (revision 337955) +++ lang/ofc/Makefile (working copy) @@ -3,17 +3,17 @@ PORTNAME= ofc PORTVERSION= 0.8.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MASTER_SITES= GOOGLE_CODE MAINTAINER= vanilla@FreeBSD.org COMMENT= The Objective-C Foundation Classes library -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ - png15:${PORTSDIR}/graphics/png \ - jpeg:${PORTSDIR}/graphics/jpeg \ - freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libpng15.so:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libfreetype.so:${PORTSDIR}/print/freetype2 PROJECTHOST= ${PORTNAME} USE_SDL= sdl @@ -26,27 +26,19 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_L OPTIONS_DEFINE= GDBM GMP -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm +LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm .endif .if ${PORT_OPTIONS:MGMP} -LIB_DEPENDS+= gmp:${PORTSDIR}/math/gmp +LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp .endif .if ${OSVERSION} >= 900000 # needs libobjc -GCCSUFFIX= 46 -CC= gcc${GCCSUFFIX} -CXX= g++${GCCSUFFIX} -OFC_GCC_PORT?= lang/gcc${GCCSUFFIX} -TARGLIB!= ${MAKE} -C ${PORTSDIR}/${OFC_GCC_PORT} -V TARGLIB -LDFLAGS+= -L${TARGLIB} -BUILD_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT} -RUN_DEPENDS+= ${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT} +USE_GCC= 4.6 .endif .include --- ofc.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: