Upgrade from 2.2a4 to 2.2.1 (released in 2004).

4 files changed, 28 insertions, 13 deletions

diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 3483087e9023..0959c534fb6c 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	memchan
-PORTVERSION=	2.2a4
+PORTVERSION=	2.2.1
 CATEGORIES=	devel tcl
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 PKGNAMEPREFIX=	tcl-
-DISTNAME=	Memchan${PORTVERSION}
 MASTER_SITE_SUBDIR=${PORTNAME}
 
 MAINTAINER=	mi@aldan.algebra.com
@@ -18,19 +17,18 @@ COMMENT=	Two new channel types for in-memory channels in TCL8
 
 BUILD_DEPENDS=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//}
 
-USE_BZIP2=	yes
-
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ARGS+=	-j2
+MAKE_ARGS+=	-j`${SYSCTL} -n hw.ncpu`
 
-TCL_VER?=	8.4
+USE_TCL=	84+
 DDIR=		${PREFIX}/lib/tcl${TCL_VER}/Trf
 
 MAKE_ENV+=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
+		PORTVERSION="${PORTVERSION:R}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
 # Too bad, n is no longer an acceptable section for bsd.man.mk
-MANN=	memchan.n fifo.n fifo2.n null.n
+MANN= fifo.n fifo2.n memchan.n memchanapi.n null.n random.n zero.n
 
 post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann
diff --git a/devel/tcl-memchan/distinfo b/devel/tcl-memchan/distinfo
index 14dbcf7333a8..8518ae0140d5 100644
--- a/devel/tcl-memchan/distinfo
+++ b/devel/tcl-memchan/distinfo
@@ -1,3 +1,3 @@
-MD5 (Memchan2.2a4.tar.bz2) = 4016a2bbac5ef43b430416dad9e5be2a
-SHA256 (Memchan2.2a4.tar.bz2) = f3676145cd30bda855d76d50a0c009e5753e63eb5c1fa6414ba6d24156dc2ad4
-SIZE (Memchan2.2a4.tar.bz2) = 184532
+MD5 (memchan-2.2.1.tar.gz) = 07ef0aabff7a980959aa1a07bc73a520
+SHA256 (memchan-2.2.1.tar.gz) = ae62284b6a0ce96a9a602bff9766086d23c210f333882fd7c931359310413512
+SIZE (memchan-2.2.1.tar.gz) = 1169233
diff --git a/devel/tcl-memchan/files/Makefile.bsd b/devel/tcl-memchan/files/Makefile.bsd
index 98c11963cfc8..ec6c30db4722 100644
--- a/devel/tcl-memchan/files/Makefile.bsd
+++ b/devel/tcl-memchan/files/Makefile.bsd
@@ -1,17 +1,17 @@
 LIBNAME=	Memchan
 SHLIB_NAME=	lib${LIBNAME}.so.2
 
-.PATH:	${.CURDIR}/generic
+.PATH:	${.CURDIR}/generic ${.CURDIR}/isaac
 
 SRCS=	memchan.c init.c counter.c fifo.c fifo2.c null.c buf.c	\
 	bufFix.c bufExt.c bufRange.c bufQueue.c bufStubInit.c	\
-	bufStubLib.c
+	bufStubLib.c memchanStubInit.c zero.c random.c randport.c
 
 TCL_VER?=	8.3
 LOCALBASE?=	/usr/local
 
 CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} \
-		-DMEMCHAN_VERSION='"${SHLIB_MAJOR}.${SHLIB_MINOR}"'
+		-DMEMCHAN_VERSION='"${PORTVERSION}"'
 
 LDADD=		-L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//}
 
diff --git a/devel/tcl-memchan/files/patch-warnings b/devel/tcl-memchan/files/patch-warnings
index ca5b41a7c226..7717941ee17a 100644
--- a/devel/tcl-memchan/files/patch-warnings
+++ b/devel/tcl-memchan/files/patch-warnings
@@ -49,3 +49,20 @@
 -  return (int) Tcl_GetAssocData (interp, ASSOC, &proc);
 +  return (int)(long) Tcl_GetAssocData (interp, ASSOC, &proc);
  }
+--- generic/zero.c	2004-11-09 19:07:03.000000000 -0500
++++ generic/zero.c	2008-11-15 14:49:50.000000000 -0500
+@@ -33,4 +33,5 @@
+ 
+ #include "memchanInt.h"
++#include <string.h>
+ 
+ /*
+--- generic/random.c	2004-11-09 19:07:01.000000000 -0500
++++ generic/random.c	2008-11-15 14:51:14.000000000 -0500
+@@ -34,4 +34,6 @@
+ #include "../isaac/rand.h"
+ #include <time.h>
++#include <string.h>
++
+ /*
+  * Forward declarations of internal procedures.