diff options
| author | John Marino <marino@FreeBSD.org> | 2015-12-21 10:18:38 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-12-21 10:18:38 +0000 |
| commit | 090b2c657f080758c23ee50d213c5e0506bee51f (patch) | |
| tree | b197984862d0b86af014bb06d62681feed570d7a | |
| parent | 971c1c596a20439ae4ce3f6c37cda56bd4c150a0 (diff) | |
Notes
| -rw-r--r-- | devel/fpc-bfd/Makefile | 2 | ||||
| -rw-r--r-- | lang/fpc-units/Makefile | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile index aeadfd13cf9b..675ae40170f5 100644 --- a/devel/fpc-bfd/Makefile +++ b/devel/fpc-bfd/Makefile @@ -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" 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= |