svn commit: r406935 - in branches/2016Q1/devel: pure-ffi pure-stldict pure-stldict/files

[Vanilla I. Shu]

Author: vanilla
Date: Fri Jan 22 15:56:26 2016
New Revision: 406935
URL: https://svnweb.freebsd.org/changeset/ports/406935

Log:
  MFH: r406819 r406827 r406927
  
  1: Upgrade to 0.8.
  2: remove USE_GCC, it's compilable with clang.
  3: Fix broken MASTER_SITES.
  4: Fix build with gcc4.9.
  
  PR:		204385
  Submitted by:	gerald@, w.schwarzenfeld at aon.at
  Approved by: 	portmgr@ (antoine)

Added:
  branches/2016Q1/devel/pure-stldict/files/patch-hashdict.cc
     - copied unchanged from r406827, head/devel/pure-stldict/files/patch-hashdict.cc
  branches/2016Q1/devel/pure-stldict/files/patch-orddict.cc
     - copied unchanged from r406827, head/devel/pure-stldict/files/patch-orddict.cc
Modified:
  branches/2016Q1/devel/pure-ffi/Makefile
  branches/2016Q1/devel/pure-stldict/Makefile
  branches/2016Q1/devel/pure-stldict/distinfo
  branches/2016Q1/devel/pure-stldict/files/patch-Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/devel/pure-ffi/Makefile
==============================================================================
--- branches/2016Q1/devel/pure-ffi/Makefile	Fri Jan 22 14:57:22 2016	(r406934)
+++ branches/2016Q1/devel/pure-ffi/Makefile	Fri Jan 22 15:56:26 2016	(r406935)
@@ -4,7 +4,7 @@
 PORTNAME=	pure-ffi
 PORTVERSION=	0.13
 CATEGORIES=	devel
-MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+MASTER_SITES=	https://bitbucket.org/purelang/pure-lang/downloads/
 DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray at gmail.com

Modified: branches/2016Q1/devel/pure-stldict/Makefile
==============================================================================
--- branches/2016Q1/devel/pure-stldict/Makefile	Fri Jan 22 14:57:22 2016	(r406934)
+++ branches/2016Q1/devel/pure-stldict/Makefile	Fri Jan 22 15:56:26 2016	(r406935)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	pure-stldict
-PORTVERSION=	0.5
-PORTREVISION=	4
+PORTVERSION=	0.8
 CATEGORIES=	devel
-MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
+MASTER_SITES=	https://bitbucket.org/purelang/pure-lang/downloads/
 DIST_SUBDIR=	pure
 
 MAINTAINER=	lichray at gmail.com
@@ -14,9 +13,8 @@ COMMENT=	Pure interface to C++ STL map/u
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-USES=		pure
+USES=		pkgconfig pure
 
-USE_GCC=	yes
 CXXFLAGS+=	-std=c++0x -DHAVE_STD_IS_PERMUTATION
 
 PORTDOCS=	README

Modified: branches/2016Q1/devel/pure-stldict/distinfo
==============================================================================
--- branches/2016Q1/devel/pure-stldict/distinfo	Fri Jan 22 14:57:22 2016	(r406934)
+++ branches/2016Q1/devel/pure-stldict/distinfo	Fri Jan 22 15:56:26 2016	(r406935)
@@ -1,2 +1,2 @@
-SHA256 (pure/pure-stldict-0.5.tar.gz) = 3c12b4e15d79955e28d025d62525685e3bdbf4a07a3849cffad82eeb578e022b
-SIZE (pure/pure-stldict-0.5.tar.gz) = 64968
+SHA256 (pure/pure-stldict-0.8.tar.gz) = 5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28
+SIZE (pure/pure-stldict-0.8.tar.gz) = 69024

Modified: branches/2016Q1/devel/pure-stldict/files/patch-Makefile
==============================================================================
--- branches/2016Q1/devel/pure-stldict/files/patch-Makefile	Fri Jan 22 14:57:22 2016	(r406934)
+++ branches/2016Q1/devel/pure-stldict/files/patch-Makefile	Fri Jan 22 15:56:26 2016	(r406935)
@@ -1,27 +1,11 @@
---- ./Makefile.orig	2012-03-22 19:47:34.000000000 +0100
-+++ ./Makefile	2014-01-04 17:44:05.000000000 +0100
-@@ -4,11 +4,11 @@
- 
- # platform-specific setup
- 
--DLL         = $(shell pkg-config pure --variable DLL)
--PIC         = $(shell pkg-config pure --variable PIC)
--shared      = $(shell pkg-config pure --variable shared)
-+DLL         = .so
-+PIC         = -fPIC
-+shared      = -shared
- 
--libdir      = $(shell pkg-config pure --variable libdir)
-+libdir      = $(prefix)/lib
- installdir  = $(addprefix $(DESTDIR), $(libdir)/pure)
- 
- MOD_CXXFLAGS  = $(PIC) $(shell pkg-config pure --cflags) $(CXXFLAGS) $(CPPFLAGS)
-@@ -25,7 +25,7 @@
+--- Makefile.orig	2014-03-22 20:23:33 UTC
++++ Makefile
+@@ -30,7 +30,7 @@ objects = $(patsubst %.cc, %$(DLL), $(cp
  all: $(objects)
  
  %$(DLL): %.cc
--	g++ $(shared) -o $@ $(MOD_CXXFLAGS) $< $(MOD_LDFLAGS) $(LIBS)
-+	$(CXX) $(shared) $(CPPFLAGS) $(CXXFLAGS) $(PIC) $< -o $@ $(LDFLAGS) -lpure $(LIBS)
+-	g++ $(shared) $(dllname) -o $@ $(MOD_CXXFLAGS) $< $(MOD_LDFLAGS) $(LIBS)
++	$(CXX) $(shared) $(dllname) -o $@ $(MOD_CXXFLAGS) $< $(MOD_LDFLAGS) $(LIBS)
  
  clean:
  	rm -f *.o *$(DLL) examples/life *~

Copied: branches/2016Q1/devel/pure-stldict/files/patch-hashdict.cc (from r406827, head/devel/pure-stldict/files/patch-hashdict.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/devel/pure-stldict/files/patch-hashdict.cc	Fri Jan 22 15:56:26 2016	(r406935, copy of r406827, head/devel/pure-stldict/files/patch-hashdict.cc)
@@ -0,0 +1,11 @@
+--- hashdict.cc.orig	2016-01-21 06:37:40 UTC
++++ hashdict.cc
+@@ -1,6 +1,8 @@
+ 
+ // This uses unordered_map, so a recent C++ library is required for now.
+ 
++#include <stddef.h>
++#include <cstddef>
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <string.h>

Copied: branches/2016Q1/devel/pure-stldict/files/patch-orddict.cc (from r406827, head/devel/pure-stldict/files/patch-orddict.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/devel/pure-stldict/files/patch-orddict.cc	Fri Jan 22 15:56:26 2016	(r406935, copy of r406827, head/devel/pure-stldict/files/patch-orddict.cc)
@@ -0,0 +1,11 @@
+--- orddict.cc.orig	2016-01-21 06:38:47 UTC
++++ orddict.cc
+@@ -1,6 +1,8 @@
+ 
+ // This is completely analogous to hashdict.cc (which see).
+ 
++#include <stddef.h>
++#include <cstddef>
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <string.h>