svn commit: r326685 - in head: devel/mercator math/wfmath

[Gerald Pfeifer]

On Sat, 7 Sep 2013, Oliver Lehmann wrote:
> Modified: head/devel/mercator/Makefile
> ==============================================================================
> --- head/devel/mercator/Makefile	Sat Sep  7 20:42:39 2013	(r326684)
> +++ head/devel/mercator/Makefile	Sat Sep  7 20:43:45 2013	(r326685)
> @@ -14,6 +14,7 @@ LIB_DEPENDS=	wfmath-1.0.1:${PORTSDIR}/ma
>  USES=	pathfix pkgconfig
>  GNU_CONFIGURE=	yes
>  USE_LDCONFIG=	yes
> +USE_GCC=	yes

I noticed this has CXXFLAGS=${CXXFLAGS} for CONFIGURE_ARGS which
should be coverd by Mk/bsd.port.mk and old-style LIB_DEPENDS.

How about the patch below?

Gerald @FreeBSD.org


Index: devel/mercator/Makefile
===================================================================
--- devel/mercator/Makefile	(revision 326698)
+++ devel/mercator/Makefile	(working copy)
@@ -9,7 +9,7 @@
 MAINTAINER=	oliver at FreeBSD.org
 COMMENT=	A procedural terrain library
 
-LIB_DEPENDS=	wfmath-1.0.1:${PORTSDIR}/math/wfmath
+LIB_DEPENDS=	libwfmath.so:${PORTSDIR}/math/wfmath
 
 USES=	pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -17,6 +17,5 @@
 USE_GCC=	yes
 
 CXXFLAGS+=	-include wchar.h
-CONFIGURE_ARGS+="CXXFLAGS=${CXXFLAGS}"
 
 .include <bsd.port.mk>