diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2007-09-05 15:46:22 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2007-09-05 15:46:22 +0000 |
| commit | c31dde07a86b8e84ec86524ea3b24cfba0e081e1 (patch) | |
| tree | be95f23ed842ed09ac109c650be44c4f054fad40 /x11-toolkits/itk | |
| parent | - Switch to USE_TCL (diff) | |
- Switch to USE_TK
- Pass maintainership to submitter
PR: ports/115789
Submitted by: Erik Greenwald <erik at smluc.org>
Notes
Notes:
svn path=/head/; revision=198856
Diffstat (limited to 'x11-toolkits/itk')
| -rw-r--r-- | x11-toolkits/itk/Makefile | 16 | ||||
| -rw-r--r-- | x11-toolkits/itk/files/Makefile.lib | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile index ec151f50bb79..b476e188c5ad 100644 --- a/x11-toolkits/itk/Makefile +++ b/x11-toolkits/itk/Makefile @@ -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 -COMMENT= [incr Tk] (A.K.A. "itk") +MAINTAINER= erik@smluc.org +COMMENT= Object-oriented extension to Tk [incr Tk] -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 @@ post-build: 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> diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib index c9635939f1a8..420cb3e3086f 100644 --- a/x11-toolkits/itk/files/Makefile.lib +++ b/x11-toolkits/itk/files/Makefile.lib @@ -2,9 +2,9 @@ NOPROFILE= yes 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 @@ CFLAGS+= -I. -I./../generic \ -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 |