Date: Mon, 12 Mar 2007 17:22:21 +0100 (CET) From: Martin Matuska <martin@matuska.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110232: [UPDATE] lang/tcl81-thread Message-ID: <20070312162221.0FF6F3F477@mail.vx.sk> Resent-Message-ID: <200703121630.l2CGU5uq092028@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110232
>Category: ports
>Synopsis: [UPDATE] lang/tcl81-thread
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 12 16:30:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
This update changes the following:
- adds TCL81_MAN and TCLSH_WRAPPER to OPTIONS
- removes pseudo-installation of tclsh in favour of new lang/tcl-tk-wrapper port
- adds support for NO_INSTALL_MANPAGES knob
Portlint -A and tinderbox do not complain.
I would like to take over maintainership over this port.
>How-To-Repeat:
>Fix:
diff -Nbur lang/tcl81-thread.orig/Makefile lang/tcl81-thread/Makefile
--- lang/tcl81-thread.orig/Makefile Tue Aug 15 02:29:09 2006
+++ lang/tcl81-thread/Makefile Mon Mar 12 17:17:19 2007
@@ -5,14 +5,16 @@
# $FreeBSD: ports/lang/tcl81-thread/Makefile,v 1.21 2006/08/15 00:29:09 clsung Exp $
#
-PORTNAME= tcl-thread
+PORTNAME= tcl
PORTVERSION= 8.1.b1
+PORTREVISION= 1
CATEGORIES= lang tcl81
MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_1
+PKGNAMESUFFIX= -threads
DISTNAME= tcl8.1b1
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= martin@matuska.org
COMMENT= Tcl81 with threads support
FILE_DEPENDS= ${PORTSDIR}/lang/tcl80
@@ -23,9 +25,17 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared --enable-threads
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
-PKGINSTALL= ${PORTSDIR}/lang/tcl82/pkg/pkg-install.tclsh
-PKGDEINSTALL= ${PORTSDIR}/lang/tcl82/pkg/pkg-deinstall.tclsh
+OPTIONS= TCL81_MAN "Install tcl 8.1 manpages" off \
+ TCLSH_WRAPPER "Require tclsh wrapper from ports" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TCLSH_WRAPPER)
+RUN_DEPENDS+= tclsh:${PORTSDIR}/lang/tcl-tk-wrapper
+.endif
+
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL81_MAN)
MAN1= tclsh.1
MAN3= AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 Async.3 \
@@ -56,16 +66,15 @@
variable.n vwait.n while.n
MANCOMPRESSED= yes
-
-.include <bsd.port.pre.mk>
+.endif
.if ${ARCH} == "sparc64"
-BROKEN= "Does not compile on sparc64"
+BROKEN= does not compile on sparc64
.endif
post-install:
-.if exists(${PKGINSTALL})
- ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL81_MAN)
+ @cd ${WRKSRC} && ${MAKE} -f Makefile install-man
.endif
test:
diff -Nbur lang/tcl81-thread.orig/files/patch-aa lang/tcl81-thread/files/patch-aa
--- lang/tcl81-thread.orig/files/patch-aa Thu Jan 21 19:19:58 1999
+++ lang/tcl81-thread/files/patch-aa Mon Mar 12 16:48:13 2007
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Dec 11 18:36:13 1998
-+++ Makefile.in Thu Jan 21 11:09:47 1999
+--- Makefile.in.orig Sat Dec 12 00:36:13 1998
++++ Makefile.in Mon Mar 12 16:48:00 2007
@@ -55,7 +55,9 @@
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
@@ -70,7 +70,14 @@
@TCL_LD_SEARCH_FLAGS@ -o tclsh
tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
-@@ -459,7 +467,7 @@
+@@ -453,13 +461,13 @@
+ cd dltest; if test -f configure; then ./configure; else \
+ $(DLTEST_DIR)/configure; fi
+
+-install: install-binaries install-libraries install-man
++install: install-binaries install-libraries
+
+ # Note: before running ranlib below, must cd to target directory because
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070312162221.0FF6F3F477>