From owner-freebsd-bugs@FreeBSD.ORG Thu Sep 13 16:10:02 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6D5E106566B for ; Thu, 13 Sep 2012 16:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 99D538FC18 for ; Thu, 13 Sep 2012 16:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8DGA2Z5020097 for ; Thu, 13 Sep 2012 16:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8DGA2sE020088; Thu, 13 Sep 2012 16:10:02 GMT (envelope-from gnats) Resent-Date: Thu, 13 Sep 2012 16:10:02 GMT Resent-Message-Id: <201209131610.q8DGA2sE020088@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pietro Cerutti Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6669D106566C for ; Thu, 13 Sep 2012 16:00:43 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 513728FC0A for ; Thu, 13 Sep 2012 16:00:43 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8DG0hcs015691 for ; Thu, 13 Sep 2012 16:00:43 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q8DG0h5H015690; Thu, 13 Sep 2012 16:00:43 GMT (envelope-from nobody) Message-Id: <201209131600.q8DG0h5H015690@red.freebsd.org> Date: Thu, 13 Sep 2012 16:00:43 GMT From: Pietro Cerutti To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/171612: [patch] misc/dotfile -- fix with Tcl/Tk > 8.2 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2012 16:10:02 -0000 >Number: 171612 >Category: misc >Synopsis: [patch] misc/dotfile -- fix with Tcl/Tk > 8.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Sep 13 16:10:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pietro Cerutti >Release: >Organization: The FreeBSD Project >Environment: >Description: I have run a bit the program to see whether it works with Tcl/Tk 8.5 (the default now) and it seems that windows and dialogs are displayed just fine, but I don't know the software so I'd like you to test it... >How-To-Repeat: >Fix: Patch attached with submission follows: Index: files/patch-af =================================================================== --- files/patch-af (revision 304220) +++ files/patch-af (working copy) @@ -5,6 +5,6 @@ echo "" else - exec /usr/local/bin/wish -f Generator/dotfile.tcl Generator Modules/$1 $2 -+ exec %%LOCALBASE%%/bin/wish8.2 -f Generator/dotfile.tcl Generator Modules/$1 $2 ++ exec %%WISH%% -f Generator/dotfile.tcl Generator Modules/$1 $2 fi Index: files/patch-ag =================================================================== --- files/patch-ag (revision 304220) +++ files/patch-ag (working copy) @@ -5,4 +5,4 @@ echo "\n\n

---------------

" >> helpfile.data cat $2 >> helpfile.data -wish $1/makeHelp.tcl helpfile.data generatedHelp $1 -+wish8.2 $1/makeHelp.tcl helpfile.data generatedHelp $1 ++%%WISH%% $1/makeHelp.tcl helpfile.data generatedHelp $1 Index: files/patch-Generator_types.tcl =================================================================== --- files/patch-Generator_types.tcl (revision 0) +++ files/patch-Generator_types.tcl (working copy) @@ -0,0 +1,13 @@ +--- Generator/types.tcl.orig 2012-09-13 17:01:08.000000000 +0200 ++++ Generator/types.tcl 2012-09-13 17:01:48.000000000 +0200 +@@ -1540,7 +1540,9 @@ + } + } + line - +- header {} ;# please ignore. ++ header { ++ ;# please ignore. ++ } + default { + warning "setVariable: unknow widget type: \"$type\"" + } Property changes on: files/patch-Generator_types.tcl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-configure =================================================================== --- files/patch-configure (revision 304220) +++ files/patch-configure (working copy) @@ -12,7 +12,7 @@ + LANGUAGE="english"; +fi + -+for ac_prog in wish8.2 wish8.1 wish8.0 wish4.2jp wish4.2 wish4.1jp wish4.1 wish4.0jp wish4.0 ++for ac_prog in %%WISH%% do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -21,7 +21,7 @@ fi fi -for ac_prog in tclsh8.2jp tclsh8.2 tclsh8.1jp tclsh8.1 tclsh8.0jp tclsh8.0 tclsh7.6jp tclsh7.6 tclsh7.5jp tclsh7.5 tclsh7.4jp tclsh7.4 tclsh -+for ac_prog in tclsh8.2 tclsh8.2jp tclsh8.1 tclsh8.0jp tclsh8.0 tclsh7.6jp tclsh7.6 tclsh7.5jp tclsh7.5 tclsh7.4jp tclsh7.4 tclsh ++for ac_prog in %%TCLSH%% do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 Index: pkg-plist =================================================================== --- pkg-plist (revision 304220) +++ pkg-plist (working copy) @@ -42,7 +42,6 @@ lib/%%DISTNAME%%/Generator/load.tcl lib/%%DISTNAME%%/Generator/mail.tcl lib/%%DISTNAME%%/Generator/makeHelp -lib/%%DISTNAME%%/Generator/makeHelp.orig lib/%%DISTNAME%%/Generator/makeHelp.tcl lib/%%DISTNAME%%/Generator/menus.tcl lib/%%DISTNAME%%/Generator/parse.tcl Index: Makefile =================================================================== --- Makefile (revision 304220) +++ Makefile (working copy) @@ -24,8 +24,7 @@ OPTIONS= JAPANESE "Use Japanese as default language" off -USE_TK= 82 -USE_TK_BUILD= 82 +USE_TK= yes .include @@ -35,7 +34,9 @@ post-patch: @${RM} ${WRKSRC}/Modules/english/procmail/configure.orig - @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dotfile + @${REINPLACE_CMD} -e "s|%%WISH%%|wish${TK_VER}|g; s|%%TCLSH%%|tclsh${TCL_VER}|g" \ + ${WRKSRC}/dotfile ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/Generator/makeHelp + ${FIND} ${WRKSRC} \( -name "*.orig" -o -name "*.bak" \) -delete post-configure: @(cd ${WRKSRC}/Modules/english/procmail && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \ @@ -43,6 +44,9 @@ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) +do-install: + cd ${WRKSRC} && ${SETENV} LC_ALL=C ${MAKE} install + post-install: .ifndef(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/dotfile >Release-Note: >Audit-Trail: >Unformatted: