Attachment #76911 for bug #110805

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





PORTNAME=	tclX
PORTVERSION=	8.4
PORTREVISION=	1
CATEGORIES=	lang tcl${USE_TCL} devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=tclx
DISTNAME=	tclx${PORTVERSION}

COMMENT=	Extended TCL

USE_BZIP2=	yes
USE_TCL_BUILD=	yes

USE_LDCONFIG=	yes
TCL_DVER?=	${TCL_VER:S/.//}

INSTALLS_SHLIB=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV+=	CPPFLAGS="-I${TCL_INCLUDEDIR}/unix\
		-I${TCL_INCLUDEDIR}/generic"
CONFIGURE_ARGS=	--enable-shared \
		--with-help=Help \
		--with-tcl="${TCL_LIBDIR}"
PLIST_SUB=	TCLX_VER=${PORTVERSION}
ALL_TARGET=	binaries libraries
INSTALL_TARGET=	install-binaries install-libraries
.ifndef(NOPORTDOCS)
ALL_TARGET+=	doc
INSTALL_TARGET+=install-help
.endif

MAN3=	CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3
MANN=	TclX.n

MLINKS=	CmdWrite.3	TclCommandWriting.3	\

MLINKS+=	TclXInit.3	$l.3
.endfor

.include <bsd.port.pre.mk>

pre-configure:
.if exists(${TCL_LIBDIR}/tclConfig-threads.sh)
	${REINPLACE_CMD} -e 's|tclConfig.sh|tclConfig-threads.sh|'	\
		${WRKSRC}/${CONFIGURE_SCRIPT}
.endif
	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'	\
		${WRKSRC}/${CONFIGURE_SCRIPT}

post-configure:
	${REINPLACE_CMD} -e	\
	    's,^TCLSH_PROG.*,TCLSH_PROG=${TCLSH},' \
	    -e 's,TCL_LIBRARY=.*,\\,' ${WRKSRC}/Makefile
	# Disabling the failing help.test
	${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis

pre-su-install:
	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3
	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann

regression-test:
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)lang/tclX/files/patch-af (-7 / +18 lines)
1	--- unix/tools/bldmanhelp.tcl Thu Dec 2 15:33:05 2004	1	--- ./unix/tools/bldmanhelp.tcl.orig Thu Dec 2 21:33:05 2004
2	+++ unix/tools/bldmanhelp.tcl Mon Jun 26 19:51:14 2006	2	+++ ./unix/tools/bldmanhelp.tcl Sun Mar 25 17:07:36 2007
3	@@ -12,8 +12,7 @@	3	@@ -11,10 +11,9 @@
		4	#
4	# The command line is:	5	# The command line is:
5	#	6	#
6	-# bldmanhelp docdir maninfo helpdir	7	-# bldmanhelp docdir maninfo helpdir
Lines 10-22 Link Here
10	-# o docdir is the directory containing the manual pages.	11	-# o docdir is the directory containing the manual pages.
11	# o maninfo is the path to a file that when sources returns a list of	12	# o maninfo is the path to a file that when sources returns a list of
12	# entries describing manual pages to convert. Each entry is a list	13	# entries describing manual pages to convert. Each entry is a list
13	@@ -70,15 +69,27 @@	14	# of manual file and the path of the help file to generate.
		15	@@ -69,17 +68,32 @@
		16	proc CopyManPage {manPage outFH} {
14	global skipSection	17	global skipSection
15		18
16	- set stat [catch {	19	- set stat [catch {
17	- open $manPage	20	- open $manPage
18	- } fh]	21	- } fh]
19	+ set section [lindex [split $manPage .] end]	22	+ set section [lindex [split $manPage .] end]
		23	+ if {$section == "macros"} {
		24	+ return
		25	+ }
20	+ set manPage [file rootname $manPage]	26	+ set manPage [file rootname $manPage]
21	+ set manPage [split [exec man -w $section $manPage] ":)"]	27	+ set manPage [split [exec man -w $section $manPage] ":)"]
22	+ if {[llength $manPage] > 1} { # Get the source, not from cat	28	+ if {[llength $manPage] > 1} { # Get the source, not from cat
Lines 42-48 Link Here
42	+ {.so man.macros} {}	48	+ {.so man.macros} {}
43	.so* {	49	.so* {
44	CopyManPage [lindex $line 1] $outFH	50	CopyManPage [lindex $line 1] $outFH
45	@@ -120,9 +131,8 @@	51	}
		52	@@ -119,11 +133,10 @@
		53	# for input to buildhelp.
46	#	54	#
47		55
48	-proc GenInputFile {docDir manInfoTbl tmpFile} {	56	-proc GenInputFile {docDir manInfoTbl tmpFile} {
Lines 53-68 Link Here
53	- cd $docDir	61	- cd $docDir
54		62
55	foreach ent $manInfoTbl {	63	foreach ent $manInfoTbl {
56	@@ -145,5 +155,4 @@	64	puts stdout " preprocessing $ent"
		65	@@ -144,13 +157,12 @@
		66
57	set tmpFile "bldmanhelp.tmp"	67	set tmpFile "bldmanhelp.tmp"
58		68
59	-set docDir [lindex $argv 0]	69	-set docDir [lindex $argv 0]
60	set manInfoTbl [source [lindex $argv 1]]	70	set manInfoTbl [source [lindex $argv 1]]
61	set helpDir [lindex $argv 2]	71	set helpDir [lindex $argv 2]
62	@@ -151,5 +160,5 @@	72	set brief [lindex $argv 3]
63		73
64	puts stdout "Begin preprocessing UCB manual files"	74	puts stdout "Begin preprocessing UCB manual files"
65	-GenInputFile $docDir $manInfoTbl $tmpFile	75	-GenInputFile $docDir $manInfoTbl $tmpFile
66	+GenInputFile $manInfoTbl $tmpFile	76	+GenInputFile $manInfoTbl $tmpFile
67		77
68	buildhelp $helpDir $brief [list $tmpFile]	78	buildhelp $helpDir $brief [list $tmpFile]
		79

Line 0 Link Here

(-)lang/tclX/files/patch-configure (+11 lines)
	1	--- configure.orig Sat Oct 8 01:17:50 2005
	2	+++ configure Sun Mar 25 15:34:58 2007
	3	@@ -6917,7 +6917,7 @@
	4	fi
	5	else
	6	# tclConfig.sh is in $INSTALL/lib directory
	7	- REAL_TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../bin/;pwd`
	8	+ REAL_TCL_BIN_DIR=`cd ${TCL_BIN_DIR}/../../bin/;pwd`
	9	if test "$TEA_PLATFORM" = "windows"; then
	10	TCLSH_PROG=${REAL_TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
	11	else

Return to bug 110805

Lines 7-13 Link Here

(-)lang/tclX/Makefile (-15 / +26 lines)
7		7
8	PORTNAME= tclX	8	PORTNAME= tclX
9	PORTVERSION= 8.4	9	PORTVERSION= 8.4
10	CATEGORIES= lang tcl${TCL_DVER} devel	10	PORTREVISION= 1
		11	CATEGORIES= lang tcl${USE_TCL} devel
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR=tclx	13	MASTER_SITE_SUBDIR=tclx
13	DISTNAME= tclx${PORTVERSION}	14	DISTNAME= tclx${PORTVERSION}
Lines 16-42 Link Here
16	COMMENT= Extended TCL	17	COMMENT= Extended TCL
17		18
18	USE_BZIP2= yes	19	USE_BZIP2= yes
19	LIB_DEPENDS= tcl${TCL_DVER}:${PORTSDIR}/lang/tcl${TCL_DVER}	20	USE_TCL_BUILD= yes
20		21
21	TCL_VER?= 8.4	22	USE_LDCONFIG= yes
22	TCL_DVER?= ${TCL_VER:S/.//}
23
24	INSTALLS_SHLIB= yes
25	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
26	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/tcl${TCL_VER}/unix\	24	CONFIGURE_ENV+= CPPFLAGS="-I${TCL_INCLUDEDIR}/unix\
27	-I${LOCALBASE}/include/tcl${TCL_VER}/generic"	25	-I${TCL_INCLUDEDIR}/generic"
28	CONFIGURE_ARGS= --enable-shared \	26	CONFIGURE_ARGS= --enable-shared \
29	--with-help=Help \	27	--with-help=Help \
30	--with-tcl="${LOCALBASE}/lib/tcl${TCL_VER}"	28	--with-tcl="${TCL_LIBDIR}"
31	PLIST_SUB= TCLX_VER=${PORTVERSION}	29	PLIST_SUB= TCLX_VER=${PORTVERSION}
32	ALL_TARGET= binaries libraries test	30	ALL_TARGET= binaries libraries
33	INSTALL_TARGET= install-binaries install-libraries	31	INSTALL_TARGET= install-binaries install-libraries
34	.ifndef(NOPORTDOCS)	32	.ifndef(NOPORTDOCS)
35	ALL_TARGET+= doc	33	ALL_TARGET+= doc
36	INSTALL_TARGET+=install-help	34	INSTALL_TARGET+=install-help
37	.endif	35	.endif
38		36
39	MAN3= CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3	37	MAN3= CmdWrite.3 Handles.3 Keylist.3 ObjCmdWrite.3 TclXInit.3
40	MANN= TclX.n	38	MANN= TclX.n
41		39
42	MLINKS= CmdWrite.3 TclCommandWriting.3 \	40	MLINKS= CmdWrite.3 TclCommandWriting.3 \
Lines 51-65 Link Here
51	MLINKS+= TclXInit.3 $l.3	49	MLINKS+= TclXInit.3 $l.3
52	.endfor	50	.endfor
53		51
		52	.include <bsd.port.pre.mk>
		53
		54	pre-configure:
		55	.if exists(${TCL_LIBDIR}/tclConfig-threads.sh)
		56	${REINPLACE_CMD} -e 's\|tclConfig.sh\|tclConfig-threads.sh\|' \
		57	${WRKSRC}/${CONFIGURE_SCRIPT}
		58	.endif
		59	${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|' \
		60	${WRKSRC}/${CONFIGURE_SCRIPT}
		61
54	post-configure:	62	post-configure:
55	${REINPLACE_CMD} -e \	63	${REINPLACE_CMD} -e \
56	's,^TCLSH_PROG.*,TCLSH_PROG=${LOCALBASE}/bin/tclsh${TCL_VER},' \	64	's,^TCLSH_PROG.*,TCLSH_PROG=${TCLSH},' \
57	-e 's,TCL_LIBRARY=.*,\\,' ${WRKSRC}/Makefile	65	-e 's,TCL_LIBRARY=.*,\\,' ${WRKSRC}/Makefile
58	# Disabling the failing help.test	66	# Disabling the failing help.test
59	mv ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis	67	${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis
60		68
61	pre-su-install:	69	pre-su-install:
62	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3	70	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN3} ${PREFIX}/man/man3
63	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann	71	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MANN} ${PREFIX}/man/mann
64		72
65	.include <bsd.port.mk>	73	regression-test:
		74	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
		75
		76	.include <bsd.port.post.mk>