Attachment #133600 for bug #178083

View | Details | Raw Unified | Return to bug 178083
Collapse All | Expand All




# Created by: Mikhail Teterin <mi@aldan.algebra.com>
# Date created:			May 22, 2000
# Whom:				Mikhail Teterin <mi@aldan.algebra.com>
#
# $FreeBSD$
#
PORTNAME=	memchan
PORTVERSION=	2.3
CATEGORIES=	devel
CATEGORIES=	devel tcl
MASTER_SITES=	SF
PKGNAMEPREFIX=	tcl-
DISTNAME=	Memchan${PORTVERSION}
MAINTAINER=	mi@aldan.algebra.com
COMMENT=	Two new channel types for in-memory channels in TCL8
WRKSRC=		${WRKDIR}/${DISTNAME}
MAKEFILE=	${FILESDIR}/Makefile.bsd
MAKE_ARGS+=	-j`${SYSCTL} -n hw.ncpu`

USE_TCL=	84+
GNU_CONFIGURE=	yes
CFLAGS+=	-Wall
CONFIGURE_ARGS+=--prefix=${PREFIX} \
		--exec-prefix=${PREFIX} \
		--with-tcl=${TCL_LIBDIR}
PORTDOCS=	*
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
		INSTALL_DATA="${INSTALL_DATA}"
.include <bsd.port.options.mk>
post-patch:
	${REINPLACE_CMD} -e '/^install:/s|install-doc||' \
	    ${WRKSRC}/Makefile.in

.if ${PORT_OPTIONS:MDOCS}
post-install:
	${MKDIR} ${DOCSDIR}
	cd ${WRKSRC} && ${MAKE} doc-html
	cd ${WRKSRC} && ${COPYTREE_SHARE} \*.html ${DOCSDIR}
.endif
regression-test:
	cd ${WRKSRC} && ${MAKE} test

.include <bsd.port.mk>

PLIST_SUB!=	${SETENV} TCL_VER=${TCL_VER} ${MAKE} -f ${MAKEFILE} env

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (memchan-2.2.1.tar.gz) = ae62284b6a0ce96a9a602bff9766086d23c210f333882fd7c931359310413512	1	SHA256 (Memchan2.3.tar.gz) = adaa5952fe532a917372dcdbc873c082656c49b613d92b09e7938d8f276f2749
2	SIZE (memchan-2.2.1.tar.gz) = 1169233	2	SIZE (Memchan2.3.tar.gz) = 1786238




LIBNAME=	Memchan
SHLIB_NAME=	lib${LIBNAME}.so.2

.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 memchanStubInit.c zero.c random.c randport.c

TCL_VER?=	8.3
LOCALBASE?=	/usr/local

CFLAGS+=	-I${LOCALBASE}/include/tcl${TCL_VER} \
		-DMEMCHAN_VERSION='"${PORTVERSION}"'

LDADD=		-L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//}

all: pkgIndex.tcl test

pkgIndex.tcl:
	echo 'package ifneeded ${LIBNAME} 2.2 \
		[list load [file join $$dir $(SHLIB_NAME)]]' > pkgIndex.tcl

DIR	= lib/tcl${TCL_VER}/${LIBNAME}
LIBDIR	= ${PREFIX}/${DIR}
MANDIR	= ${PREFIX}/man/man

${LIBDIR}:
	${MKDIR} ${LIBDIR}

env:
	@${ECHO} SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} DIR=${DIR}

beforeinstall: ${LIBDIR} pkgIndex.tcl
	${INSTALL_DATA} pkgIndex.tcl ${LIBDIR}/pkgIndex.tcl

.include <bsd.lib.mk>

test:	${SHLIB_NAME} pkgIndex.tcl
	echo '	set auto_path ${.OBJDIR}; cd ${.CURDIR}/tests; \
		package require ${LIBNAME}; \
		if {[catch {source all} msg]} { \
			puts stderr $msg; exit -1 \
		}' | ${LOCALBASE}/bin/tclsh${TCL_VER}

Lines 1-9 Link Here

(-)files/patch-stubs (-9 lines)
1	--- generic/init.c Tue Sep 26 16:52:50 2000
2	+++ generic/init.c Fri Jan 25 14:13:31 2002
3	@@ -87,5 +87,5 @@
4	(Tcl_CmdDeleteProc*) NULL);
5
6	-#if GT81
7	+#ifdef USE_TCL_STUBS
8	/* register extension and its interfaces as now available package
9	*/




--- generic/fifo.c	Mon Aug 26 13:02:08 2002
+++ generic/fifo.c	Tue Apr  6 13:34:19 2004
@@ -29,3 +29,5 @@

+#include <string.h>
+
 #include "memchanInt.h"
 #include "buf.h"
--- generic/fifo2.c	Mon Aug 26 13:02:08 2002
+++ generic/fifo2.c	Tue Apr  6 13:37:36 2004
@@ -29,3 +29,5 @@

+#include <string.h>
+
 #include "memchanInt.h"
 #include "buf.h"
--- generic/bufExt.c	Mon Aug 26 13:02:08 2002
+++ generic/bufExt.c	Tue Apr  6 13:38:40 2004
@@ -12,4 +12,6 @@
  */

+#include <string.h>
+
 #include "buf.h"

--- generic/bufRange.c	Mon Aug 26 13:02:08 2002
+++ generic/bufRange.c	Tue Apr  6 13:40:04 2004
@@ -12,4 +12,6 @@
  */

+#include <string.h>
+
 #include "buf.h"

--- generic/bufFix.c	Mon Aug 26 13:02:08 2002
+++ generic/bufFix.c	Tue Apr  6 13:40:10 2004
@@ -12,4 +12,6 @@
  */

+#include <string.h>
+
 #include "buf.h"

--- generic/buf.c	Mon Aug 26 13:02:08 2002
+++ generic/buf.c	Tue Apr  6 13:46:08 2004
@@ -64,4 +64,4 @@
 {
   Tcl_InterpDeleteProc* proc = (Tcl_InterpDeleteProc*) NULL;
-  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.

Lines 1-10 Link Here

(-)pkg-descr (-6 / +6 lines)
1	memchan is an extension library to the script language tcl, as created	1	memchan is an extension library to the script language tcl, as created
2	by John Ousterhout. It provides two new channel types for in-memory	2	by John Ousterhout. It provides two new channel types for in-memory
3	channels and the appropriate commands for their creation.	3	channels and the appropriate commands for their creation.
4	They are useful to transfer large amounts of data between procedures or	4	They are useful to transfer large amounts of data between procedures or
5	interpreters, and additionally provide an easy interface to on-the-fly	5	interpreters, and additionally provide an easy interface to on-the-fly
6	generation of code too. No need to set or append to a string, just do a	6	generation of code too. No need to set or append to a string, just do a
7	simple puts.	7	simple puts.
8	WWW: http://memchan.sourceforge.net/	8	WWW: http://memchan.sourceforge.net/

Lines 1-4 Link Here

(-)pkg-plist (-4 / +9 lines)
1	%%DIR%%/pkgIndex.tcl	1	lib/Memchan%%PORTVERSION%%/libMemchan.so.1
2	%%DIR%%/%%SHLIB_NAME%%	2	lib/Memchan%%PORTVERSION%%/libMemchanstub.a
3	%%DIR%%/%%SHLIB_LINK%%	3	lib/Memchan%%PORTVERSION%%/pkgIndex.tcl
4	@dirrm %%DIR%%	4	include/memchan.h
		5	include/memchanDecls.h
		6	include/buf.h
		7	include/bufDecls.h
		8	include/bufIntDecls.h
		9	@dirrm lib/Memchan%%PORTVERSION%%

Return to bug 178083

Lines 1-42 Link Here

(-)Makefile (-25 / +25 lines)
1	# New ports collection makefile for: TclTrf	1	# Created by: Mikhail Teterin <mi@aldan.algebra.com>
2	# Date created: May 22, 2000
3	# Whom: Mikhail Teterin <mi@aldan.algebra.com>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7	PORTNAME= memchan	3	PORTNAME= memchan
8	PORTVERSION= 2.2.1	4	PORTVERSION= 2.3
9	PORTREVISION= 1	5	CATEGORIES= devel
10	CATEGORIES= devel tcl
11	MASTER_SITES= SF	6	MASTER_SITES= SF
12	PKGNAMEPREFIX= tcl-	7	PKGNAMEPREFIX= tcl-
		8	DISTNAME= Memchan${PORTVERSION}
13	MAINTAINER= mi@aldan.algebra.com	9	MAINTAINER= mi@aldan.algebra.com
14	COMMENT= Two new channel types for in-memory channels in TCL8	10	COMMENT= Two new channel types for in-memory channels in TCL8
15	BUILD_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//}	11	WRKSRC= ${WRKDIR}/${DISTNAME}
16	MAKEFILE= ${FILESDIR}/Makefile.bsd
17	MAKE_ARGS+= -j`${SYSCTL} -n hw.ncpu`
18
19	USE_TCL= 84+	12	USE_TCL= 84+
20	DDIR= ${PREFIX}/lib/tcl${TCL_VER}/Trf	13	GNU_CONFIGURE= yes
		14	CFLAGS+= -Wall
		15	CONFIGURE_ARGS+=--prefix=${PREFIX} \
		16	--exec-prefix=${PREFIX} \
		17	--with-tcl=${TCL_LIBDIR}
21	MAKE_ENV+= TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \	18	PORTDOCS= *
22	PORTVERSION="${PORTVERSION:R}" \	19	PLIST_SUB+= PORTVERSION=${PORTVERSION}
23	INSTALL_DATA="${INSTALL_DATA}"
24	# Too bad, n is no longer an acceptable section for bsd.man.mk	20	.include <bsd.port.options.mk>
25	MANN= fifo.n fifo2.n memchan.n memchanapi.n null.n random.n zero.n	21	post-patch:
		22	${REINPLACE_CMD} -e '/^install:/s\|install-doc\|\|' \
		23	${WRKSRC}/Makefile.in
		24
		25	.if ${PORT_OPTIONS:MDOCS}
26	post-install:	26	post-install:
27	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann	27	${MKDIR} ${DOCSDIR}
28	#.ifndef(NOPORTDOCS)	28	cd ${WRKSRC} && ${MAKE} doc-html
29	# ${MKDIR} ${DOCSDIR}	29	cd ${WRKSRC} && ${COPYTREE_SHARE} \*.html ${DOCSDIR}
30	# ${CP} -pR ${WRKSRC}/doc/html/* ${DOCSDIR}	30	.endif
31	#.endif	31	regression-test:
		32	cd ${WRKSRC} && ${MAKE} test
		33
32	.include <bsd.port.mk>	34	.include <bsd.port.mk>
33
34	PLIST_SUB!= ${SETENV} TCL_VER=${TCL_VER} ${MAKE} -f ${MAKEFILE} env

Lines 1-44 Link Here

(-)files/Makefile.bsd (-44 lines)
1	LIBNAME= Memchan
2	SHLIB_NAME= lib${LIBNAME}.so.2
3
4	.PATH: ${.CURDIR}/generic ${.CURDIR}/isaac
5
6	SRCS= memchan.c init.c counter.c fifo.c fifo2.c null.c buf.c \
7	bufFix.c bufExt.c bufRange.c bufQueue.c bufStubInit.c \
8	bufStubLib.c memchanStubInit.c zero.c random.c randport.c
9
10	TCL_VER?= 8.3
11	LOCALBASE?= /usr/local
12
13	CFLAGS+= -I${LOCALBASE}/include/tcl${TCL_VER} \
14	-DMEMCHAN_VERSION='"${PORTVERSION}"'
15
16	LDADD= -L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//}
17
18	all: pkgIndex.tcl test
19
20	pkgIndex.tcl:
21	echo 'package ifneeded ${LIBNAME} 2.2 \
22	[list load [file join $$dir $(SHLIB_NAME)]]' > pkgIndex.tcl
23
24	DIR = lib/tcl${TCL_VER}/${LIBNAME}
25	LIBDIR = ${PREFIX}/${DIR}
26	MANDIR = ${PREFIX}/man/man
27
28	${LIBDIR}:
29	${MKDIR} ${LIBDIR}
30
31	env:
32	@${ECHO} SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} DIR=${DIR}
33
34	beforeinstall: ${LIBDIR} pkgIndex.tcl
35	${INSTALL_DATA} pkgIndex.tcl ${LIBDIR}/pkgIndex.tcl
36
37	.include <bsd.lib.mk>
38
39	test: ${SHLIB_NAME} pkgIndex.tcl
40	echo ' set auto_path ${.OBJDIR}; cd ${.CURDIR}/tests; \
41	package require ${LIBNAME}; \
42	if {[catch {source all} msg]} { \
43	puts stderr $msg; exit -1 \
44	}' \| ${LOCALBASE}/bin/tclsh${TCL_VER}

Lines 1-68 Link Here

(-)files/patch-warnings (-68 lines)
1	--- generic/fifo.c Mon Aug 26 13:02:08 2002
2	+++ generic/fifo.c Tue Apr 6 13:34:19 2004
3	@@ -29,3 +29,5 @@
4
5	+#include <string.h>
6	+
7	#include "memchanInt.h"
8	#include "buf.h"
9	--- generic/fifo2.c Mon Aug 26 13:02:08 2002
10	+++ generic/fifo2.c Tue Apr 6 13:37:36 2004
11	@@ -29,3 +29,5 @@
12
13	+#include <string.h>
14	+
15	#include "memchanInt.h"
16	#include "buf.h"
17	--- generic/bufExt.c Mon Aug 26 13:02:08 2002
18	+++ generic/bufExt.c Tue Apr 6 13:38:40 2004
19	@@ -12,4 +12,6 @@
20	*/
21
22	+#include <string.h>
23	+
24	#include "buf.h"
25
26	--- generic/bufRange.c Mon Aug 26 13:02:08 2002
27	+++ generic/bufRange.c Tue Apr 6 13:40:04 2004
28	@@ -12,4 +12,6 @@
29	*/
30
31	+#include <string.h>
32	+
33	#include "buf.h"
34
35	--- generic/bufFix.c Mon Aug 26 13:02:08 2002
36	+++ generic/bufFix.c Tue Apr 6 13:40:10 2004
37	@@ -12,4 +12,6 @@
38	*/
39
40	+#include <string.h>
41	+
42	#include "buf.h"
43
44	--- generic/buf.c Mon Aug 26 13:02:08 2002
45	+++ generic/buf.c Tue Apr 6 13:46:08 2004
46	@@ -64,4 +64,4 @@
47	{
48	Tcl_InterpDeleteProc* proc = (Tcl_InterpDeleteProc*) NULL;
49	- return (int) Tcl_GetAssocData (interp, ASSOC, &proc);
50	+ return (int)(long) Tcl_GetAssocData (interp, ASSOC, &proc);
51	}
52	--- generic/zero.c 2004-11-09 19:07:03.000000000 -0500
53	+++ generic/zero.c 2008-11-15 14:49:50.000000000 -0500
54	@@ -33,4 +33,5 @@
55
56	#include "memchanInt.h"
57	+#include <string.h>
58
59	/*
60	--- generic/random.c 2004-11-09 19:07:01.000000000 -0500
61	+++ generic/random.c 2008-11-15 14:51:14.000000000 -0500
62	@@ -34,4 +34,6 @@
63	#include "../isaac/rand.h"
64	#include <time.h>
65	+#include <string.h>
66	+
67	/*
68	* Forward declarations of internal procedures.