Date: Thu, 16 Oct 2014 19:44:14 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371018 - in head/math/libproj4: . files Message-ID: <201410161944.s9GJiECx040329@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410161944.s9GJiECx040329>