Attachment #65146 for bug #96622

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




#

PORTNAME=	tcl
PORTVERSION=	8.4.13
PORTEPOCH=	1
CATEGORIES=	lang tcl84
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.tclsh
TCL_VER=	8.4
NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
USE_REINPLACE=	YES
PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=84

.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
THREADS_SUFFIX=		-threads
CONFIGURE_ARGS+=	--enable-threads
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
.endif

LATEST_LINK=	tcl84${THREADS_SUFFIX}
.include <bsd.port.pre.mk>

.if !defined(WITHOUT_TCL84_MAN)



.endif

TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}

.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
pre-configure:
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
		${WRKSRC}/configure

.endif

TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}

post-configure:
	${REINPLACE_CMD} \
		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \

	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
.endif

regression-test:
	cd ${WRKSRC} && LC_ALL=C ${MAKE} test

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)lang/tcl84/distinfo (-3 / +3 lines)
1	MD5 (tcl8.4.11-src.tar.gz) = 629dfea34e4087eb4683f834060abb63	1	MD5 (tcl8.4.13-src.tar.gz) = c6b655ad5db095ee73227113220c0523
2	SHA256 (tcl8.4.11-src.tar.gz) = 8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33	2	SHA256 (tcl8.4.13-src.tar.gz) = c650124caf4785bb532720cb9d2902358ee9a9d6c71852ef4cdbdd6b7c5db4fc
3	SIZE (tcl8.4.11-src.tar.gz) = 3474428	3	SIZE (tcl8.4.13-src.tar.gz) = 3513852

Lines 1-22 Link Here

(-)lang/tcl84/files/patch-configure (-6 / +24 lines)
1	--- configure.orig Mon Jul 26 14:40:46 2004	1	--- configure.orig Thu Apr 20 16:42:21 2006
2	+++ configure Thu Oct 28 10:54:24 2004	2	+++ configure Mon May 1 17:31:03 2006
3	@@ -2081,3 +2081,3 @@	3	@@ -2560,7 +2560,7 @@
		4	LDFLAGS_ORIG="$LDFLAGS"
		5	TCL_EXPORT_FILE_SUFFIX=""
4	UNSHARED_LIB_SUFFIX=""	6	UNSHARED_LIB_SUFFIX=""
5	- TCL_TRIM_DOTS='`echo ${VERSION} \| tr -d .`'	7	- TCL_TRIM_DOTS='`echo ${VERSION} \| tr -d .`'
6	+ TCL_TRIM_DOTS=`echo ${VERSION} \| tr -d .`	8	+ TCL_TRIM_DOTS=`echo ${VERSION} \| tr -d .`
7	ECHO_VERSION='`echo ${VERSION}`'	9	ECHO_VERSION='`echo ${VERSION}`'
8	@@ -2878,3 +2878,4 @@	10	TCL_LIB_VERSIONS_OK=ok
		11	CFLAGS_DEBUG=-g
		12	@@ -3384,25 +3384,26 @@
		13	FreeBSD-*)
		14	# FreeBSD 3.* and greater have ELF.
9	SHLIB_CFLAGS="-fPIC"	15	SHLIB_CFLAGS="-fPIC"
10	- SHLIB_LD="ld -Bshareable -x"	16	- SHLIB_LD="ld -Bshareable -x"
11	+ SHLIB_LD="ld -shared -x"	17	+ SHLIB_LD="ld -shared -x"
12	+ TCL_SHLIB_LD_EXTRAS="-soname \$@"	18	+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
13	SHLIB_LD_LIBS='${LIBS}'	19	SHLIB_LD_LIBS='${LIBS}'
14	@@ -2883,3 +2884,3 @@	20	SHLIB_SUFFIX=".so"
		21	DL_OBJS="tclLoadDl.o"
15	DL_LIBS=""	22	DL_LIBS=""
16	- LDFLAGS="$LDFLAGS -export-dynamic"	23	- LDFLAGS="$LDFLAGS -export-dynamic"
17	+ LDFLAGS=""	24	+ LDFLAGS=""
18	CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'	25	CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
19	@@ -2893,6 +2894,6 @@	26	LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
		27	if test "${TCL_THREADS}" = "1" ; then
		28	- # The -pthread needs to go in the CFLAGS, not LIBS
		29	+ # The -pthread needs to go in the LDFLAGS, not LIBS
		30	LIBS=`echo $LIBS \| sed s/-pthread//`
		31	- CFLAGS="$CFLAGS -pthread"
		32	- LDFLAGS="$LDFLAGS -pthread"
		33	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
		34	+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
		35	fi
20	case $system in	36	case $system in
21	- FreeBSD-3.*)	37	- FreeBSD-3.*)
22	+ FreeBSD-*)	38	+ FreeBSD-*)
Lines 25-27 Link Here
25	- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'	41	- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
26	+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'	42	+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
27	TCL_LIB_VERSIONS_OK=nodots	43	TCL_LIB_VERSIONS_OK=nodots
		44	;;
		45	esac




--- tclUnixInit.c	Thu May 15 13:29:41 2003
+++ tclUnixInit.c	Sun Oct 19 12:39:44 2003
@@ -184,5 +184,9 @@
 #endif /* SIGPIPE */
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(__GNUC__)
+/*
+ * FreeBSD only provides the __fpsetreg() used by the following two
+ * for the GNU Compiler. When using, say, Intel's icc they break.
+ */
     fpsetround(FP_RN);
     fpsetmask(0L);




include/tcl%%TCL_VER%%/generic/tcl.h
include/tcl%%TCL_VER%%/generic/tclCompile.h
include/tcl%%TCL_VER%%/generic/tclDecls.h
include/tcl%%TCL_VER%%/generic/tclIO.h
include/tcl%%TCL_VER%%/generic/tclInitScript.h
include/tcl%%TCL_VER%%/generic/tclInt.h
include/tcl%%TCL_VER%%/generic/tclIntDecls.h

include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
include/tcl%%TCL_VER%%/generic/tclPort.h
include/tcl%%TCL_VER%%/generic/tclRegexp.h
include/tcl%%TCL_VER%%/generic/tclIO.h
include/tcl%%TCL_VER%%/tcl.h
include/tcl%%TCL_VER%%/tclDecls.h
include/tcl%%TCL_VER%%/tclPlatDecls.h

lib/tcl%%TCL_VER%%/encoding/euc-kr.enc
lib/tcl%%TCL_VER%%/encoding/gb12345.enc
lib/tcl%%TCL_VER%%/encoding/gb1988.enc
lib/tcl%%TCL_VER%%/encoding/gb2312.enc
lib/tcl%%TCL_VER%%/encoding/gb2312-raw.enc
lib/tcl%%TCL_VER%%/encoding/gb2312.enc
lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc
lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
lib/tcl%%TCL_VER%%/encoding/iso2022.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc

lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
lib/tcl%%TCL_VER%%/encoding/jis0201.enc
lib/tcl%%TCL_VER%%/encoding/jis0208.enc
lib/tcl%%TCL_VER%%/encoding/jis0212.enc

Return to bug 96622

Lines 6-12 Link Here

(-)lang/tcl84/Makefile (-9 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= tcl	8	PORTNAME= tcl
9	PORTVERSION= 8.4.11	9	PORTVERSION= 8.4.13
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= lang tcl84	11	CATEGORIES= lang tcl84
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 28-43 Link Here
28	PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.tclsh	28	PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.tclsh
29	TCL_VER= 8.4	29	TCL_VER= 8.4
30	NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html	30	NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html
31	USE_REINPLACE= YES
32	PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=84	31	PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=84
33		32
34	.if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)	33	.if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)
35	THREADS_SUFFIX= -threads	34	THREADS_SUFFIX= -threads
36	CONFIGURE_ARGS+= --enable-threads	35	CONFIGURE_ARGS+= --enable-threads
		36	CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
37	.endif	37	.endif
38		38
39	LATEST_LINK= tcl84${THREADS_SUFFIX}	39	LATEST_LINK= tcl84${THREADS_SUFFIX}
40	.include <bsd.port.pre.mk>
41		40
42	.if !defined(WITHOUT_TCL84_MAN)	41	.if !defined(WITHOUT_TCL84_MAN)
43		42
Lines 594-608 Link Here
594		593
595	.endif	594	.endif
596		595
		596	TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
		597
597	.if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)	598	.if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)
598	post-patch:	599	pre-configure:
599	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \	600	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' \
600	${WRKSRC}/configure	601	${WRKSRC}/configure
601		602
602	.endif	603	.endif
603		604
604	TCLBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
605
606	post-configure:	605	post-configure:
607	${REINPLACE_CMD} \	606	${REINPLACE_CMD} \
608	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TCLBASE}\|' \	607	-e 's\|${WRKDIRPREFIX}${.CURDIR}\|$${WRKDIRPREFIX}${TCLBASE}\|' \
Lines 617-623 Link Here
617	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}	616	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
618	.endif	617	.endif
619		618
620	test:	619	regression-test:
621	cd ${WRKSRC} && ${MAKE} test	620	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
622		621
623	.include <bsd.port.post.mk>	622	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)lang/tcl84/files/patch-tclUnixInit.c (-13 lines)
1	--- tclUnixInit.c Thu May 15 13:29:41 2003
2	+++ tclUnixInit.c Sun Oct 19 12:39:44 2003
3	@@ -184,5 +184,9 @@
4	#endif /* SIGPIPE */
5
6	-#ifdef __FreeBSD__
7	+#if defined(__FreeBSD__) && defined(__GNUC__)
8	+/*
9	+ * FreeBSD only provides the __fpsetreg() used by the following two
10	+ * for the GNU Compiler. When using, say, Intel's icc they break.
11	+ */
12	fpsetround(FP_RN);
13	fpsetmask(0L);

Lines 6-11 Link Here

(-)lang/tcl84/pkg-plist (-7 / +7 lines)
6	include/tcl%%TCL_VER%%/generic/tcl.h	6	include/tcl%%TCL_VER%%/generic/tcl.h
7	include/tcl%%TCL_VER%%/generic/tclCompile.h	7	include/tcl%%TCL_VER%%/generic/tclCompile.h
8	include/tcl%%TCL_VER%%/generic/tclDecls.h	8	include/tcl%%TCL_VER%%/generic/tclDecls.h
		9	include/tcl%%TCL_VER%%/generic/tclIO.h
9	include/tcl%%TCL_VER%%/generic/tclInitScript.h	10	include/tcl%%TCL_VER%%/generic/tclInitScript.h
10	include/tcl%%TCL_VER%%/generic/tclInt.h	11	include/tcl%%TCL_VER%%/generic/tclInt.h
11	include/tcl%%TCL_VER%%/generic/tclIntDecls.h	12	include/tcl%%TCL_VER%%/generic/tclIntDecls.h
Lines 14-20 Link Here
14	include/tcl%%TCL_VER%%/generic/tclPlatDecls.h	15	include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
15	include/tcl%%TCL_VER%%/generic/tclPort.h	16	include/tcl%%TCL_VER%%/generic/tclPort.h
16	include/tcl%%TCL_VER%%/generic/tclRegexp.h	17	include/tcl%%TCL_VER%%/generic/tclRegexp.h
17	include/tcl%%TCL_VER%%/generic/tclIO.h
18	include/tcl%%TCL_VER%%/tcl.h	18	include/tcl%%TCL_VER%%/tcl.h
19	include/tcl%%TCL_VER%%/tclDecls.h	19	include/tcl%%TCL_VER%%/tclDecls.h
20	include/tcl%%TCL_VER%%/tclPlatDecls.h	20	include/tcl%%TCL_VER%%/tclPlatDecls.h
Lines 63-74 Link Here
63	lib/tcl%%TCL_VER%%/encoding/euc-kr.enc	63	lib/tcl%%TCL_VER%%/encoding/euc-kr.enc
64	lib/tcl%%TCL_VER%%/encoding/gb12345.enc	64	lib/tcl%%TCL_VER%%/encoding/gb12345.enc
65	lib/tcl%%TCL_VER%%/encoding/gb1988.enc	65	lib/tcl%%TCL_VER%%/encoding/gb1988.enc
66	lib/tcl%%TCL_VER%%/encoding/gb2312.enc
67	lib/tcl%%TCL_VER%%/encoding/gb2312-raw.enc	66	lib/tcl%%TCL_VER%%/encoding/gb2312-raw.enc
		67	lib/tcl%%TCL_VER%%/encoding/gb2312.enc
68	lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc	68	lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc
69	lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc	69	lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
70	lib/tcl%%TCL_VER%%/encoding/iso2022.enc	70	lib/tcl%%TCL_VER%%/encoding/iso2022.enc
71	lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc	71	lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc
		72	lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
		73	lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
		74	lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
		75	lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
		76	lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
72	lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc	77	lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc
73	lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc	78	lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc
74	lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc	79	lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc
Lines 77-87 Link Here
77	lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc	82	lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc
78	lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc	83	lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc
79	lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc	84	lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc
80	lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
81	lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
82	lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
83	lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
84	lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
85	lib/tcl%%TCL_VER%%/encoding/jis0201.enc	85	lib/tcl%%TCL_VER%%/encoding/jis0201.enc
86	lib/tcl%%TCL_VER%%/encoding/jis0208.enc	86	lib/tcl%%TCL_VER%%/encoding/jis0208.enc
87	lib/tcl%%TCL_VER%%/encoding/jis0212.enc	87	lib/tcl%%TCL_VER%%/encoding/jis0212.enc