From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 16 19:44:15 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 779297C5;
 Thu, 16 Oct 2014 19:44:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4A6455E3;
 Thu, 16 Oct 2014 19:44:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9GJiFfL040334;
 Thu, 16 Oct 2014 19:44:15 GMT (envelope-from thierry@FreeBSD.org)
Received: (from thierry@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9GJiECx040329;
 Thu, 16 Oct 2014 19:44:14 GMT (envelope-from thierry@FreeBSD.org)
Message-Id: <201410161944.s9GJiECx040329@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: thierry set sender to
 thierry@FreeBSD.org using -f
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Thu, 16 Oct 2014 19:44:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371018 - in head/math/libproj4: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Oct 2014 19:44:15 -0000

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 */