svn commit: r371018 - in head/math/libproj4: . files
Thierry Thomas
thierry at FreeBSD.org
Thu Oct 16 19:44:15 UTC 2014
Author: thierry
Date: Thu Oct 16 19:44:14 2014
New Revision: 371018
URL: https://svnweb.freebsd.org/changeset/ports/371018
QAT: https://qat.redports.org/buildarchive/r371018/
Log:
Rescue the build on FreeBSD < 10 with libmissing.
Reported by: pkg-fallout
Added:
head/math/libproj4/files/patch-proj_ftmerc.c (contents, props changed)
Modified:
head/math/libproj4/Makefile
Modified: head/math/libproj4/Makefile
==============================================================================
--- head/math/libproj4/Makefile Thu Oct 16 19:29:33 2014 (r371017)
+++ head/math/libproj4/Makefile Thu Oct 16 19:44:14 2014 (r371018)
@@ -22,13 +22,18 @@ USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MDOCS}
DISTFILES+= manual.pdf
EXTRACT_ONLY= ${PORTNAME}.${DISTVERSION}${EXTRACT_SUFX}
.endif
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034
+LIB_DEPENDS+= libmissing.so:${PORTSDIR}/math/libmissing
+LDFLAGS+= -lmissing
+.endif
+
pre-configure:
${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/${MAKEFILE}
@@ -38,4 +43,4 @@ post-install:
${INSTALL_DATA} ${_DISTDIR}/manual.pdf ${STAGEDIR}${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Added: head/math/libproj4/files/patch-proj_ftmerc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/libproj4/files/patch-proj_ftmerc.c Thu Oct 16 19:44:14 2014 (r371018)
@@ -0,0 +1,13 @@
+--- ./proj_ftmerc.c.orig 2008-11-20 18:40:28.000000000 +0100
++++ ./proj_ftmerc.c 2014-10-16 21:31:30.000000000 +0200
+@@ -31,6 +31,10 @@
+ #define PROJ_LIB__
+ #include <lib_proj.h>
+ #include <complex.h>
++#include <sys/param.h>
++#if defined(__FreeBSD__) && (__FreeBSD_version < 1000034)
++# include <missing_complex.h>
++#endif
+ PROJ_HEAD(ftmerc, "French Transverse Mercator") "\n\tCyl, Ell";
+
+ /* forward series constants */
More information about the svn-ports-all
mailing list