Update to 3.1.

5 files changed, 38 insertions, 47 deletions

diff --git a/lang/squirrel/Makefile b/lang/squirrel/Makefile
index 80505b3da780..1225de0af38d 100644
--- a/lang/squirrel/Makefile
+++ b/lang/squirrel/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	squirrel
-PORTVERSION=	2.2.5
+DISTVERSION=	3_1
 CATEGORIES=	lang
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}2/${PORTNAME}%20${PORTVERSION}%20stable
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}3/${PORTNAME}%20${PORTVERSION}%20stable
 DISTNAME=	${PORTNAME}_${DISTVERSION}_stable
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,34 +12,9 @@ COMMENT=	High level imperative/OO programming language
 
 CONFLICTS=	squsq-[0-9]*
 
-USES=		dos2unix
+USES=		cmake dos2unix
+CMAKE_ARGS=	-DINSTALL_INC_DIR:STRING=include
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/SQUIRREL2
+WRKSRC=		${WRKDIR}/${PORTNAME}3
 
-CFLAGS_aarch64=	-fPIC
-CFLAGS_amd64=	-fPIC
-CFLAGS_sparc64=	-fPIC
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == sparc64
-ALL_TARGET=	sq64
-.else
-ALL_TARGET=	sq32
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \
-		-e '/^MAKE/d; s|gcc|$${CC}|; s|-O2|$${CFLAGS}|; s|g++|$${CXX}|' \
-		-e 's|\.a|.so|g; s|ar rc|$${CC} ${CFLAGS} -shared -o|'
-	@${REINPLACE_CMD} -e '/cd / s|$$|\&\& cd ..|' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/sq ${STAGEDIR}${PREFIX}/bin
-	(cd ${WRKSRC}/lib && ${INSTALL_LIB} libsqstdlib.so libsquirrel.so \
-		${STAGEDIR}${PREFIX}/lib)
-	@${LN} -sf libsqstdlib.so ${STAGEDIR}${PREFIX}/lib/libsqstdlib.so.0
-	@${LN} -sf libsquirrel.so ${STAGEDIR}${PREFIX}/lib/libsquirrel.so.0
-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/squirrel/distinfo b/lang/squirrel/distinfo
index 422533730780..47b23ba9fb2e 100644
--- a/lang/squirrel/distinfo
+++ b/lang/squirrel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (squirrel_2.2.5_stable.tar.gz) = 8667e181ac2e0428d60d74a4fae6b5c15b8ed0f0933253cc7cf1aaa847d0ee25
-SIZE (squirrel_2.2.5_stable.tar.gz) = 420352
+TIMESTAMP = 1487088121
+SHA256 (squirrel_3_1_stable.tar.gz) = 4845a7fb82e4740bde01b0854112e3bb92a0816ad959c5758236e73f4409d0cb
+SIZE (squirrel_3_1_stable.tar.gz) = 616961
diff --git a/lang/squirrel/files/patch-CMakeLists.txt b/lang/squirrel/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..7d504adea6b0
--- /dev/null
+++ b/lang/squirrel/files/patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+--- CMakeLists.txt.orig	2017-02-14 16:19:11 UTC
++++ CMakeLists.txt
+@@ -11,19 +11,9 @@ project(squirrel C CXX)
+ 
+ include_directories(${CMAKE_SOURCE_DIR}/include)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
++if(CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
+   set(SQ_FLAGS -fno-exceptions -fno-strict-aliasing -Wall -Wextra -pedantic -Wcast-qual)
+ 
+-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+-    set(SQ_FLAGS ${SQ_FLAGS} -O3)
+-  elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+-    set(SQ_FLAGS ${SQ_FLAGS} -O3 -g)
+-  elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+-    set(SQ_FLAGS ${SQ_FLAGS} -Os)
+-  elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-    set(SQ_FLAGS ${SQ_FLAGS} -pg -pie -gstabs -g3 -Og)
+-  endif()
+-
+   if(CMAKE_VERSION VERSION_GREATER 3)
+     add_compile_options(${SQ_FLAGS})
+   else()
diff --git a/lang/squirrel/files/patch-squirrel-squtils.h b/lang/squirrel/files/patch-squirrel-squtils.h
deleted file mode 100644
index 298aa9a470bb..000000000000
--- a/lang/squirrel/files/patch-squirrel-squtils.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- squirrel/squtils.h.orig	2008-10-14 18:36:01.000000000 +0400
-+++ squirrel/squtils.h	2013-08-30 19:26:36.769227465 +0400
-@@ -2,6 +2,11 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+/* clang fix: "error: call to function 'sq_vm_free' that is neither visible in the template definition nor found by argument-dependent lookup" */
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));
diff --git a/lang/squirrel/pkg-plist b/lang/squirrel/pkg-plist
index 69e6c87516d6..f4f7d5e310ec 100644
--- a/lang/squirrel/pkg-plist
+++ b/lang/squirrel/pkg-plist
@@ -1,4 +1,6 @@
 bin/sq
+bin/sq_static
+include/sqconfig.h
 include/sqstdaux.h
 include/sqstdblob.h
 include/sqstdio.h
@@ -8,5 +10,9 @@ include/sqstdsystem.h
 include/squirrel.h
 lib/libsqstdlib.so
 lib/libsqstdlib.so.0
+lib/libsqstdlib.so.0.0.0
+lib/libsqstdlib_static.a
 lib/libsquirrel.so
 lib/libsquirrel.so.0
+lib/libsquirrel.so.0.0.0
+lib/libsquirrel_static.a