From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Aug 24 18:20:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6404116A421 for ; Fri, 24 Aug 2007 18:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4122813C461 for ; Fri, 24 Aug 2007 18:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l7OIK1Es095113 for ; Fri, 24 Aug 2007 18:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l7OIK1SJ095112; Fri, 24 Aug 2007 18:20:01 GMT (envelope-from gnats) Resent-Date: Fri, 24 Aug 2007 18:20:01 GMT Resent-Message-Id: <200708241820.l7OIK1SJ095112@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erik Greenwald Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 30D1016A421 for ; Fri, 24 Aug 2007 18:17:52 +0000 (UTC) (envelope-from erik@sinistar.bluecows.com) Received: from sinistar.bluecows.com (sinistar.bluecows.com [205.167.142.250]) by mx1.freebsd.org (Postfix) with ESMTP id 06BE713C457 for ; Fri, 24 Aug 2007 18:17:51 +0000 (UTC) (envelope-from erik@sinistar.bluecows.com) Received: by sinistar.bluecows.com (Postfix, from userid 1015) id 353D8434001; Fri, 24 Aug 2007 13:17:51 -0500 (CDT) Message-Id: <20070824181751.353D8434001@sinistar.bluecows.com> Date: Fri, 24 Aug 2007 13:17:51 -0500 (CDT) From: Erik Greenwald To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: erik@math.missouristate.edu Subject: ports/115788: lang/itcl - Modernization and adoption X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Erik Greenwald List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Aug 2007 18:20:02 -0000 >Number: 115788 >Category: ports >Synopsis: lang/itcl - Modernization and adoption >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 24 18:20:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Erik Greenwald >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: System: FreeBSD vidar.br0kenland.org 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sat Jan 13 11:46:43 EST 2007 root@vidar.br0kenland.org:/usr/obj/usr/src/sys/VIDAR i386 >Description: Updated to use bsd.tcl.mk knobs. Ability to use tcl85 as well as 84. Adoption. Thanks! >How-To-Repeat: >Fix: --- lang_itcl.patch begins here --- Index: lang/itcl/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/itcl/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- lang/itcl/Makefile 15 Aug 2006 00:29:07 -0000 1.43 +++ lang/itcl/Makefile 24 Aug 2007 17:57:40 -0000 @@ -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 +MAINTAINER= erik@smluc.org COMMENT= [incr Tcl] (A.K.A. "itcl") -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,18 @@ ITCL_LIB_FILE= ${ITCL_LIB}.${SHLIB_MAJOR} +# need to split the bsd.port.mk up to get the USE_TCL test to work in here +.include + 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 +.include Index: lang/itcl/files/Makefile.lib =================================================================== RCS file: /home/ncvs/ports/lang/itcl/files/Makefile.lib,v retrieving revision 1.10 diff -u -r1.10 Makefile.lib --- lang/itcl/files/Makefile.lib 22 May 2006 17:21:08 -0000 1.10 +++ lang/itcl/files/Makefile.lib 24 Aug 2007 17:57:40 -0000 @@ -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 @@ -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 --- lang_itcl.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: