- Update to 3.2.1

PR:		ports/81907
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>

4 files changed, 25 insertions, 32 deletions

diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index d537d6317940..431a88c0a897 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -6,29 +6,26 @@
 #
 
 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")
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
 		itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT}
-.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
@@ -37,17 +34,13 @@ MINOR=		2
 PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
 ITK_LIB=	libitk${MAJOR}${MINOR}.so
 .if defined(MAKE_JOBS)
-MAKE_ARGS+=	-j$(MAKE_JOBS)
+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 \
@@ -57,10 +50,4 @@ post-patch:
 		-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 --git a/x11-toolkits/itk/distinfo b/x11-toolkits/itk/distinfo
index 8dd40ed57c76..f0840a234f20 100644
--- a/x11-toolkits/itk/distinfo
+++ b/x11-toolkits/itk/distinfo
@@ -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 --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index a99d8611fb61..080164356a00 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -9,7 +9,7 @@ CFLAGS+=	-I. -I./../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\
-		-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 --git a/x11-toolkits/itk/files/patch-nostubs b/x11-toolkits/itk/files/patch-nostubs
index debdedf2c3a4..69d42b75f408 100644
--- a/x11-toolkits/itk/files/patch-nostubs
+++ b/x11-toolkits/itk/files/patch-nostubs
@@ -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;