Upgrade this from 2.1p3 to 2.2a2 (thanks to fenner's script for the heads

up). Including:

	. give up trying to fix the configure and switch to Mskefile.bsd;
	. use the tests bundled with the software (currently -- three);
	. don't install the HTML documentation -- the man-pages are now
	  available -- generated from the same source as HTML files;
	. don't compile the stubs support and install the library next to
	  its pkgIndex.tcl under the lib/tcl${TCL_VER}/;
	. the project now lives on SourceForge.

7 files changed, 35 insertions, 119 deletions

diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 2d8fe6795d60..5333992a2d8d 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -6,43 +6,38 @@
 #
 
 PORTNAME=	memchan
-PORTVERSION=	2.1p3
+PORTVERSION=	2.2a2
 CATEGORIES=	devel tcl83
-MASTER_SITES=	http://www.oche.de/~akupries/soft/memchan/download/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 PKGNAMEPREFIX=	tcl-
 DISTNAME=	memchan${PORTVERSION}
+MASTER_SITE_SUBDIR=${PORTNAME}
 
 MAINTAINER=	mi@aldan.algebra.com
 
-BUILD_DEPENDS=	tclsh${TCLV}:${PORTSDIR}/lang/tcl${TCLVND}
-.if !exists(/usr/bin/bzip2)
-LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2
-.endif
+BUILD_DEPENDS=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//}
 
 USE_BZIP2=	yes
-USE_OPENSSL=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
+MAKEFILE=	${FILESDIR}/Makefile.bsd
+MAKE_ARGS+=	-j2
 
-GNU_CONFIGURE=	yes
-PLIST_SUB+=	TCLV=${TCLV} TCLVND=${TCLVND}
-CONFIGURE_ARGS=	--with-tcl-include-dir=${PREFIX}/include/tcl${TCLV} \
-		--with-tcl-lib-dir=${PREFIX}/lib/tcl${TCLV}
+TCL_VER?=		8.3
+DDIR=		${PREFIX}/lib/tcl${TCL_VER}/Trf
 
-#ALL_TARGET=	library
+MAKE_ENV+=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
+		INSTALL_DATA="${INSTALL_DATA}"
 
-TCLV?=		8.3
-TCLVND=		${TCLV:S/.//}
-DDIR=		${PREFIX}/lib/tcl${TCLV}/Trf
+# Too bad, n is no longer an acceptable section for bsd.man.mk
+MANN=	memchan.n fifo.n fifo2.n null.n
 
-do-install:
-	${MKDIR} ${PREFIX}/lib/tcl${TCLV}/memchan
-	${INSTALL_DATA} ${WRKSRC}/libmemchan.so.1 ${PREFIX}/lib/
-	${SED} 's@%%PREFIX%%@${PREFIX}@g' < ${FILESDIR}/pkgIndex.tcl \
-		> ${PREFIX}/lib/tcl${TCLV}/memchan/pkgIndex.tcl
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/memchan
-	${CP} -pR ${WRKSRC}/../doc/html/* ${PREFIX}/share/doc/memchan/
-.endif
+post-install:
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann
+#.ifndef(NOPORTDOCS)
+#	${MKDIR} ${DOCSDIR}
+#	${CP} -pR ${WRKSRC}/doc/html/* ${DOCSDIR}
+#.endif
 
 .include <bsd.port.mk>
+
+PLIST_SUB!=	${SETENV} TCL_VER=${TCL_VER} ${MAKE} -f ${MAKEFILE} env
diff --git a/devel/tcl-memchan/distinfo b/devel/tcl-memchan/distinfo
index 4f8805bb37f7..511479ad97b6 100644
--- a/devel/tcl-memchan/distinfo
+++ b/devel/tcl-memchan/distinfo
@@ -1 +1 @@
-MD5 (memchan2.1p3.tar.bz2) = 020a5236c266224f34a03ad7ac65eb13
+MD5 (memchan2.2a2.tar.bz2) = 8bcee09f9b875bfba9f8ed953524766d
diff --git a/devel/tcl-memchan/files/patch-conf b/devel/tcl-memchan/files/patch-conf
deleted file mode 100644
index 440bc58de650..000000000000
--- a/devel/tcl-memchan/files/patch-conf
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure	Sat Jan 15 15:51:23 2000
-+++ configure	Mon May 22 18:04:39 2000
-@@ -1051,65 +1051,2 @@
- 
--
--echo $ac_n "checking for tcl library""... $ac_c" 1>&6
--echo "configure:1055: checking for tcl library" >&5
--if eval "test \"`echo '$''{'memchan_cv_lib_TCL_LIB'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  memchan_cv_lib_TCL_LIB=""
--	 places="$TCL_LIB_DIR \
--	../../tcl8.2.*/unix \
--	../../tcl8.2/unix \
--	../../tcl8.2b*/unix \
--	../../tcl8.2a*/unix \
--	../../tcl8.1.*/unix \
--	../../tcl8.1/unix \
--	../../tcl8.1b*/unix \
--	../../tcl8.1a*/unix \
--	../../tcl8.0.*/unix \
--	../../tcl8.0/unix \
--	../../tcl/unix \
--	../../tcl \
--	 $exec_prefix/lib \
--	 $prefix/lib \
--	 /usr/local/lib \
--	 /usr/lib"
--    for dir in $places; do
--        if test -n "$memchan_cv_lib_TCL_LIB"; then
--            break
--        fi
--        for version in 8.2 8.1.1 8.1 8.0.5 8.0.4 8.0.3 8.0 82 811 81 805 804 803 80 ""; do
--            if test -n "$memchan_cv_lib_TCL_LIB"; then
--                break
--            fi
--            for libsuff in .so ".so.*" .sl .a; do
--                if test -n "$memchan_cv_lib_TCL_LIB"; then
--                    break
--                fi
--                if test -f $dir/libtcl$version$libsuff; then
--                    memchan_cv_lib_TCL_LIB="-L$dir -ltcl$version"
--		    TCL_LIB_DIR="$dir"
--                fi
--            done
--        done
--    done
--fi
--
--echo "$ac_t""$memchan_cv_lib_TCL_LIB" 1>&6
--
--TCL_LIB="$memchan_cv_lib_TCL_LIB"
--if test -z "$TCL_LIB" ; then
--    { echo "configure: error: not found; use --with-tcl-lib-dir=path" 1>&2; exit 1; }
--fi
--
--
--
--if eval "test \"`echo '$''{'memchan_cv_TCL_LIB_DIR'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  memchan_cv_TCL_LIB_DIR="$TCL_LIB_DIR"
--fi
--
--TCL_LIB_DIR="$memchan_cv_TCL_LIB_DIR"
--
--
- #--------------------------------------------------------------------
diff --git a/devel/tcl-memchan/files/patch-mkin b/devel/tcl-memchan/files/patch-mkin
deleted file mode 100644
index a46b291d7612..000000000000
--- a/devel/tcl-memchan/files/patch-mkin
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.in	Sat Jan 15 15:51:20 2000
-+++ Makefile.in	Mon May 22 18:08:28 2000
-@@ -244,3 +244,3 @@
- 	rm -f		$(MEMCHAN_LIB_FILE)
--	@MAKE_LIB@
-+	@MAKE_LIB@ -L$(prefix)/lib
- 	$(RANLIB)	$(MEMCHAN_LIB_FILE)
diff --git a/devel/tcl-memchan/files/patch-stubs b/devel/tcl-memchan/files/patch-stubs
new file mode 100644
index 000000000000..ab00c03e759e
--- /dev/null
+++ b/devel/tcl-memchan/files/patch-stubs
@@ -0,0 +1,9 @@
+--- generic/init.c	Tue Sep 26 16:52:50 2000
++++ generic/init.c	Fri Jan 25 14:13:31 2002
+@@ -87,5 +87,5 @@
+ 			(Tcl_CmdDeleteProc*) NULL);
+ 
+-#if GT81
++#ifdef USE_TCL_STUBS
+     /* register extension and its interfaces as now available package
+      */
diff --git a/devel/tcl-memchan/pkg-descr b/devel/tcl-memchan/pkg-descr
index fce69a469d4a..d7f93f5bf7d7 100644
--- a/devel/tcl-memchan/pkg-descr
+++ b/devel/tcl-memchan/pkg-descr
@@ -7,4 +7,4 @@ interpreters, and  additionally provide an easy  interface to on-the-fly
 generation of code too. No need to set  or append to a string, just do a
 simple puts.
 
-WWW:	http://www.oche.de/~akupries/soft/memchan/
+WWW:	http://memchan.sourceforge.net/
diff --git a/devel/tcl-memchan/pkg-plist b/devel/tcl-memchan/pkg-plist
index 68aeda46a693..88084b708f53 100644
--- a/devel/tcl-memchan/pkg-plist
+++ b/devel/tcl-memchan/pkg-plist
@@ -1,17 +1,4 @@
-lib/libmemchan.so.1
-lib/tcl%%TCLV%%/memchan/pkgIndex.tcl
-@dirrm lib/tcl%%TCLV%%/memchan
-%%PORTDOCS%%share/doc/memchan/img/up.gif
-%%PORTDOCS%%share/doc/memchan/memchan_ack.html
-%%PORTDOCS%%share/doc/memchan/memchan_bdist.html
-%%PORTDOCS%%share/doc/memchan/memchan_cmac.html
-%%PORTDOCS%%share/doc/memchan/memchan_cmds.html
-%%PORTDOCS%%share/doc/memchan/memchan_compile.html
-%%PORTDOCS%%share/doc/memchan/memchan_ctea.html
-%%PORTDOCS%%share/doc/memchan/memchan_cunix.html
-%%PORTDOCS%%share/doc/memchan/memchan_cwin.html
-%%PORTDOCS%%share/doc/memchan/index.html
-%%PORTDOCS%%share/doc/memchan/memchan_where.html
-%%PORTDOCS%%share/doc/memchan/sitemap.html
-%%PORTDOCS%%@dirrm share/doc/memchan/img/
-%%PORTDOCS%%@dirrm share/doc/memchan/
+%%DIR%%/pkgIndex.tcl
+%%DIR%%/%%SHLIB_NAME%%
+%%DIR%%/%%SHLIB_LINK%%
+@dirrm %%DIR%%