Date: Mon, 30 Dec 2013 20:52:03 +0100 (CET) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185306: [patch] lang/ofc: depend on lang/gcc instead of lang/gcc46 Message-ID: <201312301952.rBUJq3aY026004@kalimero.tijl.coosemans.org> Resent-Message-ID: <201312302000.rBUK00jC082957@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
.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 <bsd.port.mk>
--- ofc.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312301952.rBUJq3aY026004>