New [dict] lessons, bugfixes.
Theoretically improved port Makefile.
Index: lang/tcltutor//Makefile
===================================================================
RCS file: /cvs/ports/lang/tcltutor/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- lang/tcltutor//Makefile 2 May 2008 06:43:46 -0000 1.1.1.1
+++ lang/tcltutor//Makefile 21 Oct 2008 05:47:18 -0000
@@ -1,53 +1,55 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $
-COMMENT= learn Tcl interactively
+COMMENT = learn Tcl interactively
-DISTNAME= tcltutor-30b1
-CATEGORIES= lang lang/tcl
-DISTFILES= tcltutor30b1.tgz
+DISTNAME = tcltutor-30b2
-HOMEPAGE= http://www.msen.com/~clif/TclTutor.html
-MASTER_SITES= http://www.msen.com/~clif/
+CATEGORIES = lang lang/tcl
-MAINTAINER= Stuart Cassoff <[EMAIL PROTECTED]>
+HOMEPAGE = http://www.msen.com/~clif/TclTutor.html
+
+MAINTAINER = Stuart Cassoff <[EMAIL PROTECTED]>
# ISC
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES = http://www.msen.com/~clif/
+
+DISTFILES = tcltutor3_0b2.tgz
-RUN_DEPENDS= :tk->=8.5:x11/tk/8.5
+MODULES = x11/tk
-WRKDIST= ${WRKDIR}/TclTutor
+RUN_DEPENDS = ${MODTK_RUN_DEPENDS}
-USE_X11= Yes
-NO_BUILD= Yes
-NO_REGRESS= Yes
+NO_BUILD = Yes
+NO_REGRESS = Yes
-TT_LIB_DIR= ${PREFIX}/lib/tcltutor
-TT_LSN_DIR= ${PREFIX}/share/doc/tcltutor
+WRKDIST = ${WRKDIR}/TclTutor
+
+TT_LIB_DIR = ${PREFIX}/lib/tcltutor
+TT_LSN_DIR = ${PREFIX}/share/doc/tcltutor
do-configure:
- awk '{ gsub(/!!TT_LIB_DIR!!/,"${TT_LIB_DIR}") \
- } { gsub(/!!TT_LSN_DIR!!/,"${TT_LSN_DIR}") \
- } { print }' \
- < ${WRKSRC}/TclTutor.tcl > ${WRKSRC}/TclTutor.tcl._tmp && \
- mv ${WRKSRC}/TclTutor.tcl._tmp ${WRKSRC}/TclTutor.tcl
-
+ perl -pi -e 's,!!TT_LIB_DIR!!,"${TT_LIB_DIR}",' \
+ -e ';s,!!TT_LSN_DIR!!,"${TT_LSN_DIR}",' \
+ -e ';$$. == 3 && s!exec wish.*$$!exec wish${MODTK_VERSION} "\$$0"
\$${1+"\$$@"}!' \
+ ${WRKSRC}/TclTutor.tcl
+
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/TclTutor.tcl ${PREFIX}/bin/tcltutor
${INSTALL_DATA_DIR} ${TT_LIB_DIR}
- for i in NOTICE README balloon.tcl htmllib.tcl images.tcl \
- options.tcl simpleTop.tcl ; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${TT_LIB_DIR} ; \
- done
+.for i in NOTICE README balloon.tcl htmllib.tcl images.tcl options.tcl
simpleTop.tcl
+ ${INSTALL_DATA} ${WRKSRC}/$i ${TT_LIB_DIR}
+.endfor
${INSTALL_DATA_DIR} ${TT_LSN_DIR}
- for i in Tcl_English Tcl_Portuguese ; do \
- ${INSTALL_DATA_DIR} ${TT_LSN_DIR}/$$i; \
- for j in lsn cfg html ; do \
- ${INSTALL_DATA} ${WRKSRC}/lesson/$$i/*.$$j
${TT_LSN_DIR}/$$i ; \
- done ; \
- done
+.for i in Tcl_English Tcl_Portuguese
+ ${INSTALL_DATA_DIR} ${TT_LSN_DIR}/$i
+. for j in lsn cfg html
+ ${INSTALL_DATA} ${WRKSRC}/lesson/$i/*.$j ${TT_LSN_DIR}/$i
+. endfor
+.endfor
.include <bsd.port.mk>
Index: lang/tcltutor//distinfo
===================================================================
RCS file: /cvs/ports/lang/tcltutor/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- lang/tcltutor//distinfo 2 May 2008 06:43:46 -0000 1.1.1.1
+++ lang/tcltutor//distinfo 21 Oct 2008 05:47:18 -0000
@@ -1,5 +1,5 @@
-MD5 (tcltutor30b1.tgz) = cZy7/UGojOo17+aCaDhBgw==
-RMD160 (tcltutor30b1.tgz) = PUxNMXJPsqDjsdCnJB2Po3x6cJ0=
-SHA1 (tcltutor30b1.tgz) = eMCCUgWXWEWvueHBasfDNbRNwt0=
-SHA256 (tcltutor30b1.tgz) = ZmhUSNXKwGOa8FmFZ6cFuk7mC8ddmcfsZVg2jliwwaw=
-SIZE (tcltutor30b1.tgz) = 252680
+MD5 (tcltutor3_0b2.tgz) = 0TRIJ9ZNiDQDN8OEoFcCrQ==
+RMD160 (tcltutor3_0b2.tgz) = 9o+4WN9YenuOrPhBJ6p/5F+fM/A=
+SHA1 (tcltutor3_0b2.tgz) = y6cLT1iSKafwbH2Zj+FXhVh1cqk=
+SHA256 (tcltutor3_0b2.tgz) = HQAjh+Q130tbOr+GR3SrcecM/TTpYy1qZ8IEohc7t5g=
+SIZE (tcltutor3_0b2.tgz) = 258440
Index: lang/tcltutor//patches/patch-TclTutor_tcl
===================================================================
RCS file: /cvs/ports/lang/tcltutor/patches/patch-TclTutor_tcl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-TclTutor_tcl
--- lang/tcltutor//patches/patch-TclTutor_tcl 2 May 2008 06:43:46 -0000
1.1.1.1
+++ lang/tcltutor//patches/patch-TclTutor_tcl 21 Oct 2008 05:47:18 -0000
@@ -1,12 +1,11 @@
$OpenBSD: patch-TclTutor_tcl,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $
---- TclTutor.tcl.orig Wed Apr 30 20:40:43 2008
-+++ TclTutor.tcl Wed Apr 30 22:37:54 2008
+--- TclTutor.tcl.orig Fri Aug 1 23:04:40 2008
++++ TclTutor.tcl Tue Oct 21 01:26:51 2008
@@ -1,8 +1,8 @@
-package provide app-tcltutor 1.0
#!/bin/sh
# \
--exec wish "$0" "$@"
-+exec wish8.5 "$0" "$@"
+ exec wish "$0" "$@"
+package provide app-tcltutor 1.0
package require Tk
@@ -49,7 +48,7 @@
if {$Tutor(logUsage)} {
$mbf.file add command -label "Disable activity log" -command {set
Tutor(logUsage) 0}
} else {
-@@ -1130,6 +1129,7 @@ proc SetFontSize {} {
+@@ -1134,6 +1133,7 @@ proc SetFontSize {} {
proc logUsage {str} {
global Tutor
@@ -57,7 +56,7 @@
if {$Tutor(logUsage) == 0} {return}
if {[string match $Tutor(logFile) ""]} {
-@@ -1156,6 +1156,7 @@ proc logUsage {str} {
+@@ -1160,6 +1160,7 @@ proc logUsage {str} {
#
proc mailLog {} {
global Tutor tcl_platform
Index: lang/tcltutor//pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/tcltutor/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- lang/tcltutor//pkg/PLIST 2 May 2008 06:43:46 -0000 1.1.1.1
+++ lang/tcltutor//pkg/PLIST 21 Oct 2008 05:47:18 -0000
@@ -50,6 +50,10 @@
share/doc/tcltutor/Tcl_English/Tcl_English41.lsn
share/doc/tcltutor/Tcl_English/Tcl_English42.lsn
share/doc/tcltutor/Tcl_English/Tcl_English43.lsn
+share/doc/tcltutor/Tcl_English/Tcl_English44.lsn
+share/doc/tcltutor/Tcl_English/Tcl_English45.lsn
+share/doc/tcltutor/Tcl_English/Tcl_English46.lsn
+share/doc/tcltutor/Tcl_English/Tcl_English47.lsn
share/doc/tcltutor/Tcl_English/Tcl_English5.lsn
share/doc/tcltutor/Tcl_English/Tcl_English6.lsn
share/doc/tcltutor/Tcl_English/Tcl_English7.lsn
