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

(-)lang/tcl85/Makefile (-13 / +43 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	tcl
8
PORTNAME=	tcl
9
PORTVERSION=	8.5.a.5
9
PORTVERSION=	8.5.a.5
10
PORTREVISION=	3
10
PORTREVISION=	4
11
CATEGORIES=	lang
11
CATEGORIES=	lang
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	tcl
13
MASTER_SITE_SUBDIR=	tcl
Lines 24-53 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=85 LANG=C LC_ALL=C	# LANG=C is required for some of UTF-using tests
28
TCL_VER=	8.5
27
TCL_VER=	8.5
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=85
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=	TCL85_MAN "Install tcl 8.5 manpages" off \
35
OPTIONS=	TCL85_MAN "Install tcl 8.5 manpages" off \
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
38
.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
45
.if defined(BUILDING_TCL_THREADS)
39
. if (${ARCH} == "ia64")
46
. if (${ARCH} == "ia64")
40
BROKEN=	does not compile with threads on ia64
47
BROKEN=	does not compile on ia64
41
. endif
48
. endif
42
CONFLICTS=	tcl-8.5*
49
. if exists(${TCLSH})
43
THREADS_SUFFIX=		-threads
50
TCL_PATCHLEVEL!=	${ECHO_CMD} "puts \$$tcl_patchLevel" | ${TCLSH}
51
.  if ${TCL_PATCHLEVEL} != ${PORTVERSION:S/.a./a/}
52
IGNORE=	version mismatch - installing ${PORTVERSION:S/.a./a/} over installed ${TCL_PATCHLEVEL}
53
.  endif
54
.endif
55
44
CONFIGURE_ARGS+=	--enable-threads
56
CONFIGURE_ARGS+=	--enable-threads
45
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
57
CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
58
46
.else
59
.else
47
CONFLICTS=	tcl-threads-8.5*
48
.endif
49
60
50
LATEST_LINK=	tcl85${THREADS_SUFFIX}
61
CONFIGURE_ARGS+=	--disable-threads
51
62
52
.if defined(WITH_TCLSH_WRAPPER)
63
.if defined(WITH_TCLSH_WRAPPER)
53
RUN_DEPENDS+=		tclsh:${PORTSDIR}/lang/tcl-tk-wrapper
64
RUN_DEPENDS+=		tclsh:${PORTSDIR}/lang/tcl-tk-wrapper
Lines 682-695 Link Here
682
	pkgMkIndex.n pkg_mkIndex.n \
693
	pkgMkIndex.n pkg_mkIndex.n \
683
	safe.n SafeBase.n
694
	safe.n SafeBase.n
684
.endif
695
.endif
696
.endif # defined(BUILDING_TCL_THREADS)
697
698
LATEST_LINK=	tcl85${THREADS_SUFFIX}
685
699
686
TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
700
TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
687
701
688
.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
702
.if defined(BUILDING_TCL_THREADS)
689
pre-configure:
703
post-patch:
690
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
704
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
705
		-e 's|$${TCL_TRIM_DOTS}|$${TCL_TRIM_DOTS}${THREADS_SUFFIX}|g' \
706
		-e 's|-ltcl$${TCL_VERSION}|-ltcl$${TCL_VERSION}${THREADS_SUFFIX}|g' \
707
		-e 's/-ltcl`echo $${TCL_VERSION} | tr -d .`/-ltcl`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
708
		-e 's|-ltclstub$${TCL_VERSION}|-ltclstub$${TCL_VERSION}${THREADS_SUFFIX}|g' \
709
		-e 's/-ltclstub`echo $${TCL_VERSION} | tr -d .`/-ltclstub`echo $${TCL_VERSION} | tr -d .`${THREADS_SUFFIX}/g' \
691
		${WRKSRC}/configure
710
		${WRKSRC}/configure
692
711
	@${REINPLACE_CMD} -e 's|libtcl$${SHORT_TCL_VER}|libtcl$${SHORT_TCL_VER}${THREADS_SUFFIX}|g' \
712
		-e 's|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)|$$(BIN_INSTALL_DIR)/tclsh$$(VERSION)${THREADS_SUFFIX}|g' \
713
		-e 's|$$(SCRIPT_INSTALL_DIR)/tclConfig.sh|$$(SCRIPT_INSTALL_DIR)/tclConfig${THREADS_SUFFIX}.sh|g' \
714
		${WRKSRC}/Makefile.in
693
.endif
715
.endif
694
716
695
# Where the below command fails, there is no need for concern:
717
# Where the below command fails, there is no need for concern:
Lines 711-716 Link Here
711
	# ====================================================
733
	# ====================================================
712
.endif
734
.endif
713
735
736
.if defined(BUILDING_TCL_THREADS)
737
do-install:
738
	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f Makefile install-binaries
739
	@${MKDIR} ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}
740
	@${LN} -s ${PREFIX}/lib/tcl${TCL_VER}/tclConfig${THREADS_SUFFIX}.sh ${PREFIX}/lib/tcl${TCL_VER}${THREADS_SUFFIX}/tclConfig.sh
741
.else
714
post-install:
742
post-install:
715
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN)
743
.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN)
716
	${MKDIR} ${DATADIR}
744
	${MKDIR} ${DATADIR}
Lines 721-726 Link Here
721
. endfor
749
. endfor
722
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
750
	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
723
.endif
751
.endif
752
753
.endif # !defined(BUILDING_TCL_THREADS)
724
754
725
regression-test:	build
755
regression-test:	build
726
	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
756
	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
(-)lang/tcl85/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/tcl85-thread/Makefile (-1 / +1 lines)
Lines 5-11 Link Here
5
# $FreeBSD: ports/lang/tcl85-thread/Makefile,v 1.1 2007/01/29 03:10:23 clsung Exp $
5
# $FreeBSD: ports/lang/tcl85-thread/Makefile,v 1.1 2007/01/29 03:10:23 clsung Exp $
6
#
6
#
7
7
8
WITH_THREADS=	yes
8
BUILDING_TCL_THREADS=	yes
9
9
10
MASTERDIR=	${.CURDIR}/../tcl85
10
MASTERDIR=	${.CURDIR}/../tcl85

Return to bug 110394