- Update to 0.98

- Pass maintainership to submitter

PR:		131349
Submtted by:	Vitaly Magerya <vmagerya at gmail dot com>

5 files changed, 80 insertions, 30 deletions

diff --git a/lang/stklos/Makefile b/lang/stklos/Makefile
index da214c9c3529..97f5f8e422a3 100644
--- a/lang/stklos/Makefile
+++ b/lang/stklos/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	stklos
-PORTVERSION=	0.82
-PORTREVISION=	2
+PORTVERSION=	0.98
 CATEGORIES=	lang scheme
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www.stklos.org/download/ \
+		ftp://kaolin.essi.fr/pub/STklos/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	vmagerya@gmail.com
 COMMENT=	The successor of the STk Scheme interpreter
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
+		pcre.0:${PORTSDIR}/devel/pcre \
+		ffi.5:${PORTSDIR}/devel/libffi \
 		gc.1:${PORTSDIR}/devel/boehm-gc
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -35,13 +36,6 @@ MAN1=		stklos-compile.1 stklos-config.1 stklos-genlex.1 stklos.1 \
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's|-@VERSION@||' ${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} -e 's|^function ||' \
-		${WRKSRC}/utils/stklos-config.in \
-		${WRKSRC}/utils/stklos-ext-install \
-		${WRKSRC}/utils/stklos-install
-	@${REINPLACE_CMD} -e 's|$UID = 0|`id -u` -eq 0|' \
-		${WRKSRC}/utils/stklos-ext-install \
-		${WRKSRC}/utils/stklos-install
 	@${REINPLACE_CMD} -e '/&&/s|make|gmake|; /&&/s|configure|./configure|' \
 		${WRKSRC}/utils/stklos-install
 
diff --git a/lang/stklos/distinfo b/lang/stklos/distinfo
index 2d6c277a15c9..8ce30ba5c476 100644
--- a/lang/stklos/distinfo
+++ b/lang/stklos/distinfo
@@ -1,3 +1,3 @@
-MD5 (stklos-0.82.tar.gz) = 2dad9823a2b34fd0dccc1a63a7978cbb
-SHA256 (stklos-0.82.tar.gz) = 6d8e8a9577292faad5845218cd0289140bef4b8b398760e6eb0287b3c563672c
-SIZE (stklos-0.82.tar.gz) = 4077458
+MD5 (stklos-0.98.tar.gz) = f641b2f04b5805ce570db034fcf64d3b
+SHA256 (stklos-0.98.tar.gz) = c809e1e5999e987b94b918e8d6556ab5b19ffef8b9b8a3a4a56ec94579ef9b93
+SIZE (stklos-0.98.tar.gz) = 5306627
diff --git a/lang/stklos/files/patch-configure b/lang/stklos/files/patch-configure
new file mode 100644
index 000000000000..2c4d5e2fbb2e
--- /dev/null
+++ b/lang/stklos/files/patch-configure
@@ -0,0 +1,31 @@
+--- configure.orig	2008-05-03 23:43:30.000000000 +0300
++++ configure	2009-02-02 23:23:42.000000000 +0200
+@@ -6790,15 +6790,20 @@
+ 
+ 
+ if test "$USER_FFI" = "yes" ;then
+-  echo "Configuring libffi"
+-  (cd ffi; CC=${CC} CFLAGS=${CFLAGS} ./configure \
+-           --disable-structs --disable-raw-api --disable-shared \
+-	   --prefix=$prefix)
+-  LIBS="$LIBS ../ffi/.libs/libffi.a"
+-  CFLAGS="$CFLAGS -I../ffi/include"
+-  LIBFFI="ffi"
++#  echo "Configuring libffi"
++#  (cd ffi; CC=${CC} CFLAGS=${CFLAGS} ./configure \
++#           --disable-structs --disable-raw-api --disable-shared \
++#	   --prefix=$prefix)
++#  LIBS="$LIBS ../ffi/.libs/libffi.a"
++#  CFLAGS="$CFLAGS -I../ffi/include"
++#  LIBFFI="ffi"
++#  HAVE_FFI="#define HAVE_FFI 1"
++#  FFI="yes"
++  echo "Using the system libffi library"
++  LIBS="$LIBS -lffi"
++  LIBFFI=""
+   HAVE_FFI="#define HAVE_FFI 1"
+-  FFI="yes"
++  FFI="use the system library"
+ else
+   echo "Disabling FFI support"
+   LIBFFI=""
diff --git a/lang/stklos/pkg-descr b/lang/stklos/pkg-descr
index e3c15aa99cff..878a3feb92c0 100644
--- a/lang/stklos/pkg-descr
+++ b/lang/stklos/pkg-descr
@@ -4,4 +4,4 @@ implementation is based on an ad-hoc Virtual Machine.  STklos can also
 be compiled as a library, so that one can easily embed it in an
 application.
 
-WWW: http://stklos.sourceforge.net/
+WWW: http://www.stklos.org/
diff --git a/lang/stklos/pkg-plist b/lang/stklos/pkg-plist
index d48d9673dc37..3f501ded872e 100644
--- a/lang/stklos/pkg-plist
+++ b/lang/stklos/pkg-plist
@@ -4,7 +4,9 @@ bin/stklos-config
 bin/stklos-ext-install
 bin/stklos-genlex
 bin/stklos-install
+bin/stklos-pkg
 bin/stklos-script
+etc/stklos/Makefile-scmpkg.tmpl
 include/stklos/extraconf.h
 include/stklos/fport.h
 include/stklos/socket.h
@@ -18,11 +20,17 @@ lib/stklos/%%VERSION%%/ldap.so
 %%DATADIR%%/%%VERSION%%/Match.d/normalize.scm
 %%DATADIR%%/%%VERSION%%/Match.d/s2cfun.scm
 %%DATADIR%%/%%VERSION%%/STklos.init
+%%DATADIR%%/%%VERSION%%/ScmPkg.d/scmpkg-interface.stk
+%%DATADIR%%/%%VERSION%%/ScmPkg.d/scmpkg-languages.stk
 %%DATADIR%%/%%VERSION%%/assembler.stk
 %%DATADIR%%/%%VERSION%%/bb.stk
-%%DATADIR%%/%%VERSION%%/bigloo.stk
+%%DATADIR%%/%%VERSION%%/bigloo-support.stk
+%%DATADIR%%/%%VERSION%%/bigmatch.ostk
+%%DATADIR%%/%%VERSION%%/bigmatch.stk
 %%DATADIR%%/%%VERSION%%/bonus.stk
+%%DATADIR%%/%%VERSION%%/boot-callcc.stk
 %%DATADIR%%/%%VERSION%%/boot.stk
+%%DATADIR%%/%%VERSION%%/callcc.stk
 %%DATADIR%%/%%VERSION%%/compfile.ostk
 %%DATADIR%%/%%VERSION%%/compfile.stk
 %%DATADIR%%/%%VERSION%%/compiler.stk
@@ -30,14 +38,20 @@ lib/stklos/%%VERSION%%/ldap.so
 %%DATADIR%%/%%VERSION%%/date.stk
 %%DATADIR%%/%%VERSION%%/describe.ostk
 %%DATADIR%%/%%VERSION%%/describe.stk
+%%DATADIR%%/%%VERSION%%/env.ostk
+%%DATADIR%%/%%VERSION%%/env.stk
 %%DATADIR%%/%%VERSION%%/expand.pp
 %%DATADIR%%/%%VERSION%%/expand.ss
+%%DATADIR%%/%%VERSION%%/ffi.ostk
+%%DATADIR%%/%%VERSION%%/ffi.stk
 %%DATADIR%%/%%VERSION%%/full-conditions.ostk
 %%DATADIR%%/%%VERSION%%/full-conditions.stk
 %%DATADIR%%/%%VERSION%%/full-syntax.ostk
 %%DATADIR%%/%%VERSION%%/full-syntax.stk
 %%DATADIR%%/%%VERSION%%/getopt.ostk
 %%DATADIR%%/%%VERSION%%/getopt.stk
+%%DATADIR%%/%%VERSION%%/http.ostk
+%%DATADIR%%/%%VERSION%%/http.stk
 %%DATADIR%%/%%VERSION%%/lalr.ostk
 %%DATADIR%%/%%VERSION%%/lalr.stk
 %%DATADIR%%/%%VERSION%%/ldap.ostk
@@ -46,8 +60,6 @@ lib/stklos/%%VERSION%%/ldap.so
 %%DATADIR%%/%%VERSION%%/lex-rt.stk
 %%DATADIR%%/%%VERSION%%/load.stk
 %%DATADIR%%/%%VERSION%%/make-C-boot.stk
-%%DATADIR%%/%%VERSION%%/match.ostk
-%%DATADIR%%/%%VERSION%%/match.stk
 %%DATADIR%%/%%VERSION%%/mbe.stk
 %%DATADIR%%/%%VERSION%%/module.stk
 %%DATADIR%%/%%VERSION%%/multilex.scm
@@ -58,10 +70,15 @@ lib/stklos/%%VERSION%%/ldap.so
 %%DATADIR%%/%%VERSION%%/pp.stk
 %%DATADIR%%/%%VERSION%%/process.stk
 %%DATADIR%%/%%VERSION%%/r5rs.stk
+%%DATADIR%%/%%VERSION%%/recette.ostk
+%%DATADIR%%/%%VERSION%%/recette.stk
 %%DATADIR%%/%%VERSION%%/regexp.stk
 %%DATADIR%%/%%VERSION%%/repl.stk
 %%DATADIR%%/%%VERSION%%/runtime.stk
+%%DATADIR%%/%%VERSION%%/scmpkg-support.ostk
+%%DATADIR%%/%%VERSION%%/scmpkg-support.stk
 %%DATADIR%%/%%VERSION%%/silex.scm
+%%DATADIR%%/%%VERSION%%/slib.ostk
 %%DATADIR%%/%%VERSION%%/slib.stk
 %%DATADIR%%/%%VERSION%%/srfi-0.stk
 %%DATADIR%%/%%VERSION%%/srfi-1.ostk
@@ -90,34 +107,42 @@ lib/stklos/%%VERSION%%/ldap.so
 %%DATADIR%%/%%VERSION%%/srfi-36.stk
 %%DATADIR%%/%%VERSION%%/srfi-4.ostk
 %%DATADIR%%/%%VERSION%%/srfi-4.stk
+%%DATADIR%%/%%VERSION%%/srfi-45.ostk
+%%DATADIR%%/%%VERSION%%/srfi-45.stk
 %%DATADIR%%/%%VERSION%%/srfi-48.ostk
 %%DATADIR%%/%%VERSION%%/srfi-48.stk
+%%DATADIR%%/%%VERSION%%/srfi-59.ostk
+%%DATADIR%%/%%VERSION%%/srfi-59.stk
 %%DATADIR%%/%%VERSION%%/srfi-60.ostk
 %%DATADIR%%/%%VERSION%%/srfi-60.stk
 %%DATADIR%%/%%VERSION%%/srfi-66.ostk
 %%DATADIR%%/%%VERSION%%/srfi-66.stk
+%%DATADIR%%/%%VERSION%%/srfi-69.ostk
+%%DATADIR%%/%%VERSION%%/srfi-69.stk
 %%DATADIR%%/%%VERSION%%/srfi-7.ostk
 %%DATADIR%%/%%VERSION%%/srfi-7.stk
 %%DATADIR%%/%%VERSION%%/srfi-70.ostk
 %%DATADIR%%/%%VERSION%%/srfi-70.stk
+%%DATADIR%%/%%VERSION%%/srfi-89.ostk
+%%DATADIR%%/%%VERSION%%/srfi-89.stk
 %%DATADIR%%/%%VERSION%%/srfi-9.ostk
 %%DATADIR%%/%%VERSION%%/srfi-9.stk
 %%DATADIR%%/%%VERSION%%/struct.stk
+%%DATADIR%%/%%VERSION%%/tar.ostk
+%%DATADIR%%/%%VERSION%%/tar.stk
+%%DATADIR%%/%%VERSION%%/thread.stk
 %%DATADIR%%/%%VERSION%%/trace.ostk
 %%DATADIR%%/%%VERSION%%/trace.stk
+%%PORTDOCS%%%%DOCSDIR%%/html/doc-style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hierarchy.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-11.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-12.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-13.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-14.html
-%%DATADIR%%/%%VERSION%%/env.stk
-%%DATADIR%%/%%VERSION%%/srfi-69.stk
-%%DATADIR%%/%%VERSION%%/env.ostk
-%%DATADIR%%/%%VERSION%%/srfi-69.ostk
-%%DATADIR%%/%%VERSION%%/boot-callcc.stk
-%%DATADIR%%/%%VERSION%%/callcc.stk
-%%DATADIR%%/%%VERSION%%/thread.stk
+%%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-15.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-16.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-3.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-4.html
@@ -127,16 +152,16 @@ lib/stklos/%%VERSION%%/ldap.so
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref-9.html
 %%PORTDOCS%%%%DOCSDIR%%/html/stklos-ref.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-style.css
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hierarchy.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pdf/stklos-ref.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/%%VERSION%%/ScmPkg.d
 @dirrm %%DATADIR%%/%%VERSION%%/Match.d
 @dirrm %%DATADIR%%/%%VERSION%%
 @dirrm %%DATADIR%%
-@dirrm include/stklos
 @dirrm lib/stklos/%%VERSION%%
 @dirrm lib/stklos
+@dirrm include/stklos
+@dirrm etc/stklos