svn commit: r404086 - in head: devel/fpc-bfd lang/fpc-units

[John Marino]

Author: marino
Date: Mon Dec 21 10:18:38 2015
New Revision: 404086
URL: https://svnweb.freebsd.org/changeset/ports/404086

Log:
  lang/fpc-units, devel/fpc-bfd: Use binutils instead of ancient libbfd
  
  Currently, lang/fpc-bfd can't be installed if devel/binutils is already
  on the system.  Given that this is a requirement for lang/gcc and other
  big patches, chances are there will be a conflict.  Resolve the problem
  by making devel/fpc-bfd depend on devel/binutils instead.  This also
  allows the BFD option on FreeBSD9 to be re-enabled.

Modified:
  head/devel/fpc-bfd/Makefile
  head/lang/fpc-units/Makefile

Modified: head/devel/fpc-bfd/Makefile
==============================================================================
--- head/devel/fpc-bfd/Makefile	Mon Dec 21 09:57:34 2015	(r404085)
+++ head/devel/fpc-bfd/Makefile	Mon Dec 21 10:18:38 2015	(r404086)
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBBFD
 LIBBFD_DESC=	Install Universal BFD library from GNU binutils
 OPTIONS_DEFAULT=	LIBBFD
 
-LIBBFD_RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd
+LIBBFD_RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/binutils
 
 .include "${MASTERDIR}/Makefile"

Modified: head/lang/fpc-units/Makefile
==============================================================================
--- head/lang/fpc-units/Makefile	Mon Dec 21 09:57:34 2015	(r404085)
+++ head/lang/fpc-units/Makefile	Mon Dec 21 10:18:38 2015	(r404086)
@@ -3,6 +3,7 @@
 
 PORTNAME=	units
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	lang
 PKGNAMEPREFIX=	fpc-
 
@@ -14,7 +15,7 @@ USES=		metaport
 
 BUILDNAME=	${ARCH}-${OPSYS:tl}
 
-ALL_OPTIONS=	A52 ASPELL BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \
+ALL_OPTIONS=	A52 ASPELL BFD BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \
 		FCL_ASYNC FCL_BASE FCL_DB FCL_EXTRA FCL_FPCUNIT FCL_IMAGE \
 		FCL_JS FCL_JSON FCL_NET FCL_PASSRC FCL_REGISTRY FCL_RES \
 		FCL_SDO FCL_SOUND FCL_STL FCL_WEB FCL_XML FFTW \
@@ -25,7 +26,7 @@ ALL_OPTIONS=	A52 ASPELL BZIP2 CAIRO CHM 
 		RTL_EXTRA RTL_OBJPAS RTL_UNICODE SDL SVGALIB SYMBOLIC \
 		SYSLOG TCL UNZIP USERS UTMP UUID X11 XFORMS ZLIB
 
-OPTIONS_DEFINE:=	${ALL_OPTIONS} BFD
+OPTIONS_DEFINE:=	${ALL_OPTIONS}
 OPTIONS_DEFAULT:=	${ALL_OPTIONS}
 
 A52_DESC=		Interface to a52 library
@@ -104,12 +105,6 @@ X11_DESC=		Interface to X windows server
 XFORMS_DESC=		Interface to X-Forms
 ZLIB_DESC=		Interface to the zlib compression library
 
-.if !exists(/usr/include/lwres)	# directory only exists on FreeBSD 9
-# On FreeBSD 9, CAIRO is built with GCC which pulls in binutils
-# binutils and BFD conflict, so BFD and CAIRO cannot coexist on F9
-OPTIONS_DEFAULT+=	BFD
-.endif
-
 .include <bsd.port.options.mk>
 
 UNITS_SELECTED=