Attachment #76017 for bug #109675





PORTNAME=	xotcl
PORTVERSION=	1.5.3
PORTREVISION=	2
CATEGORIES=	lang tcl84
MASTER_SITES=	http://media.wu-wien.ac.at/download/
PKGNAMESUFFIX?=	${THREADS_SUFFIX}

MAINTAINER=	martin@matuska.org
COMMENT=	Object-oriented scripting language based on Tcl

USE_TCL_VER?=	84

.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
IGNORE=	supported values for USE_TCL_VER are only 84 and 85
.endif

USE_TCL=	${USE_TCL_VER}
USE_TCL_BUILD=	${USE_TCL_VER}
INSTALL_TARGET=	install
ALL_TARGET=	all test-nohttp
USE_GMAKE=	yes
PLIST_SUB+=	PORTVERSION=${PORTVERSION}

.if !defined(AOLSERVER_XOTCL)
USE_LDCONFIG=	${PREFIX}/xotcl${PORTVERSION}
GNU_CONFIGURE=	yes

OPTIONS=	ACTIWEB		"Include actiweb"		on \
		AOLSERVER	"AOL server module"		off \
		THREADS		"Force threaded build"		off \
		TUTORIAL	"Install XOTcl tutorial" 	off
.else
AOLSERVERBASE?=	${LOCALBASE}/aolserver
.endif
			--with-tcl=${TCL_LIBDIR} \
			--with-tclinclude=${TCL_INCLUDEDIR}/generic/ \
			--with-xotclsh

.include <bsd.port.pre.mk>

.if defined(AOLSERVER_XOTCL)
RUN_DEPENDS+=		${LOCALBASE}/aolserver/bin/init.tcl:${PORTSDIR}/www/aolserver \
			${LOCALBASE}/lib/xotcl${PORTVERSION}/xotclConfig.sh:${PORTSDIR}/lang/xotcl-thread
PLIST=			${WRKDIR}/pkg-plist.aolserver
PLIST_FILES=		${AOLSERVERBASE:S/${LOCALBASE}\///}/modules/tcl/xotcl.tcl
LATEST_LINK=		aolserver-xotcl
NO_BUILD=		yes
WITH_THREADS=		yes
.endif

.if defined(WITH_ACTIWEB)
CONFIGURE_ARGS+=	--with-actiweb --with-gdbm=${LOCALBASE}/include,${LOCALBASE}/lib
LIB_DEPENDS+=		gdbm.3:${PORTSDIR}/databases/gdbm

PLIST_SUB+=	ACTIWEB="@comment "
.endif

.if defined(WITH_AOLSERVER)
BUILD_DEPENDS+=		${LOCALBASE}/aolserver/bin/init.tcl:${PORTSDIR}/www/aolserver
RUN_DEPENDS+=		${BUILD_DEPENDS}
PLIST_SUB+=		AOLSERVER=""
INSTALL_TARGET+=	install-aol
.else
PLIST_SUB+=		AOLSERVER="@comment "
.endif

.if defined(WITH_TUTORIAL)
PLIST_SUB+=	TUTORIAL=""
.else
PLIST_SUB+=	TUTORIAL="@comment "
.endif

INSTALL_TARGET+=	install-shells

.if !defined(AOLSERVER_XOTCL) && !defined(NO_INSTALL_MANPAGES)
MAN1=			xotclsh.1
.endif

. if exists(${TCLSH})
_TCL_IS_THREADED!= ${ECHO_CMD} 'puts [array names tcl_platform -exact threaded]' | ${TCLSH} || return 0
.  if !defined(TCL_WITH_THREADS) && !defined(WITH_THREADS) && !empty(_TCL_IS_THREADED)
TCL_WITH_THREADS=	yes
.  endif
. endif

.if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
.  if defined(_TCL_IS_THREADED) && empty(_TCL_IS_THREADED)
IGNORE= Tcl with threads is required. Please install Tcl with WITH_THREADS defined or from lang/tcl${USE_TCL} port and try again
.  endif
CONFIGURE_ARGS+=	--enable-threads
.  if !defined(AOLSERVER_XOTCL)
THREADS_SUFFIX=		-threads
.  endif
USE_TCL=	${USE_TCL_VER}-thread
USE_TCL_BUILD=	${USE_TCL_VER}-thread
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
.  else
CONFIGURE_ARGS+=	--disable-threads
.endif

LATEST_LINK?=	xotcl${THREADS_SUFFIX}

CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
			--libdir=${PREFIX}/lib \
			--with-tcl=${TCL_LIBDIR} \
			--with-tclinclude=${TCL_INCLUDEDIR}/generic/ \
			--with-xotclsh

.if !defined(AOLSERVER_XOTCL) # Install for aolserver module
pre-configure:
. if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
	@${ECHO_CMD} "*************************************************"
	@${ECHO_CMD} "NOTICE: XOTcl will be built with threads support."
	@${ECHO_CMD} "*************************************************"
. endif
.else # installation for aolserver module
do-install:
	@${INSTALL_DATA} ${WRKSRC}/generic/aol-xotcl.tcl ${AOLSERVERBASE}/modules/tcl/xotcl.tcl
.endif

.if !defined(AOLSERVER_XOTCL) # Aolserver module has no post-install
post-install:
.if defined(WITH_TUTORIAL)
	${MKDIR} ${EXAMPLESDIR}/tutorial/html ${EXAMPLESDIR}/tutorial/pdf

.endif
.if !defined(NO_INSTALL_MANPAGES)
	${INSTALL_MAN} ${WRKSRC}/man/xotclsh.1 ${PREFIX}/man/man1/
.endif
.endif
.include <bsd.port.post.mk>

Lines 72-78 Link Here

(-)lang/xotcl/pkg-plist (-1 lines)
72	%%ACTIWEB%%lib/xotclsdbm1.2/pkgIndex.tcl	72	%%ACTIWEB%%lib/xotclsdbm1.2/pkgIndex.tcl
73	%%ACTIWEB%%lib/xotclgdbm1.2/libxotclgdbm1.2.so	73	%%ACTIWEB%%lib/xotclgdbm1.2/libxotclgdbm1.2.so
74	%%ACTIWEB%%lib/xotclgdbm1.2/pkgIndex.tcl	74	%%ACTIWEB%%lib/xotclgdbm1.2/pkgIndex.tcl
75	%%AOLSERVER%%aolserver/modules/tcl/xotcl.tcl
76	bin/xotclsh	75	bin/xotclsh
77	include/xotcl%%PORTVERSION%%/xotcl.h	76	include/xotcl%%PORTVERSION%%/xotcl.h
78	include/xotcl%%PORTVERSION%%/xotclDecls.h	77	include/xotcl%%PORTVERSION%%/xotclDecls.h

Return to bug 109675

Lines 7-41 Link Here

(-)lang/xotcl/Makefile (-31 / +73 lines)
7		7
8	PORTNAME= xotcl	8	PORTNAME= xotcl
9	PORTVERSION= 1.5.3	9	PORTVERSION= 1.5.3
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= lang tcl83 tcl84	11	CATEGORIES= lang tcl84
12	MASTER_SITES= http://media.wu-wien.ac.at/download/	12	MASTER_SITES= http://media.wu-wien.ac.at/download/
		13	PKGNAMESUFFIX?= ${THREADS_SUFFIX}
13		14
14	MAINTAINER= martin@matuska.org	15	MAINTAINER= martin@matuska.org
15	COMMENT= Object-oriented scripting language based on Tcl	16	COMMENT= Object-oriented scripting language based on Tcl
16		17
17	GNU_CONFIGURE= yes	18	USE_TCL_VER?= 84
18	USE_TCL= yes	19
19	USE_TCL_BUILD= yes	20	.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
20	ALL_TARGET= all test-nohttp	21	IGNORE= supported values for USE_TCL_VER are only 84 and 85
		22	.endif
		23
		24	USE_TCL= ${USE_TCL_VER}
		25	USE_TCL_BUILD= ${USE_TCL_VER}
21	INSTALL_TARGET= install	26	INSTALL_TARGET= install
22	USE_LDCONFIG= yes	27	ALL_TARGET= all test-nohttp
23	USE_GMAKE= yes	28	USE_GMAKE= yes
24	PLIST_SUB+= PORTVERSION=${PORTVERSION}	29	PLIST_SUB+= PORTVERSION=${PORTVERSION}
25		30
		31	.if !defined(AOLSERVER_XOTCL)
		32	USE_LDCONFIG= ${PREFIX}/xotcl${PORTVERSION}
		33	GNU_CONFIGURE= yes
		34
26	OPTIONS= ACTIWEB "Include actiweb" on \	35	OPTIONS= ACTIWEB "Include actiweb" on \
27	AOLSERVER "AOL server module" off \
28	THREADS "Force threaded build" off \
29	TUTORIAL "Install XOTcl tutorial" off	36	TUTORIAL "Install XOTcl tutorial" off
30		37	.else
31	CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \	38	AOLSERVERBASE?= ${LOCALBASE}/aolserver
32	--libdir=${PREFIX}/lib \	39	.endif
33	--with-tcl=${TCL_LIBDIR} \
34	--with-tclinclude=${TCL_INCLUDEDIR}/generic/ \
35	--with-xotclsh
36		40
37	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
38		42
		43	.if defined(AOLSERVER_XOTCL)
		44	RUN_DEPENDS+= ${LOCALBASE}/aolserver/bin/init.tcl:${PORTSDIR}/www/aolserver \
		45	${LOCALBASE}/lib/xotcl${PORTVERSION}/xotclConfig.sh:${PORTSDIR}/lang/xotcl-thread
		46	PLIST= ${WRKDIR}/pkg-plist.aolserver
		47	PLIST_FILES= ${AOLSERVERBASE:S/${LOCALBASE}\///}/modules/tcl/xotcl.tcl
		48	LATEST_LINK= aolserver-xotcl
		49	NO_BUILD= yes
		50	WITH_THREADS= yes
		51	.endif
		52
39	.if defined(WITH_ACTIWEB)	53	.if defined(WITH_ACTIWEB)
40	CONFIGURE_ARGS+= --with-actiweb --with-gdbm=${LOCALBASE}/include,${LOCALBASE}/lib	54	CONFIGURE_ARGS+= --with-actiweb --with-gdbm=${LOCALBASE}/include,${LOCALBASE}/lib
41	LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm	55	LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
Lines 44-77 Link Here
44	PLIST_SUB+= ACTIWEB="@comment "	58	PLIST_SUB+= ACTIWEB="@comment "
45	.endif	59	.endif
46		60
47	.if defined(WITH_AOLSERVER)
48	BUILD_DEPENDS+= ${LOCALBASE}/aolserver/bin/init.tcl:${PORTSDIR}/www/aolserver
49	RUN_DEPENDS+= ${BUILD_DEPENDS}
50	PLIST_SUB+= AOLSERVER=""
51	INSTALL_TARGET+= install-aol
52	.else
53	PLIST_SUB+= AOLSERVER="@comment "
54	.endif
55
56	.if defined(WITH_TUTORIAL)	61	.if defined(WITH_TUTORIAL)
57	PLIST_SUB+= TUTORIAL=""	62	PLIST_SUB+= TUTORIAL=""
58	.else	63	.else
59	PLIST_SUB+= TUTORIAL="@comment "	64	PLIST_SUB+= TUTORIAL="@comment "
60	.endif	65	.endif
61		66
62	.if defined(WITH_THREADS)	67	INSTALL_TARGET+= install-shells
63	TCL_THREADED!= ${ECHO_CMD} 'puts [array names tcl_platform -exact threaded]' \| ${TCLSH}	68
64	.if empty(TCL_THREADED)	69	.if !defined(AOLSERVER_XOTCL) && !defined(NO_INSTALL_MANPAGES)
65	IGNORE= WITH_THREADS option is selected. You need Tcl with threads to use this port. Please install Tcl with WITH_THREADS defined or from lang/tcl84-thread port and try again.	70	MAN1= xotclsh.1
66	.endif	71	.endif
		72
		73	. if exists(${TCLSH})
		74	_TCL_IS_THREADED!= ${ECHO_CMD} 'puts [array names tcl_platform -exact threaded]' \| ${TCLSH} \|\| return 0
		75	. if !defined(TCL_WITH_THREADS) && !defined(WITH_THREADS) && !empty(_TCL_IS_THREADED)
		76	TCL_WITH_THREADS= yes
		77	. endif
		78	. endif
		79
		80	.if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)
		81	. if defined(_TCL_IS_THREADED) && empty(_TCL_IS_THREADED)
		82	IGNORE= Tcl with threads is required. Please install Tcl with WITH_THREADS defined or from lang/tcl${USE_TCL} port and try again
		83	. endif
67	CONFIGURE_ARGS+= --enable-threads	84	CONFIGURE_ARGS+= --enable-threads
		85	. if !defined(AOLSERVER_XOTCL)
		86	THREADS_SUFFIX= -threads
		87	. endif
		88	USE_TCL= ${USE_TCL_VER}-thread
		89	USE_TCL_BUILD= ${USE_TCL_VER}-thread
		90	.include "${PORTSDIR}/Mk/bsd.tcl.mk"
		91	. else
		92	CONFIGURE_ARGS+= --disable-threads
68	.endif	93	.endif
69		94
70	INSTALL_TARGET+= install-shells	95	LATEST_LINK?= xotcl${THREADS_SUFFIX}
71	.if !defined(NO_INSTALL_MANPAGES)	96
72	MAN1= xotclsh.1	97	CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \
		98	--libdir=${PREFIX}/lib \
		99	--with-tcl=${TCL_LIBDIR} \
		100	--with-tclinclude=${TCL_INCLUDEDIR}/generic/ \
		101	--with-xotclsh
		102
		103	.if !defined(AOLSERVER_XOTCL) # Install for aolserver module
		104	pre-configure:
		105	. if defined(TCL_WITH_THREADS) \|\| defined(WITH_THREADS)
		106	@${ECHO_CMD} "*************************************************"
		107	@${ECHO_CMD} "NOTICE: XOTcl will be built with threads support."
		108	@${ECHO_CMD} "*************************************************"
		109	. endif
		110	.else # installation for aolserver module
		111	do-install:
		112	@${INSTALL_DATA} ${WRKSRC}/generic/aol-xotcl.tcl ${AOLSERVERBASE}/modules/tcl/xotcl.tcl
73	.endif	113	.endif
74		114
		115	.if !defined(AOLSERVER_XOTCL) # Aolserver module has no post-install
75	post-install:	116	post-install:
76	.if defined(WITH_TUTORIAL)	117	.if defined(WITH_TUTORIAL)
77	${MKDIR} ${EXAMPLESDIR}/tutorial/html ${EXAMPLESDIR}/tutorial/pdf	118	${MKDIR} ${EXAMPLESDIR}/tutorial/html ${EXAMPLESDIR}/tutorial/pdf
Lines 91-95 Link Here
91	.endif	132	.endif
92	.if !defined(NO_INSTALL_MANPAGES)	133	.if !defined(NO_INSTALL_MANPAGES)
93	${INSTALL_MAN} ${WRKSRC}/man/xotclsh.1 ${PREFIX}/man/man1/	134	${INSTALL_MAN} ${WRKSRC}/man/xotclsh.1 ${PREFIX}/man/man1/
		135	.endif
94	.endif	136	.endif
95	.include <bsd.port.post.mk>	137	.include <bsd.port.post.mk>