diff options
author | mi <mi@FreeBSD.org> | 2013-04-23 22:22:39 +0800 |
---|---|---|
committer | mi <mi@FreeBSD.org> | 2013-04-23 22:22:39 +0800 |
commit | b3deb42ddb0eae41fcd2d6e0ff7077ce336004a0 (patch) | |
tree | d5a3385e29bed7d68b8ef80ba76f78f8e56ec067 /devel | |
parent | 135776951ec27858cec633271bc65e3e49745f01 (diff) | |
download | freebsd-ports-gnome-b3deb42ddb0eae41fcd2d6e0ff7077ce336004a0.tar.gz freebsd-ports-gnome-b3deb42ddb0eae41fcd2d6e0ff7077ce336004a0.tar.zst freebsd-ports-gnome-b3deb42ddb0eae41fcd2d6e0ff7077ce336004a0.zip |
Upgrade to 2.3 released just over 2 years ago. All of our patches
are no longer needed, and the bundled configure-script is doing the
right thing, so no need for custom Makefile.
Introduce the regression-test target.
PR: ports/178083
Submitted by: Pietro Cerutti
Diffstat (limited to 'devel')
-rw-r--r-- | devel/tcl-memchan/Makefile | 34 | ||||
-rw-r--r-- | devel/tcl-memchan/distinfo | 4 | ||||
-rw-r--r-- | devel/tcl-memchan/files/Makefile.bsd | 44 | ||||
-rw-r--r-- | devel/tcl-memchan/files/patch-stubs | 9 | ||||
-rw-r--r-- | devel/tcl-memchan/files/patch-warnings | 68 | ||||
-rw-r--r-- | devel/tcl-memchan/files/pkgIndex.tcl | 1 | ||||
-rw-r--r-- | devel/tcl-memchan/pkg-plist | 13 |
7 files changed, 22 insertions, 151 deletions
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile index f2b507572c91..784dd73de0ff 100644 --- a/devel/tcl-memchan/Makefile +++ b/devel/tcl-memchan/Makefile @@ -1,42 +1,30 @@ -# New ports collection makefile for: TclTrf -# Date created: May 22, 2000 -# Whom: Mikhail Teterin <mi@aldan.algebra.com> -# +# Created by: Mikhail Teterin <mi@aldan.algebra.com> # $FreeBSD$ -# PORTNAME= memchan -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.3 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 -BUILD_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//} +WRKSRC= ${WRKDIR}/${DISTNAME} -MAKEFILE= ${FILESDIR}/Makefile.bsd -MAKE_ARGS+= -j`${SYSCTL} -n hw.ncpu` +MAKE_JOBS_SAFE= yes +ALL_TARGET= binaries libraries doc-old 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}" +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} # Too bad, n is no longer an acceptable section for bsd.man.mk MANN= fifo.n fifo2.n memchan.n memchanapi.n null.n random.n zero.n +PLIST_SUB+= PORTVERSION=${PORTVERSION} -post-install: - cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann -#.ifndef(NOPORTDOCS) -# ${MKDIR} ${DOCSDIR} -# ${CP} -pR ${WRKSRC}/doc/html/* ${DOCSDIR} -#.endif +regression-test test: + ${MAKE} -C ${WRKSRC} test .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 61d8c239f781..d8ecbae99d67 100644 --- a/devel/tcl-memchan/distinfo +++ b/devel/tcl-memchan/distinfo @@ -1,2 +1,2 @@ -SHA256 (memchan-2.2.1.tar.gz) = ae62284b6a0ce96a9a602bff9766086d23c210f333882fd7c931359310413512 -SIZE (memchan-2.2.1.tar.gz) = 1169233 +SHA256 (Memchan2.3.tar.gz) = adaa5952fe532a917372dcdbc873c082656c49b613d92b09e7938d8f276f2749 +SIZE (Memchan2.3.tar.gz) = 1786238 diff --git a/devel/tcl-memchan/files/Makefile.bsd b/devel/tcl-memchan/files/Makefile.bsd deleted file mode 100644 index ec6c30db4722..000000000000 --- a/devel/tcl-memchan/files/Makefile.bsd +++ /dev/null @@ -1,44 +0,0 @@ -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} diff --git a/devel/tcl-memchan/files/patch-stubs b/devel/tcl-memchan/files/patch-stubs deleted file mode 100644 index ab00c03e759e..000000000000 --- a/devel/tcl-memchan/files/patch-stubs +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/patch-warnings b/devel/tcl-memchan/files/patch-warnings deleted file mode 100644 index 7717941ee17a..000000000000 --- a/devel/tcl-memchan/files/patch-warnings +++ /dev/null @@ -1,68 +0,0 @@ ---- 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. diff --git a/devel/tcl-memchan/files/pkgIndex.tcl b/devel/tcl-memchan/files/pkgIndex.tcl deleted file mode 100644 index a0753233f032..000000000000 --- a/devel/tcl-memchan/files/pkgIndex.tcl +++ /dev/null @@ -1 +0,0 @@ -package ifneeded Memchan 2.1 [list load %%PREFIX%%/lib/libmemchan.so.1] diff --git a/devel/tcl-memchan/pkg-plist b/devel/tcl-memchan/pkg-plist index 88084b708f53..e2bc49d967c8 100644 --- a/devel/tcl-memchan/pkg-plist +++ b/devel/tcl-memchan/pkg-plist @@ -1,4 +1,9 @@ -%%DIR%%/pkgIndex.tcl -%%DIR%%/%%SHLIB_NAME%% -%%DIR%%/%%SHLIB_LINK%% -@dirrm %%DIR%% +lib/Memchan%%PORTVERSION%%/libMemchan.so.1 +lib/Memchan%%PORTVERSION%%/libMemchanstub.a +lib/Memchan%%PORTVERSION%%/pkgIndex.tcl +include/memchan.h +include/memchanDecls.h +include/buf.h +include/bufDecls.h +include/bufIntDecls.h +@dirrm lib/Memchan%%PORTVERSION%% |