From 90360f8b1bee88cc747db79f77e37b146a872cfe Mon Sep 17 00:00:00 2001 From: steven Date: Tue, 21 Oct 2008 21:49:46 +0000 Subject: [PATCH] update to 30b2 prettier makefile from maintainer Stuart Cassoff --- lang/tcltutor/Makefile | 71 ++++++++++++------------ lang/tcltutor/distinfo | 10 ++-- lang/tcltutor/patches/patch-TclTutor_tcl | 16 +++--- lang/tcltutor/pkg/PLIST | 6 +- 4 files changed, 54 insertions(+), 49 deletions(-) diff --git a/lang/tcltutor/Makefile b/lang/tcltutor/Makefile index 712ac3527f9..c98f36f8edb 100644 --- a/lang/tcltutor/Makefile +++ b/lang/tcltutor/Makefile @@ -1,53 +1,54 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $ +# $OpenBSD: Makefile,v 1.2 2008/10/21 21:49: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 +HOMEPAGE = http://www.msen.com/~clif/TclTutor.html + +MAINTAINER = Stuart Cassoff # 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 -RUN_DEPENDS= :tk->=8.5:x11/tk/8.5 +MASTER_SITES = http://www.msen.com/~clif/ -WRKDIST= ${WRKDIR}/TclTutor +DISTFILES = tcltutor3_0b2.tgz -USE_X11= Yes -NO_BUILD= Yes -NO_REGRESS= Yes +MODULES = x11/tk -TT_LIB_DIR= ${PREFIX}/lib/tcltutor -TT_LSN_DIR= ${PREFIX}/share/doc/tcltutor +RUN_DEPENDS = ${MODTK_RUN_DEPENDS} + +NO_BUILD = Yes +NO_REGRESS = Yes + +WRKDIST = ${WRKDIR}/TclTutor + +TT_LIB_DIR = ${PREFIX}/lib/tcltutor +TT_LSN_DIR = ${PREFIX}/share/doc/tcltutor + +SUBST_VARS = TT_LIB_DIR TT_LSN_DIR 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 - + @${SUBST_CMD} ${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 diff --git a/lang/tcltutor/distinfo b/lang/tcltutor/distinfo index 9d618920b37..281ca1b0b93 100644 --- a/lang/tcltutor/distinfo +++ b/lang/tcltutor/distinfo @@ -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 diff --git a/lang/tcltutor/patches/patch-TclTutor_tcl b/lang/tcltutor/patches/patch-TclTutor_tcl index df19c33e493..24c74c3eec1 100644 --- a/lang/tcltutor/patches/patch-TclTutor_tcl +++ b/lang/tcltutor/patches/patch-TclTutor_tcl @@ -1,12 +1,12 @@ -$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 +$OpenBSD: patch-TclTutor_tcl,v 1.2 2008/10/21 21:49:46 steven Exp $ +--- TclTutor.tcl.orig Sat Aug 2 05:04:40 2008 ++++ TclTutor.tcl Tue Oct 21 23:46:14 2008 @@ -1,8 +1,8 @@ -package provide app-tcltutor 1.0 #!/bin/sh # \ -exec wish "$0" "$@" -+exec wish8.5 "$0" "$@" ++exec ${MODTK_BIN} "$0" "$@" +package provide app-tcltutor 1.0 package require Tk @@ -18,8 +18,8 @@ $OpenBSD: patch-TclTutor_tcl,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $ "unix" { - set Tutor(sourceHome) [file dirname $argv0] - set Tutor(lessonHome) [file dirname $argv0]/lesson -+ set Tutor(sourceHome) !!TT_LIB_DIR!! -+ set Tutor(lessonHome) !!TT_LSN_DIR!! ++ set Tutor(sourceHome) ${TT_LIB_DIR} ++ set Tutor(lessonHome) ${TT_LSN_DIR} set Tutor(rcHome) $env(HOME) set Tutor(rcfile) [file join $Tutor(rcHome) .tcltutorrc] set Tutor(logFileName) [file join $Tutor(rcHome) .tcltutoract] @@ -49,7 +49,7 @@ $OpenBSD: patch-TclTutor_tcl,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $ 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 +57,7 @@ $OpenBSD: patch-TclTutor_tcl,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $ 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 diff --git a/lang/tcltutor/pkg/PLIST b/lang/tcltutor/pkg/PLIST index 6437714f251..2b9390ece52 100644 --- a/lang/tcltutor/pkg/PLIST +++ b/lang/tcltutor/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/02 06:43:46 steven Exp $ +@comment $OpenBSD: PLIST,v 1.2 2008/10/21 21:49:46 steven Exp $ bin/tcltutor lib/tcltutor/ lib/tcltutor/NOTICE @@ -50,6 +50,10 @@ share/doc/tcltutor/Tcl_English/Tcl_English40.lsn 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