ports/144650: [maintainer] lang/stklos: various port improvements

[Vitaly Magerya]

>Number:         144650
>Category:       ports
>Synopsis:       [maintainer] lang/stklos: various port improvements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 11 10:00:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Vitaly Magerya
>Release:        FreeBSD 8.0-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
The attached patch:
* Enables threading support (unconditionally as I see no reasons not to).
* Fixes stklos-install by replacing "wget" with "fetch" in it.
* Changes "stklos.org" to "stklos.net" in pkg-descr and stklos-pkg.
  This is needed because STklos moved it's homepage and package server.
* Adds cons25 to the list of recognized terminals that support ANSI colors.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN stklos.orig/Makefile stklos/Makefile
--- stklos.orig/Makefile	2010-03-11 01:21:43.000000000 +0200
+++ stklos/Makefile	2010-03-11 01:18:48.000000000 +0200
@@ -7,7 +7,7 @@
 
 PORTNAME=	stklos
 PORTVERSION=	0.98
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.stklos.net/download/ \
 		ftp://kaolin.essi.fr/pub/STklos/
@@ -18,7 +18,7 @@
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		ffi.5:${PORTSDIR}/devel/libffi \
-		gc.1:${PORTSDIR}/devel/boehm-gc
+		gc.1:${PORTSDIR}/devel/boehm-gc-threaded
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -29,16 +29,20 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk	\
 		--disable-gnome	\
-		--enable-threads=none
+		--enable-threads=posix
 
 MAN1=		stklos-compile.1 stklos-config.1 stklos-genlex.1 stklos.1 \
 		stklos-install.1
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' \
+		-e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's|- at VERSION@||' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e '/&&/s|make|gmake|; /&&/s|configure|./configure|' \
-		${WRKSRC}/utils/stklos-install
+		-e 's|wget|fetch|' ${WRKSRC}/utils/stklos-install
+	@${REINPLACE_CMD} -e 's|stklos\.org|stklos.net|' \
+		${WRKSRC}/pkgman/params.stk
 
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -E -e 's/^(install-data-am:).*/\1 install-man install-schemeDATA/' \
diff -ruN stklos.orig/files/patch-lib-repl.stk stklos/files/patch-lib-repl.stk
--- stklos.orig/files/patch-lib-repl.stk	1970-01-01 03:00:00.000000000 +0300
+++ stklos/files/patch-lib-repl.stk	2010-02-19 19:44:41.000000000 +0200
@@ -0,0 +1,11 @@
+--- lib/repl.stk.orig	2010-02-19 19:43:51.000000000 +0200
++++ lib/repl.stk	2010-02-19 19:44:11.000000000 +0200
+@@ -44,7 +44,7 @@
+ (define do-color
+   (if (and (not (key-get *%program-args* :interactive #f))
+ 	   (member (getenv "TERM")
+-		   '("rxvt" "xterm" "xterm-color" "linux" "cygwin")))
++		   '("rxvt" "xterm" "xterm-color" "linux" "cygwin" "cons25")))
+       ;; Terminal accepts color
+       ansi-color
+       ;; Provide a procedure which ignore color indications
diff -ruN stklos.orig/pkg-descr stklos/pkg-descr
--- stklos.orig/pkg-descr	2010-03-11 01:21:43.000000000 +0200
+++ stklos/pkg-descr	2010-02-19 19:04:47.000000000 +0200
@@ -4,4 +4,4 @@
 be compiled as a library, so that one can easily embed it in an
 application.
 
-WWW: http://www.stklos.org/
+WWW: http://www.stklos.net/


>Release-Note:
>Audit-Trail:
>Unformatted: