Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Feb 2014 07:32:40 +0000 (UTC)
From:      Oliver Lehmann <oliver@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346447 - in head/devel: eris mercator mercator/files
Message-ID:  <201402280732.s1S7Wend050399@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oliver
Date: Fri Feb 28 07:32:40 2014
New Revision: 346447
URL: http://svnweb.freebsd.org/changeset/ports/346447
QAT: https://qat.redports.org/buildarchive/r346447/

Log:
  update mercator to 0.3.3

Deleted:
  head/devel/mercator/files/patch-Merecator-iround.h
Modified:
  head/devel/eris/Makefile
  head/devel/mercator/Makefile
  head/devel/mercator/distinfo
  head/devel/mercator/pkg-plist

Modified: head/devel/eris/Makefile
==============================================================================
--- head/devel/eris/Makefile	Fri Feb 28 07:28:36 2014	(r346446)
+++ head/devel/eris/Makefile	Fri Feb 28 07:32:40 2014	(r346447)
@@ -10,19 +10,19 @@ MASTER_SITES=	SF/worldforge/Eris%201.4%2
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge client entity library
 
-LIB_DEPENDS=	Atlas-0.6.2:${PORTSDIR}/devel/atlas-devel \
-		skstream-0.3.7:${PORTSDIR}/net/skstream \
-		wfmath-1.0.1:${PORTSDIR}/math/wfmath \
-		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
-		mercator-0.3.3:${PORTSDIR}/devel/mercator
+LIB_DEPENDS=	libAtlas-0.6.so:${PORTSDIR}/devel/atlas-devel \
+		libskstream-0.3.so:${PORTSDIR}/net/skstream \
+		libwfmath-1.0.so:${PORTSDIR}/math/wfmath \
+		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libmercator-0.3.so:${PORTSDIR}/devel/mercator
 
+CONFIGURE_ARGS= --disable-silent-rules
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=	pathfix pkgconfig
+USES=		pathfix pkgconfig
 USE_GCC=	yes
 
 CXXFLAGS+=	-include wchar.h
-CONFIGURE_ARGS+="CXXFLAGS=${CXXFLAGS}"
 
 NO_STAGE=	yes
 .include <bsd.port.mk>

Modified: head/devel/mercator/Makefile
==============================================================================
--- head/devel/mercator/Makefile	Fri Feb 28 07:28:36 2014	(r346446)
+++ head/devel/mercator/Makefile	Fri Feb 28 07:32:40 2014	(r346447)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mercator
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.3.3
+#PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
 
@@ -12,11 +12,16 @@ COMMENT=	A procedural terrain library
 
 LIB_DEPENDS=	libwfmath-1.0.so:${PORTSDIR}/math/wfmath
 
-USES=	pathfix pkgconfig
+CONFIGURE_ARGS=	--disable-silent-rules
+USES=		pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GCC=	yes
+USE_GCC=	4.7+
 
 CXXFLAGS+=	-include wchar.h
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|std::lround|lround|g' ${WRKSRC}/Mercator/iround.h
+
 .include <bsd.port.mk>

Modified: head/devel/mercator/distinfo
==============================================================================
--- head/devel/mercator/distinfo	Fri Feb 28 07:28:36 2014	(r346446)
+++ head/devel/mercator/distinfo	Fri Feb 28 07:32:40 2014	(r346447)
@@ -1,2 +1,2 @@
-SHA256 (mercator-0.3.2.tar.gz) = 5388299694545b266d0c232fc7124ec52d88fef69159b0acd38919fd1095fcc1
-SIZE (mercator-0.3.2.tar.gz) = 432442
+SHA256 (mercator-0.3.3.tar.gz) = 04c71d780979a2b43835b8b30879b39c4d7688661dab8e2bf7046ef9e7aff1e9
+SIZE (mercator-0.3.3.tar.gz) = 436499

Modified: head/devel/mercator/pkg-plist
==============================================================================
--- head/devel/mercator/pkg-plist	Fri Feb 28 07:28:36 2014	(r346446)
+++ head/devel/mercator/pkg-plist	Fri Feb 28 07:32:40 2014	(r346447)
@@ -1,6 +1,6 @@
 lib/libmercator-0.3.la
 lib/libmercator-0.3.so
-lib/libmercator-0.3.so.3
+lib/libmercator-0.3.so.4
 include/Mercator-0.3/Mercator/Effector.h
 include/Mercator-0.3/Mercator/Mercator.h
 include/Mercator-0.3/Mercator/Matrix.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402280732.s1S7Wend050399>