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

(-)lang/tcl84/Makefile (-15 / +36 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	tcl
8
PORTNAME=	tcl
9
PORTVERSION=	8.4.14
9
PORTVERSION=	8.4.14
10
PORTREVISION=	2
10
PORTREVISION=	3
11
PORTEPOCH=	1
11
PORTEPOCH=	1
12
CATEGORIES=	lang tcl84
12
CATEGORIES=	lang tcl84
13
MASTER_SITES=	SF
13
MASTER_SITES=	SF
Lines 24-57 Link Here
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tcl${TCL_VER}
25
CONFIGURE_ARGS=	--enable-shared --includedir=${PREFIX}/include/tcl${TCL_VER}
26
CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
26
CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
27
MAKE_ENV=	SHORT_TCL_VER=84 LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
28
TCL_VER=	8.4
27
TCL_VER=	8.4
28
SHORT_TCL_VER=	${TCL_VER:S/8./8/}
29
MAKE_ENV=	SHORT_TCL_VER="${SHORT_TCL_VER}" LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
29
NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
30
NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
30
PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=84
31
PLIST_SUB=	TCL_VER="${TCL_VER}" SHORT_TCL_VER="${SHORT_TCL_VER}"
31
EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
32
EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
32
33
34
.if !defined(BUILDING_TCL_THREADS)
33
OPTIONS=	TCL84_MAN "Install tcl 8.4 manpages" on \
35
OPTIONS=	TCL84_MAN "Install tcl 8.4 manpages" on \
34
		TCLSH_WRAPPER "Require tclsh wrapper from ports" off
36
		TCLSH_WRAPPER "Require tclsh wrapper from ports" off
37
.else
38
USE_TCL=	${SHORT_TCL_VER}
39
PLIST=		${PKGDIR}/pkg-plist.threads
40
THREADS_SUFFIX=	-threads
41
.endif
35
42
36
.include <bsd.port.pre.mk>
43
.include <bsd.port.pre.mk>
37
44
45
.if defined(BUILDING_TCL_THREADS)
38
CONFIGURE_ARGS+=	--enable-threads
46
CONFIGURE_ARGS+=	--enable-threads
39
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
47
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
40
41
.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
42
THREADS_SUFFIX=		-threads
43
CONFLICTS=		tcl-8.4*
44
.else
48
.else
45
CONFLICTS=		tcl-threads-8.4*
49
CONFIGURE_ARGS+=	--disable-threads
46
.endif
47
48
LATEST_LINK=	tcl84${THREADS_SUFFIX}
49
50
50
.if defined(WITH_TCLSH_WRAPPER)
51
.if defined(WITH_TCLSH_WRAPPER)
51
RUN_DEPENDS+=		tclsh:${PORTSDIR}/lang/tcl-tk-wrapper
52
RUN_DEPENDS+=		tclsh:${PORTSDIR}/lang/tcl-tk-wrapper
52
.endif
53
.endif
53
54
54
.if defined(NO_INSTALL_MANPAGES) && !defined(WITH_TCL84_MAN)
55
.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TCL84_MAN)
55
56
56
PLIST_SUB+=	INSTMAN='@comment '
57
PLIST_SUB+=	INSTMAN='@comment '
57
58
Lines 613-625 Link Here
613
614
614
.endif
615
.endif
615
616
617
.endif # defined(BUILDING_TCL_THREADS)
618
619
LATEST_LINK=	tcl84${THREADS_SUFFIX}
620
616
TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
621
TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
617
622
618
.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
623
.if defined(BUILDING_TCL_THREADS)
619
pre-configure:
624
post-patch:
620
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
625
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
626
		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
627
		-e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \
628
		-e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
629
		-e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \
630
		-e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
621
		${WRKSRC}/configure
631
		${WRKSRC}/configure
622
632
	@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
633
		-e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
634
		-e 's|$$(SCRIPT_INSTALL_DIR)/tclConfig.sh|$$(SCRIPT_INSTALL_DIR)/tclConfig${THREADS_SUFFIX}.sh|g' \
635
		${WRKSRC}/Makefile.in
623
.endif
636
.endif
624
637
625
# Where the below command fails, there is no need for concern:
638
# Where the below command fails, there is no need for concern:
Lines 641-646 Link Here
641
	# ====================================================
654
	# ====================================================
642
.endif
655
.endif
643
656
657
.if defined(BUILDING_TCL_THREADS)
658
do-install:
659
	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
660
	@${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}
661
	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh
662
.else
644
post-install:
663
post-install:
645
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN)
664
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN)
646
	${MKDIR} ${DATADIR}
665
	${MKDIR} ${DATADIR}
Lines 651-656 Link Here
651
. endfor
670
. endfor
652
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
671
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
653
.endif
672
.endif
673
674
.endif # !defined(BUILDING_TCL_THREADS)
654
675
655
regression-test:	build
676
regression-test:	build
656
	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
677
	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
(-)lang/tcl84/pkg-plist.threads (+8 lines)
Line 0 Link Here
1
bin/tclsh%%TCL_VER%%-threads
2
lib/libtcl%%SHORT_TCL_VER%%-threads.a
3
lib/libtcl%%SHORT_TCL_VER%%-threads.so
4
lib/libtcl%%SHORT_TCL_VER%%-threads.so.1
5
lib/libtclstub%%SHORT_TCL_VER%%-threads.a
6
lib/tcl%%TCL_VER%%/tclConfig-threads.sh
7
lib/tcl%%TCL_VER%%-threads/tclConfig.sh
8
@dirrm lib/tcl%%TCL_VER%%-threads
(-)lang/tcl84-thread/Makefile (-1 / +1 lines)
Lines 5-11 Link Here
5
# $FreeBSD: ports/lang/tcl84-thread/Makefile,v 1.1 2005/07/17 17:01:46 pav Exp $
5
# $FreeBSD: ports/lang/tcl84-thread/Makefile,v 1.1 2005/07/17 17:01:46 pav Exp $
6
#
6
#
7
7
8
WITH_THREADS=	yes
8
BUILDING_TCL_THREADS=	yes
9
9
10
MASTERDIR=	${.CURDIR}/../tcl84
10
MASTERDIR=	${.CURDIR}/../tcl84

Return to bug 110401