Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Feb 2007 14:39:21 +0100 (CET)
From:      Martin Matuska <martin@matuska.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/109465: [UPDATE] devel/tclcl 1.16 -> 1.18
Message-ID:  <20070223133921.3DF9D3F4CF@mail.vx.sk>
Resent-Message-ID: <200702231340.l1NDe7uO004608@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         109465
>Category:       ports
>Synopsis:       [UPDATE] devel/tclcl 1.16 -> 1.18
>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:   Fri Feb 23 13:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Update of devel/tclcl from 1.16 to 1.18
- updated to use USE_TK_BUILD and USE_TK
- moved headers to individual subdirectory to avoid conflicts with
other ports
- added documentation and NOPORTDOCS knob

As there is no maintainer, I want to take maintainership of this port.

Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/tclcl-1.18.log

>How-To-Repeat:
>Fix:
diff -Nbur devel/tclcl.orig/Makefile devel/tclcl/Makefile
--- devel/tclcl.orig/Makefile	Sat Dec  2 15:42:03 2006
+++ devel/tclcl/Makefile	Fri Feb 23 14:35:05 2007
@@ -6,28 +6,47 @@
 #
 
 PORTNAME=	tclcl
-PORTVERSION=	1.16
+PORTVERSION=	1.18
+DISTVERSIONPREFIX=	src-
 CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	otcl-tclcl
-DISTFILES=	tclcl-src-${PORTVERSION}.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	martin@matuska.org
 COMMENT=	Tcl/C++ interface used by ns and nam
 
-LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84 \
-		otcl:${PORTSDIR}/lang/otcl
+LIB_DEPENDS=	otcl:${PORTSDIR}/lang/otcl
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+USE_TK=		yes
+USE_TK_BUILD=	yes
+USE_AUTOTOOLS=  autoconf:259
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4 \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	CHANGES.html
+.endif
 
 .include <bsd.port.pre.mk>
 
+CONFIGURE_ARGS=	--with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} \
+		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/otcldoc ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include
+	${MKDIR} ${PREFIX}/include/tclcl
+	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/tclcl
 	${INSTALL_DATA} ${WRKSRC}/libtclcl.a ${PREFIX}/lib
 	@${LN} -sf ${PREFIX}/lib/libtclcl.a ${PREFIX}/lib/libTcl.a
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for FILE in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
+.endif
+
 .include <bsd.port.post.mk>
diff -Nbur devel/tclcl.orig/distinfo devel/tclcl/distinfo
--- devel/tclcl.orig/distinfo	Thu Nov 24 16:40:01 2005
+++ devel/tclcl/distinfo	Fri Feb 23 14:09:27 2007
@@ -1,3 +1,3 @@
-MD5 (tclcl-src-1.16.tar.gz) = 2a25a4736c1bf4ec7f4e6343aa533bc6
-SHA256 (tclcl-src-1.16.tar.gz) = 75efa77a0c6cd8a3bab65b794f87dceab25ed34183688bf2e564ee0cbadf8e1b
-SIZE (tclcl-src-1.16.tar.gz) = 203269
+MD5 (tclcl-src-1.18.tar.gz) = 88f46da7ca7fd95786cf200b75177471
+SHA256 (tclcl-src-1.18.tar.gz) = f8a82b2d918207b0adf4fdc982052c467aac1e3071a0b9caeb9bbed18698e745
+SIZE (tclcl-src-1.18.tar.gz) = 155757
diff -Nbur devel/tclcl.orig/files/patch-conf-configure.in.tcl devel/tclcl/files/patch-conf-configure.in.tcl
--- devel/tclcl.orig/files/patch-conf-configure.in.tcl	Thu Jan  1 01:00:00 1970
+++ devel/tclcl/files/patch-conf-configure.in.tcl	Fri Feb 23 14:11:54 2007
@@ -0,0 +1,10 @@
+--- conf/configure.in.tcl.orig	Fri Feb 23 13:11:09 2007
++++ conf/configure.in.tcl	Fri Feb 23 13:11:32 2007
+@@ -188,7 +188,6 @@
+ 
+ NS_BEGIN_PACKAGE(tcl)
+ NS_CHECK_HEADER_PATH(tcl.h,$TCL_H_PLACES,$d,$TCL_H_PLACES_D,V_INCLUDE_TCL,tcl)
+-NS_CHECK_HEADER_PATH(tclInt.h,$TCL_H_PLACES,$d,$TCL_H_PLACES_D,V_INCLUDE_TCL,tcl)
+ NS_CHECK_LIB_PATH(tcl$TCL_HI_VERS,$TCL_LIB_PLACES,$d,$TCL_LIB_PLACES_D,V_LIB_TCL,tcl)
+ NS_CHECK_ANY_PATH(init.tcl,$TCL_TCL_PLACES,$d,$TCL_TCL_PLACES_D,V_LIBRARY_TCL,tcl)
+ 
diff -Nbur devel/tclcl.orig/pkg-plist devel/tclcl/pkg-plist
--- devel/tclcl.orig/pkg-plist	Mon Apr 19 06:54:59 2004
+++ devel/tclcl/pkg-plist	Fri Feb 23 14:34:31 2007
@@ -1,13 +1,15 @@
 bin/otcldoc
 bin/tcl2c++
-include/idlecallback.h
-include/iohandler.h
-include/rate-variable.h
-include/tclcl-config.h
-include/tclcl-internal.h
-include/tclcl-mappings.h
-include/tclcl.h
-include/timer.h
-include/tracedvar.h
+include/tclcl/config.h
+include/tclcl/idlecallback.h
+include/tclcl/iohandler.h
+include/tclcl/rate-variable.h
+include/tclcl/tclcl-config.h
+include/tclcl/tclcl-internal.h
+include/tclcl/tclcl-mappings.h
+include/tclcl/tclcl.h
+include/tclcl/timer.h
+include/tclcl/tracedvar.h
 lib/libTcl.a
 lib/libtclcl.a
+@dirrm include/tclcl
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070223133921.3DF9D3F4CF>