Bug 185306 - [patch] lang/ofc: depend on lang/gcc instead of lang/gcc46
Summary: [patch] lang/ofc: depend on lang/gcc instead of lang/gcc46
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Vanilla I. Shu
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-30 20:00 UTC by Tijl Coosemans
Modified: 2014-01-01 04:30 UTC (History)
0 users

See Also:


Attachments
ofc.patch (1.55 KB, patch)
2013-12-30 20:00 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer freebsd_triage 2013-12-30 20:00:00 UTC
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.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-30 20:00:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->vanilla

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Vanilla I. Shu freebsd_committer freebsd_triage 2014-01-01 03:50:18 UTC
State Changed
From-To: open->closed

Committed, thanks.
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-01 04:28:08 UTC
Author: vanilla
Date: Wed Jan  1 03:50:04 2014
New Revision: 338353
URL: http://svnweb.freebsd.org/changeset/ports/338353

Log:
  1: convert LIB_DEPENDS to new format.
  2: remove NO_STAGE.
  3: use USE_GCC=4.6 instead.
  
  PR:		ports/185306
  Submitted by:	tijl@

Modified:
  head/lang/ofc/Makefile
  head/lang/ofc/pkg-plist

Modified: head/lang/ofc/Makefile
==============================================================================
--- head/lang/ofc/Makefile	Wed Jan  1 03:43:00 2014	(r338352)
+++ head/lang/ofc/Makefile	Wed Jan  1 03:50:04 2014	(r338353)
@@ -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>

Modified: head/lang/ofc/pkg-plist
==============================================================================
--- head/lang/ofc/pkg-plist	Wed Jan  1 03:43:00 2014	(r338352)
+++ head/lang/ofc/pkg-plist	Wed Jan  1 03:50:04 2014	(r338353)
@@ -65,11 +65,11 @@ include/ofc/DRnd.h
 include/ofc/DRndDist.h
 include/ofc/DSHA1.h
 include/ofc/DSHA256.h
-include/ofc/DSimpleFont.h
 include/ofc/DScore.h
 include/ofc/DScreenHandler.h
 include/ofc/DShort.h
 include/ofc/DSimpleArithmetic.h
+include/ofc/DSimpleFont.h
 include/ofc/DSizeable.h
 include/ofc/DSocket.h
 include/ofc/DSocketAddress.h
@@ -102,9 +102,9 @@ include/ofc/config.h
 include/ofc/md5.h
 include/ofc/settings.h
 include/ofc/warning.h
+lib/libofc-0.8.so
+lib/libofc-0.8.so.1
 lib/libofc.a
 lib/libofc.la
 lib/libofc.so
-lib/libofc-0.8.so
-lib/libofc-0.8.so.1
 @dirrm include/ofc
_______________________________________________
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"