Date: Fri, 24 Aug 2007 13:17:56 -0500 (CDT) From: Erik Greenwald <erik@smluc.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: erik@math.missouristate.edu Subject: ports/115789: x11-toolkits/itk - Modernization and adoption Message-ID: <20070824181756.A1262434002@sinistar.bluecows.com> Resent-Message-ID: <200708241820.l7OIK2nJ095164@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115789
>Category: ports
>Synopsis: x11-toolkits/itk - 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:02 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 tk85 as well as
84. Adoption. Thanks!
>How-To-Repeat:
>Fix:
--- x11-toolkits_itk.patch begins here ---
Index: x11-toolkits/itk/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/itk/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- x11-toolkits/itk/Makefile 19 May 2007 20:31:11 -0000 1.22
+++ x11-toolkits/itk/Makefile 24 Aug 2007 18:11:00 -0000
@@ -7,21 +7,23 @@
PORTNAME= itk
PORTVERSION= 3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=incrtcl
DISTNAME= ${PORTNAME}${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= erik@smluc.org
COMMENT= [incr Tk] (A.K.A. "itk")
-LIB_DEPENDS= tk84:${PORTSDIR}/x11-toolkits/tk84 \
- itcl.${MAJOR}:${PORTSDIR}/lang/itcl
+LIB_DEPENDS= itcl.${MAJOR}:${PORTSDIR}/lang/itcl
+USE_TK= 84+
USE_LDCONFIG= yes
MAKE_ENV+= ${PLIST_SUB} \
- SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
+ SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
+ USE_TK=${USE_TK} TCL_INCLUDEDIR=${TCL_INCLUDEDIR} \
+ TK_INCLUDEDIR=${TK_INCLUDEDIR}
MAKEFILE= ${FILESDIR}/Makefile.lib
SHLIB_MAJOR= ${MAJOR}
@@ -46,6 +48,6 @@
test:
cd ${WRKSRC} && ${SETENV} ITK_LIBRARY=${WRKSRC}/library \
- ${PREFIX}/bin/wish8.4 tests/all.tcl -load "load ./${ITK_LIB}; package require Tk"
+ ${WISH} tests/all.tcl -load "load ./${ITK_LIB}; package require Tk"
.include <bsd.port.mk>
Index: x11-toolkits/itk/files/Makefile.lib
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/itk/files/Makefile.lib,v
retrieving revision 1.7
diff -u -r1.7 Makefile.lib
--- x11-toolkits/itk/files/Makefile.lib 1 Dec 2006 14:08:40 -0000 1.7
+++ x11-toolkits/itk/files/Makefile.lib 24 Aug 2007 18:11:00 -0000
@@ -2,9 +2,9 @@
LIB= itk
ITK_LIBRARY= ${PREFIX}/lib/itk${MAJOR}.${MINOR}
CFLAGS+= -I. -I./../generic \
- -I${PREFIX}/include/tcl8.4/generic \
+ -I${TCL_INCLUDEDIR}/generic \
-I${PREFIX}/include/itcl${MAJOR}.${MINOR}/ \
- -I${PREFIX}/include/tk8.4/generic \
+ -I${TK_INCLUDEDIR}/generic \
-I${X11BASE}/include \
-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\
@@ -14,7 +14,7 @@
-DHAVE_SYS_FILIO_H=1 \
-DRETSIGTYPE=void \
-DITK_LIBRARY=\"${ITK_LIBRARY}\"
-LDADD+= -L${PREFIX}/lib -litcl -L${X11BASE}/lib -lX11 -ltk84
+LDADD+= -L${PREFIX}/lib -litcl -L${X11BASE}/lib -lX11 -ltk${USE_TK}
.PATH: ${.CURDIR}/generic
--- x11-toolkits_itk.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070824181756.A1262434002>