6 files changed, 132 insertions, 258 deletions

diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile
index aab1a63cf041..39d70ae0600c 100644
--- a/lang/tensile/Makefile
+++ b/lang/tensile/Makefile
@@ -7,25 +7,32 @@
 #
 
 PORTNAME=	tensile
-PORTVERSION=	0.9p8
+PORTVERSION=	0.9
+PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://savannah.gnu.org/download/nsl/ \
 		http://iling.nw.ru/~artem/downloads/ \
 		http://unixpages.org/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/pre/}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The New Scripting Language
+COMMENT=	A programming languages designed for especially complex processing texts
 
-BROKEN=		"Does not compile"
+LIB_DEPENDS=	utils.1:${PORTSDIR}/lang/libutils
 
-LIB_DEPENDS=	utils:${PORTSDIR}/lang/libutils
-
-INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+LIBTOOLFLAGS=	# none
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-module-postgres
+MAKE_ARGS=	CFLAGS="${CFLAGS}"
+INSTALLS_SHLIB=	yes
+
+MAN1=		sl.1 sla.1
+MAN7=		docstrip.7t sl_crypt.7t sl_files.7t sl_fpmath.7t sl_int64.7t \
+		sl_ncurses.7t sl_postgres.7t sl_rand.7t sl_readline.7t
 
 .include <bsd.port.pre.mk>
 
@@ -33,4 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|= -module$$|= -module -avoid-version|g'
+
 .include <bsd.port.post.mk>
diff --git a/lang/tensile/distinfo b/lang/tensile/distinfo
index da3b09603668..68e13ac52e89 100644
--- a/lang/tensile/distinfo
+++ b/lang/tensile/distinfo
@@ -1 +1 @@
-MD5 (tensile-0.9pre8.tar.gz) = 65caa8032354c4c4af92c221dd7a6697
+MD5 (tensile-0.9.tar.gz) = 33aef6af31dd07e27f4eae36ac25c0ed
diff --git a/lang/tensile/files/patch-Makefile.in b/lang/tensile/files/patch-Makefile.in
deleted file mode 100644
index 4c74a58c24ed..000000000000
--- a/lang/tensile/files/patch-Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.in.orig	Wed Jul 24 06:21:39 2002
-+++ Makefile.in	Thu Jul 25 13:56:49 2002
-@@ -105,9 +105,9 @@
- 
- AUTOMAKE_OPTIONS = foreign no-installman
- 
--@USEMODULES_TRUE@SUBDIRS = modules libltdl
-+@USEMODULES_TRUE@SUBDIRS = modules
- 
--nsldir = $(libdir)/nsl
-+nsldir = $(datadir)/nsl
- moddir = $(nsldir)/modules
- autodir = $(nsldir)/automata
- scriptdir = $(nsldir)/scripts
-@@ -186,7 +186,7 @@
- 
- EXTRA_libnslcore_la_SOURCES = gdbm_table.c
- 
--libnslcore_la_DEPENDENCIES = libnslsh.la libnslpdt.la @libdir@/libutils.la
-+libnslcore_la_DEPENDENCIES = libnslsh.la libnslpdt.la ${LOCALBASE}/lib/libutils.la
- 
- libnslpdt_la_DEPENDENCIES = libnslsh.la
- libnslpdt_la_LIBADD = libnslsh.la
-@@ -271,7 +271,7 @@
- 	Makefile.in TODO acconfig.h aclocal.m4 config.guess config.h.in \
- 	config.sub configure configure.in depcomp install-sh ltconfig \
- 	ltmain.sh missing mkinstalldirs
--DIST_SUBDIRS = modules libltdl
-+DIST_SUBDIRS = modules
- SOURCES = $(libnslcore_la_SOURCES) $(EXTRA_libnslcore_la_SOURCES) $(libnslpdt_la_SOURCES) $(libnslsh_la_SOURCES) $(sl_SOURCES) $(sla_SOURCES)
- 
- all: config.h
diff --git a/lang/tensile/files/patch-configure b/lang/tensile/files/patch-configure
new file mode 100644
index 000000000000..1857d01307ec
--- /dev/null
+++ b/lang/tensile/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sat Jan  4 22:06:49 2003
++++ configure	Mon Jul 21 23:16:45 2003
+@@ -7827,6 +7827,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/lang/tensile/pkg-descr b/lang/tensile/pkg-descr
index 0b4056cb46a4..22d9ebe96744 100644
--- a/lang/tensile/pkg-descr
+++ b/lang/tensile/pkg-descr
@@ -1,20 +1,11 @@
-The NSL (The New Scripting Language) is a scripting language intended
-primarily for processing text documents in various input formats and in
-various languages. It is being developed as to be as light-weight as possible,
-however, providing a possibility to solve a wide range of tasks. It can be
-used as a stand-alone tool, as well as a CGI engine. It is not intended to be
-embeddable like Tcl, but since the interpreter is very compact, it can be
-attached to an application without great overhead.
+Tensile is a brand-new programming languages designed especially
+for complex processing texts in SGML-like formats. Its key feature
+is the notion of finite-state automata used for defining text
+transformations. Tensile has been designed, too, for Web programming,
+so it has inherent CGI capabilities.
 
-The NSL should be easy to learn. Its syntax is much simplier than that of perl
-or even awk and is more like Tcl or csh. It has, however, some peculiarities
-in syntax, as well as in programming techniques, so it would probably require
-some time to get accustomed to.
-
-However, the NSL is not a quick-development language. Its core does not and
-shall not include 'complete solutions'. Inspite of its rather high level, it
-should be regarded as a toolbox by the means of which a programmer may
-implement what he wants. Only such approach (IMHO) may allow to keep the
-language small, efficient, easy both to learn and to use.
+Tensile is an exTENSIbLE language which means that (a) pluggable
+modules are supported and (b) user-defined and predefined entities
+are mostly treated in the same way.
 
 WWW: http://www.freesoftware.fsf.org/nsl/
diff --git a/lang/tensile/pkg-plist b/lang/tensile/pkg-plist
index ccb9ceb07e44..662cdab30d64 100644
--- a/lang/tensile/pkg-plist
+++ b/lang/tensile/pkg-plist
@@ -1,230 +1,124 @@
+bin/docstrip
 bin/sl
 bin/sla
-lib/libnslcore.a
-lib/libnslcore.la
-lib/libnslcore.so
-lib/libnslcore.so.0
-lib/libnslpdt.a
-lib/libnslpdt.la
-lib/libnslpdt.so
-lib/libnslpdt.so.0
-lib/libnslsh.a
-lib/libnslsh.la
-lib/libnslsh.so
-lib/libnslsh.so.0
-lib/nsl/modules/crypt.a
+lib/libtenpdt.a
+lib/libtenpdt.la
+lib/libtenpdt.so
+lib/libtenpdt.so.0
+lib/libtensile.a
+lib/libtensile.la
+lib/libtensile.so
+lib/libtensile.so.0
+lib/nsl/automata/arith.aut
+lib/nsl/automata/ascii.aut
+lib/nsl/automata/base64enc.aut
+lib/nsl/automata/chardef.aui
+lib/nsl/automata/cp1251.aut
+lib/nsl/automata/emailtrn.aut
+lib/nsl/automata/empty.aut
+lib/nsl/automata/escape.aut
+lib/nsl/automata/html.aut
+lib/nsl/automata/intconv.aut
+lib/nsl/automata/koi8r.aut
+lib/nsl/automata/linefilter.aut
+lib/nsl/automata/swabytes.aut
+lib/nsl/automata/unicode.aut
+lib/nsl/automata/urlencode.aut
+lib/nsl/automata/utf8.aut
+lib/nsl/automata/whole.aut
+lib/nsl/module.map
 lib/nsl/modules/crypt.la
 lib/nsl/modules/crypt.scm
 lib/nsl/modules/crypt.so
-lib/nsl/modules/crypt.so.0
-lib/nsl/modules/files.a
 lib/nsl/modules/files.la
 lib/nsl/modules/files.scm
 lib/nsl/modules/files.so
-lib/nsl/modules/files.so.0
-lib/nsl/modules/fpmath.a
 lib/nsl/modules/fpmath.la
 lib/nsl/modules/fpmath.scm
 lib/nsl/modules/fpmath.so
-lib/nsl/modules/fpmath.so.0
-lib/nsl/modules/int64.a
 lib/nsl/modules/int64.la
 lib/nsl/modules/int64.scm
 lib/nsl/modules/int64.so
-lib/nsl/modules/int64.so.0
-lib/nsl/modules/ncurses.a
 lib/nsl/modules/ncurses.la
 lib/nsl/modules/ncurses.scm
 lib/nsl/modules/ncurses.so
-lib/nsl/modules/ncurses.so.0
-lib/nsl/modules/rand.a
 lib/nsl/modules/rand.la
 lib/nsl/modules/rand.scm
 lib/nsl/modules/rand.so
-lib/nsl/modules/rand.so.0
-lib/nsl/modules/readline.a
 lib/nsl/modules/readline.la
 lib/nsl/modules/readline.scm
 lib/nsl/modules/readline.so
-lib/nsl/modules/readline.so.0
-lib/nsl/modules/sockets.a
 lib/nsl/modules/sockets.la
 lib/nsl/modules/sockets.scm
 lib/nsl/modules/sockets.so
-lib/nsl/modules/sockets.so.0
-lib/nsl/modules/time.a
 lib/nsl/modules/time.la
 lib/nsl/modules/time.scm
 lib/nsl/modules/time.so
-lib/nsl/modules/time.so.0
-share/nsl/automata/arith.aut
-share/nsl/automata/ascii.aut
-share/nsl/automata/base64enc.aut
-share/nsl/automata/cp1251.aut
-share/nsl/automata/emailtrn.aut
-share/nsl/automata/empty.aut
-share/nsl/automata/escape.aut
-share/nsl/automata/html.aut
-share/nsl/automata/intconv.aut
-share/nsl/automata/koi8r.aut
-share/nsl/automata/linefilter.aut
-share/nsl/automata/swabytes.aut
-share/nsl/automata/unicode.aut
-share/nsl/automata/urlencode.aut
-share/nsl/automata/utf8.aut
-share/nsl/module.map
-share/nsl/preload.scm
-share/nsl/scripts/base64enc.sc
-share/nsl/scripts/bstream.sc
-share/nsl/scripts/charlist.sc
-share/nsl/scripts/docstrip/docstrip.sc
-share/nsl/scripts/docstrip/docstrip_spec.t
-share/nsl/scripts/docstrip/docstrip_spec.txt
-share/nsl/scripts/docstrip/mktodo.sc
-share/nsl/scripts/edittable.sc
-share/nsl/scripts/empty.sc
-share/nsl/scripts/fileutil.sc
-share/nsl/scripts/fixhtml.sc
-share/nsl/scripts/fontlist.sc
-share/nsl/scripts/forumsend.sc
-share/nsl/scripts/getopt.sc
-share/nsl/scripts/getopt.sci
-share/nsl/scripts/html2tex.sc
-share/nsl/scripts/htmlarg.sc
-share/nsl/scripts/htmlinc.sc
-share/nsl/scripts/htmlprep.sc
-share/nsl/scripts/htmlprepaux.sc
-share/nsl/scripts/iden2xml.sc
-share/nsl/scripts/linefilter.sc
-share/nsl/scripts/loadsess.sc
-share/nsl/scripts/mailbox.sc
-share/nsl/scripts/mailbox.sci
-share/nsl/scripts/man2html.sc
-share/nsl/scripts/mkidentity.sc
-share/nsl/scripts/mktable.sc
-share/nsl/scripts/mktodo.sc
-share/nsl/scripts/mktrie.sc
-share/nsl/scripts/mkvote.sc
-share/nsl/scripts/newsmaker.sc
-share/nsl/scripts/registry.sci
-share/nsl/scripts/safehtml.sc
-share/nsl/scripts/sendmsg.sc
-share/nsl/scripts/session.sc
-share/nsl/scripts/sets.sc
-share/nsl/scripts/shorthtml.sc
-share/nsl/scripts/slexec.sc
-share/nsl/scripts/snml2html.sc
-share/nsl/scripts/sqlque.sc
-share/nsl/scripts/subscribe.sc
-share/nsl/scripts/tagmaster.sc
-share/nsl/scripts/tmr-cgi.sc
-share/nsl/scripts/tmr.sc
-share/nsl/scripts/tsh.sc
-share/nsl/scripts/unicode.sc
-share/nsl/scripts/utf8html.sc
-share/nsl/scripts/version.sc
-share/nsl/scripts/viewtable.sc
-share/nsl/scripts/voteman.sc
-share/nsl/scripts/voteres.sc
-share/nsl/scripts/wlist.sc
-share/nsl/scripts/words.sc
-share/nsl/scripts/xtranslate.sc
-share/nsl/tables/ent2tex.t
-share/nsl/tables/ent2tex.txt
-share/nsl/tables/entities.t
-share/nsl/tables/entities.txt
-share/nsl/tables/entities4.txt
-share/nsl/tables/sgmlent.t
-share/nsl/tables/sgmlent.txt
-share/nsl/test/fields.aut
-share/nsl/test/pattern.aut
-share/nsl/test/pattern2.aut
-share/nsl/test/test.aut
-share/nsl/test/test.tm.sc
-share/nsl/test/test1.sc
-share/nsl/test/test11.sc
-share/nsl/test/test12.sc
-share/nsl/test/test13.sc
-share/nsl/test/test14.sc
-share/nsl/test/test15.sc
-share/nsl/test/test16.sc
-share/nsl/test/test17.sc
-share/nsl/test/test18.sc
-share/nsl/test/test19.sc
-share/nsl/test/test2.sc
-share/nsl/test/test20.sc
-share/nsl/test/test21.sc
-share/nsl/test/test22.sc
-share/nsl/test/test23.sc
-share/nsl/test/test24.sc
-share/nsl/test/test25.sc
-share/nsl/test/test26.sc
-share/nsl/test/test27.sc
-share/nsl/test/test3.sc
-share/nsl/test/test30.sc
-share/nsl/test/test31.sc
-share/nsl/test/test34.sc
-share/nsl/test/test35.sc
-share/nsl/test/test36.sc
-share/nsl/test/test37.sc
-share/nsl/test/test38.sc
-share/nsl/test/test39.sc
-share/nsl/test/test4.sc
-share/nsl/test/test40.sc
-share/nsl/test/test41.sc
-share/nsl/test/test42.sc
-share/nsl/test/test47.sc
-share/nsl/test/test48.sc
-share/nsl/test/test49.sc
-share/nsl/test/test5.sc
-share/nsl/test/test50.sc
-share/nsl/test/test51.sc
-share/nsl/test/test52.sc
-share/nsl/test/test53.sc
-share/nsl/test/test54.sc
-share/nsl/test/test55.sc
-share/nsl/test/test56.sc
-share/nsl/test/test57.sc
-share/nsl/test/test58.sc
-share/nsl/test/test59.sc
-share/nsl/test/test6.sc
-share/nsl/test/test60.sc
-share/nsl/test/test61.sc
-share/nsl/test/test64.sc
-share/nsl/test/test65.sc
-share/nsl/test/test66.sc
-share/nsl/test/test67.sc
-share/nsl/test/test68.sc
-share/nsl/test/test69.sc
-share/nsl/test/test7.sc
-share/nsl/test/test70.sc
-share/nsl/test/test71.sc
-share/nsl/test/test72.sc
-share/nsl/test/test73.sc
-share/nsl/test/test8.sc
-share/nsl/test/test9.sc
-share/nsl/test/test_bad.sc
-share/nsl/test/test_getopt.sc
-share/nsl/test/test_new.aut
-share/nsl/test/test_new1.aut
-share/nsl/test/testa.sc
-share/nsl/test/testcb.sc
-share/nsl/test/testflow.sc
-share/nsl/test/testfwd.sc
-share/nsl/test/testline.sc
-share/nsl/test/testp.sc
-share/nsl/test/testr.sc
-share/nsl/test/testsess.sc
-share/nsl/test/testsess1.sc
-share/nsl/test/testsql.sc
-share/nsl/test/teststo.sc
-share/nsl/test/testtrie.aut
-share/nsl/test/testx.sc
-@dirrm share/nsl/test
-@dirrm share/nsl/tables
-@dirrm share/nsl/scripts/docstrip
-@dirrm share/nsl/scripts
-@dirrm share/nsl/automata
-@dirrm share/nsl
+lib/nsl/preload.scm
+lib/nsl/scripts/base64enc.sc
+lib/nsl/scripts/bstream.sc
+lib/nsl/scripts/charlist.sc
+lib/nsl/scripts/counter.sc
+lib/nsl/scripts/diversion.sc
+lib/nsl/scripts/docstrip/docstrip.fmt
+lib/nsl/scripts/docstrip/docstrip_html.sc
+lib/nsl/scripts/docstrip/docstrip_man.sc
+lib/nsl/scripts/docstrip/docstrip_plain.sc
+lib/nsl/scripts/docstrip.sc
+lib/nsl/scripts/edittable.sc
+lib/nsl/scripts/empty.sc
+lib/nsl/scripts/fileutil.sc
+lib/nsl/scripts/fixhtml.sc
+lib/nsl/scripts/fontlist.sc
+lib/nsl/scripts/forumsend.sc
+lib/nsl/scripts/getopt.sc
+lib/nsl/scripts/getopt.sci
+lib/nsl/scripts/html2tex.sc
+lib/nsl/scripts/htmlinc.sc
+lib/nsl/scripts/htmlprep.sc
+lib/nsl/scripts/htmlprepaux.sc
+lib/nsl/scripts/iden2xml.sc
+lib/nsl/scripts/keeptrack.sc
+lib/nsl/scripts/linefilter.sc
+lib/nsl/scripts/loadsess.sc
+lib/nsl/scripts/mailbox.sc
+lib/nsl/scripts/mailbox.sci
+lib/nsl/scripts/man2html.sc
+lib/nsl/scripts/mkidentity.sc
+lib/nsl/scripts/mktable.sc
+lib/nsl/scripts/mktrie.sc
+lib/nsl/scripts/mkvote.sc
+lib/nsl/scripts/newsindex.sc
+lib/nsl/scripts/newsmaker.sc
+lib/nsl/scripts/registry.sci
+lib/nsl/scripts/safehtml.sc
+lib/nsl/scripts/sendmsg.sc
+lib/nsl/scripts/session.sc
+lib/nsl/scripts/sets.sc
+lib/nsl/scripts/shorthtml.sc
+lib/nsl/scripts/slexec.sc
+lib/nsl/scripts/snml2html.sc
+lib/nsl/scripts/sqlque.sc
+lib/nsl/scripts/subscribe.sc
+lib/nsl/scripts/tagmaster.sc
+lib/nsl/scripts/tmr-cgi.sc
+lib/nsl/scripts/tmr.sc
+lib/nsl/scripts/tsh.sc
+lib/nsl/scripts/unicode.sc
+lib/nsl/scripts/utf8html.sc
+lib/nsl/scripts/version.sc
+lib/nsl/scripts/viewtable.sc
+lib/nsl/scripts/voteman.sc
+lib/nsl/scripts/voteres.sc
+lib/nsl/scripts/wlist.sc
+lib/nsl/scripts/words.sc
+lib/nsl/scripts/xtranslate.sc
+lib/nsl/tables/ent2tex.t
+lib/nsl/tables/entities.t
+lib/nsl/tables/sgmlent.t
+@dirrm lib/nsl/tables
+@dirrm lib/nsl/scripts/docstrip
+@dirrm lib/nsl/scripts
 @dirrm lib/nsl/modules
+@dirrm lib/nsl/automata
 @dirrm lib/nsl