diff options
| author | marino <marino@FreeBSD.org> | 2015-12-21 18:18:38 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2015-12-21 18:18:38 +0800 |
| commit | 4daa58b691090efaed038b82ca9dc4bebfd65a12 (patch) | |
| tree | b197984862d0b86af014bb06d62681feed570d7a /lang/fpc-units | |
| parent | ca77e0ed437a634df1f4ea042dd8cd506af63e6c (diff) | |
| download | freebsd-ports-gnome-4daa58b691090efaed038b82ca9dc4bebfd65a12.tar.gz freebsd-ports-gnome-4daa58b691090efaed038b82ca9dc4bebfd65a12.tar.zst freebsd-ports-gnome-4daa58b691090efaed038b82ca9dc4bebfd65a12.zip | |
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.
Diffstat (limited to 'lang/fpc-units')
| -rw-r--r-- | lang/fpc-units/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile index aeecb62230b8..c3b1ed45f58e 100644 --- a/lang/fpc-units/Makefile +++ b/lang/fpc-units/Makefile @@ -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 DBLIB DBUS DTS FASTCGI \ 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= |