Update to new Tcl layout, Makefile cleanup.

While there, update to 2.3, getting rid of the patches directory
With help from stu@

OK stu@, landry@
This commit is contained in:
sebastia 2011-01-05 18:16:58 +00:00
parent 3734d0edf5
commit f1acca42b4
14 changed files with 53 additions and 185 deletions

View File

@ -1,44 +1,44 @@
# $OpenBSD: Makefile,v 1.5 2010/11/19 07:23:12 espie Exp $
# $OpenBSD: Makefile,v 1.6 2011/01/05 18:16:58 sebastia Exp $
SHARED_ONLY = Yes
SHARED_ONLY = Yes
COMMENT = in-memory channels for Tcl, chunks and fifos
COMMENT = in-memory channels for Tcl
DISTNAME = memchan-2.2.1
SHARED_LIBS = Memchan221 0.0
CATEGORIES = misc
HOMEPAGE = http://memchan.sourceforge.net/
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
DISTNAME = Memchan2.3
PKGNAME = memchan-2.3
SHARED_LIBS = Memchan23 0.0
CATEGORIES = misc
HOMEPAGE = http://memchan.sourceforge.net/
MAINTAINER = Sebastian Reitenbach <sebastia@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=memchan/}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=memchan/}
MODULES = lang/tcl
MODULES = lang/tcl
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} \
devel/tcllib
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} \
devel/tcllib
SEPARATE_BUILD = simple
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--with-tcl-include-dir=${MODTCL_INCDIR} \
--with-tcl-lib-dir=${MODTCL_LIBDIR} \
--prefix=${DESTDIR}${PREFIX}
REGRESS_TARGET = test
SUBST_VARS = LIBMemchan221_VERSION
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
FAKE_FLAGS = PKG_DIR=memchan \
INSTALL_PROGRAM='${INSTALL_DATA}'
SEPARATE_BUILD = concurrent
USE_GROFF = Yes
CONFIGURE_STYLE = gnu
pre-configure:
cp ${WRKSRC}/doc/random.man ${WRKSRC}/doc/mchan-random.man
${SUBST_CMD} ${WRKSRC}/configure
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR} \
--includedir=${PREFIX}/include/memchan \
SHLIB_VERSION=${LIBMemchan23_VERSION}
REGRESS_TARGET = test
WRKDIST = ${WRKDIR}/Memchan2.3
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (memchan-2.2.1.tar.gz) = B+8Kq/96mAlZqhoHvHOlIA==
RMD160 (memchan-2.2.1.tar.gz) = af8fdOAt91xfamzrdUutFeZWhiU=
SHA1 (memchan-2.2.1.tar.gz) = Z0trl/YGEtvxwrzZC1X2+I78U0k=
SHA256 (memchan-2.2.1.tar.gz) = rmIoS2oM6WqaYCv/l2YIbSPCEPMziC/XyTE1kxBBNRI=
SIZE (memchan-2.2.1.tar.gz) = 1169233
MD5 (Memchan2.3.tar.gz) = 0GUlY4Nwv9frIbUpE12TCw==
RMD160 (Memchan2.3.tar.gz) = HEPGvWduL58vX0xcUUj8zbzOroI=
SHA1 (Memchan2.3.tar.gz) = E13m9L4CqUqOl/y2DeS8KKa1Bjg=
SHA256 (Memchan2.3.tar.gz) = rapZUv5TKpFzctzbyHPAgmVsSbYT2SsJ55ONjydvJ0k=
SIZE (Memchan2.3.tar.gz) = 1786238

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
otherwise clash with tcllib
--- Makefile.in.orig Sun Jul 18 15:30:47 2010
+++ Makefile.in Sun Jul 18 15:30:55 2010
@@ -59,7 +59,7 @@ DOC_SOURCES = \
fifo2.man \
null.man \
zero.man \
- random.man
+ mchan-random.man
#========================================================================
# Identify the object files. This replaces .c with .$(OBJEXT) for all

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
--- configure.orig Sun Jul 18 15:22:00 2010
+++ configure Sun Jul 18 15:22:30 2010
@@ -7568,7 +7568,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.${LIBMemchan221_VERSION}'
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_bufExt_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/bufExt.c.orig Sun Jul 18 14:23:44 2010
+++ generic/bufExt.c Sun Jul 18 14:23:58 2010
@@ -12,6 +12,7 @@
*/
#include "buf.h"
+#include <string.h>
/*
* Forward declarations of all internal procedures.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_bufFix_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/bufFix.c.orig Sun Jul 18 14:24:08 2010
+++ generic/bufFix.c Sun Jul 18 14:24:21 2010
@@ -12,6 +12,7 @@
*/
#include "buf.h"
+#include <string.h>
/*
* Forward declarations of all internal procedures.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_bufRange_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/bufRange.c.orig Sun Jul 18 14:23:21 2010
+++ generic/bufRange.c Sun Jul 18 14:23:32 2010
@@ -12,6 +12,7 @@
*/
#include "buf.h"
+#include <string.h>
/*
* Forward declarations of all internal procedures.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_fifo2_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/fifo2.c.orig Sun Jul 18 14:19:42 2010
+++ generic/fifo2.c Sun Jul 18 14:20:36 2010
@@ -27,6 +27,7 @@
*/
+#include <string.h>
#include "memchanInt.h"
#include "buf.h"

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_fifo_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/fifo.c.orig Sun Jul 18 14:32:29 2010
+++ generic/fifo.c Sun Jul 18 14:32:44 2010
@@ -29,6 +29,7 @@
#include "memchanInt.h"
#include "buf.h"
+#include <string.h>
/*
* Forward declarations of internal procedures.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_null_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/null.c.orig Sun Jul 18 14:21:06 2010
+++ generic/null.c Sun Jul 18 14:21:28 2010
@@ -28,6 +28,7 @@
#include "memchanInt.h"
+#include <string.h>
/*
* Forward declarations of internal procedures.

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_random_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/random.c.orig Sun Jul 18 14:22:55 2010
+++ generic/random.c Sun Jul 18 14:23:09 2010
@@ -33,6 +33,7 @@
#include "memchanInt.h"
#include "../isaac/rand.h"
#include <time.h>
+#include <string.h>
/*
* Forward declarations of internal procedures.
*/

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-generic_zero_c,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
fix implicit declarations
--- generic/zero.c.orig Sun Jul 18 14:22:20 2010
+++ generic/zero.c Sun Jul 18 14:22:34 2010
@@ -32,6 +32,7 @@
#include "memchanInt.h"
+#include <string.h>
/*
* Forward declarations of internal procedures.

View File

@ -1,3 +1,4 @@
Memchan is an extension to Tcl implementing memory channels,
i.e. channels storing the data placed into them in memory,
not on disk.
A Tcl extension that provides several new channel types for in-memory
channels and the appropriate commands for their creation. They are good
for long dynamic strings and transferring large amounts of data between
procedures or interpreters.

View File

@ -1,14 +1,18 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/07/28 17:24:01 sebastia Exp $
include/memchan.h
include/memchanDecls.h
lib/Memchan2.2.1/
@lib lib/Memchan2.2.1/libMemchan221.so.${LIBMemchan221_VERSION}
lib/Memchan2.2.1/libMemchanstub221.a
lib/Memchan2.2.1/pkgIndex.tcl
@comment $OpenBSD: PLIST,v 1.2 2011/01/05 18:16:58 sebastia Exp $
include/memchan/
include/memchan/buf.h
include/memchan/bufDecls.h
include/memchan/bufIntDecls.h
include/memchan/memchan.h
include/memchan/memchanDecls.h
lib/tcl/memchan/
@lib lib/tcl/memchan/libMemchan23.so.${LIBMemchan23_VERSION}
lib/tcl/memchan/libMemchanstub23.a
lib/tcl/memchan/pkgIndex.tcl
@man man/mann/fifo.n
@man man/mann/fifo2.n
@man man/mann/mchan-random.n
@man man/mann/memchan.n
@man man/mann/memchanapi.n
@man man/mann/null.n
@man man/mann/random.n
@man man/mann/zero.n