Date: Sat, 4 Jun 2005 22:15:00 GMT From: "Pedro F. Giffuni" <giffunip@asme.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/81907: Update itk to 3.2.1 Message-ID: <200506042215.j54MF0mH063191@www.freebsd.org> Resent-Message-ID: <200506042220.j54MK1mc013243@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81907
>Category: ports
>Synopsis: Update itk to 3.2.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 04 22:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Pedro F. Giffuni
>Release: 4.11-Release
>Organization:
>Environment:
FreeBSD Estudio 4.11-RELEASE FreeBSD 4.11-RELEASE #7: Sat Mar 26 10:55:47 COT 2005 root@Estudio:/usr/src/sys/compile/COMPAQ i386
>Description:
Update iTk to the latest released version. I think this works fine with Tk8.4 too, but I didn't test it thoroughly (Change Makefile and files/makefile.lib).
>How-To-Repeat:
I removed the tests because there's something type in the interpr tests.
I think in the future itcl and iTk ports will have to be merged and build from the CVS version like NetBSD and other OSs out there do. Having a merged itcltk would also make it easier to update iwidgets (which I won't do).
>Fix:
diff -ruN itk.orig/Makefile itk/Makefile
--- itk.orig/Makefile Sun Apr 24 14:33:23 2005
+++ itk/Makefile Sat Jun 4 16:52:19 2005
@@ -6,12 +6,12 @@
#
PORTNAME= itk
-PORTVERSION= ${MAJOR}.${MINOR}
-PORTREVISION= 1
-CATEGORIES= x11-toolkits tk83
+PORTVERSION= ${MAJOR}.${MINOR}.1
+CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=incrtcl
DISTNAME= itcl${PORTVERSION}
+EXTRACT_SUFX= _src.tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= [incr Tk] (A.K.A. "itk")
@@ -23,12 +23,12 @@
.endif
USE_REINPLACE= yes
-WRKSRC= ${WRKDIR}/itcl${MAJOR}.${MINOR}/itk
+WRKSRC= ${WRKDIR}/itcl${PORTVERSION}/itk
INSTALLS_SHLIB= yes
MAKE_ENV+= ${PLIST_SUB} \
SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
-EXTRACT_AFTER_ARGS=| ${TAR} -xf - ./itcl${MAJOR}.${MINOR}/itk
+EXTRACT_AFTER_ARGS=| ${TAR} -xf - itcl${PORTVERSION}/itk
MAKEFILE= ${FILESDIR}/Makefile.lib
SHLIB_MAJOR= 1
SHLIB_MINOR= 1
@@ -40,14 +40,10 @@
MAKE_ARGS+= -j$(MAKE_JOBS)
.endif
-MANCOMPRESSED= no
MANN= Archetype.n Toplevel.n Widget.n itk.n itkvars.n usual.n
ITK_LIB_FILE= ${ITK_LIB}.${SHLIB_MAJOR}
-post-extract:
- ${RM} ${WRKSRC}/pkgIndex.tcl
-
post-patch:
${REINPLACE_CMD} \
-e 's,package require Itk,load \
@@ -56,11 +52,5 @@
${REINPLACE_CMD} \
-e 's,\@itk_LIB_FILE\@,${ITK_LIB_FILE},' \
${WRKSRC}/pkgIndex.tcl.in
-
-.if defined(DISPLAY)
-post-build test:
- cd ${WRKSRC} && ${SETENV} ITK_LIBRARY=${WRKSRC}/library \
- ${PREFIX}/bin/wish8.3 tests/all.tcl
-.endif
.include <bsd.port.mk>
diff -ruN itk.orig/distinfo itk/distinfo
--- itk.orig/distinfo Sun Apr 24 14:33:23 2005
+++ itk/distinfo Sat Jun 4 16:37:07 2005
@@ -1,2 +1,2 @@
-MD5 (itcl3.2.tar.gz) = b41ed909969eaa5f0a06ab698393760f
-SIZE (itcl3.2.tar.gz) = 1498517
+MD5 (itcl3.2.1_src.tgz) = 44dcc2129232329cacd6c8abebf38403
+SIZE (itcl3.2.1_src.tgz) = 427026
diff -ruN itk.orig/files/Makefile.lib itk/files/Makefile.lib
--- itk.orig/files/Makefile.lib Sun Apr 24 14:33:23 2005
+++ itk/files/Makefile.lib Sat Jun 4 16:37:07 2005
@@ -9,7 +9,7 @@
-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\
- -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1\
+ -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1\
-DTCL_SHLIB_EXT=\".so\" \
-DHAVE_SYS_FILIO_H=1 \
-DRETSIGTYPE=void \
diff -ruN itk.orig/files/patch-nostubs itk/files/patch-nostubs
--- itk.orig/files/patch-nostubs Sun Apr 24 14:33:23 2005
+++ itk/files/patch-nostubs Sat Jun 4 16:37:07 2005
@@ -1,12 +1,12 @@
---- generic/itk_cmds.c Mon Aug 28 23:58:00 2000
-+++ generic/itk_cmds.c Sat Jul 28 08:04:49 2001
-@@ -82,3 +82,5 @@
-
-+#ifdef USE_ITK_STUBS
- extern ItkStubs itkStubs;
-+#endif
-
-@@ -105,6 +107,6 @@
+--- generic/itk_cmds.c.orig Fri Jun 22 04:38:54 2001
++++ generic/itk_cmds.c Sun Mar 13 21:46:16 2005
+@@ -111,12 +111,14 @@
+ {
+ Tcl_Namespace *itkNs, *parserNs;
+ ClientData parserInfo;
++ #ifdef USE_ITK_STUBS
+ extern ItkStubs itkStubs;
++ #endif
- if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
@@ -15,7 +15,11 @@
- if (Tk_InitStubs(interp, "8.1", 0) == NULL) {
+ if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
return TCL_ERROR;
-@@ -198,3 +200,8 @@
+ };
+ if (Itcl_InitStubs(interp, ITCL_VERSION, 1) == NULL) {
+@@ -209,7 +211,12 @@
+ * end-of-the-line?
+ */
if (Tcl_PkgProvideEx(interp, "Itk", ITCL_VERSION,
- (ClientData) &itkStubs) != TCL_OK) {
+#ifdef USE_ITK_STUBS
@@ -25,3 +29,5 @@
+#endif
+ ) != TCL_OK) {
return TCL_ERROR;
+ }
+ return TCL_OK;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506042215.j54MF0mH063191>