diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2007-09-05 15:44:15 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2007-09-05 15:44:15 +0000 |
| commit | c0a8bda65bfaf47169dc7d4d85864fb872ea5776 (patch) | |
| tree | 263b72a35683a94b42486fb31ea08ee646769335 /lang/itcl | |
| parent | 961f9d778d2543b1e06fc6a675be0282c9fd5668 (diff) | |
| download | ports-c0a8bda65bfaf47169dc7d4d85864fb872ea5776.tar.gz ports-c0a8bda65bfaf47169dc7d4d85864fb872ea5776.zip | |
- Switch to USE_TCL
- Pass maintainership to submitter
PR: ports/115788
Submitted by: Erik Greenwald <erik at smluc.org>
Notes
Notes:
svn path=/head/; revision=198855
Diffstat (limited to 'lang/itcl')
| -rw-r--r-- | lang/itcl/Makefile | 22 | ||||
| -rw-r--r-- | lang/itcl/files/Makefile.lib | 10 |
2 files changed, 20 insertions, 12 deletions
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile index 5e5a7f141096..bc3ac34e2c15 100644 --- a/lang/itcl/Makefile +++ b/lang/itcl/Makefile @@ -7,22 +7,21 @@ PORTNAME= itcl PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang tcl84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=incrtcl DISTNAME= itcl${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= [incr Tcl] (A.K.A. "itcl") +MAINTAINER= erik@smluc.org +COMMENT= Object extension to Tcl [incr Tcl] -LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84 +USE_TCL= 84+ USE_LDCONFIG= yes -PKGINSTALL= ${PORTSDIR}/lang/tcl84/pkg-install.tclsh -PKGDEINSTALL= ${PORTSDIR}/lang/tcl84/pkg-deinstall.tclsh MAKE_ENV+= ${PLIST_SUB} \ - SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} + SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \ + USE_TCL=${USE_TCL} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} .if defined(MAKE_JOBS) MAKE_ARGS+= -j${MAKE_JOBS} @@ -43,12 +42,17 @@ MAN3= RegisterC.3 Stack.3 ITCL_LIB_FILE= ${ITCL_LIB}.${SHLIB_MAJOR} +.include <bsd.port.pre.mk> + post-build test: cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \ - ${PREFIX}/bin/tclsh8.4 tests/all.tcl -load "load ./${ITCL_LIB}" + ${TCLSH} tests/all.tcl -load "load ./${ITCL_LIB}" +.if ${USE_TCL} == 85 + @${ECHO} "ensemble.test fails due to changed error message. It's OK." +.endif post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.n ${PREFIX}/man/mann/ ${INSTALL_DATA} ${WRKSRC}/doc/*.3 ${PREFIX}/man/man3/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/lang/itcl/files/Makefile.lib b/lang/itcl/files/Makefile.lib index dbb7ac8137da..a469c9bb98e4 100644 --- a/lang/itcl/files/Makefile.lib +++ b/lang/itcl/files/Makefile.lib @@ -1,8 +1,8 @@ -NOPROFILE= yes +NO_PROFILE= yes LIB= itcl ITCL_LIBRARY= ${PREFIX}/lib/itcl${MAJOR}.${MINOR} CFLAGS+= -I. -I./../generic \ - -I${PREFIX}/include/tcl8.4/generic \ + -I${TCL_INCLUDEDIR}/generic \ -DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\ -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\ -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\ @@ -11,7 +11,11 @@ CFLAGS+= -I. -I./../generic \ -DHAVE_SYS_FILIO_H=1 \ -DRETSIGTYPE=void \ -DITCL_LIBRARY=\"${ITCL_LIBRARY}\" -LDADD+= -L${PREFIX}/lib -ltcl84 +LDADD+= -L${PREFIX}/lib -ltcl${USE_TCL} + +.if ${USE_TCL} >= 85 +LDADD+= -ltclstub${USE_TCL} +.endif .PATH: ${.CURDIR}/unix ${.CURDIR}/generic ${.CURDIR}/man |