From nobody@FreeBSD.org  Thu Sep 13 16:00:43 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6669D106566C
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <gahr@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] misc/dotfile -- fix with Tcl/Tk > 8.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         171612
>Category:       ports
>Synopsis:       [patch] misc/dotfile -- fix with Tcl/Tk > 8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 13 16:10:02 UTC 2012
>Closed-Date:    Thu Sep 20 14:44:41 UTC 2012
>Last-Modified:  Thu Sep 20 14:50:06 UTC 2012
>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<h1>---------------</h1>" >> 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 <bsd.port.pre.mk>
 
@@ -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:
Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Sep 13 19:24:49 UTC 2012 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171612 
Responsible-Changed-From-To: freebsd-ports-bugs->beat 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Sep 13 19:25:18 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171612 
State-Changed-From-To: open->closed 
State-Changed-By: beat 
State-Changed-When: Thu Sep 20 14:44:40 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171612 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171612: commit references a PR
Date: Thu, 20 Sep 2012 14:44:32 +0000 (UTC)

 Author: beat
 Date: Thu Sep 20 14:44:13 2012
 New Revision: 304583
 URL: http://svn.freebsd.org/changeset/ports/304583
 
 Log:
   - Fix with Tcl/Tk > 8.2 [1]
   - Convert to OptionsNG
   - Drop maintainership
   
   PR:		ports/171612 [1]
   Submitted by:	gahr [1]
 
 Added:
   head/misc/dotfile/files/patch-Generator_types.tcl   (contents, props changed)
 Deleted:
   head/misc/dotfile/files/patch-af
 Modified:
   head/misc/dotfile/Makefile
   head/misc/dotfile/files/patch-Modules-english-procmail-configure
   head/misc/dotfile/files/patch-ag
   head/misc/dotfile/files/patch-configure
   head/misc/dotfile/pkg-plist
 
 Modified: head/misc/dotfile/Makefile
 ==============================================================================
 --- head/misc/dotfile/Makefile	Thu Sep 20 14:38:19 2012	(r304582)
 +++ head/misc/dotfile/Makefile	Thu Sep 20 14:44:13 2012	(r304583)
 @@ -11,7 +11,7 @@ PORTREVISION=	2
  CATEGORIES=	misc tk
  MASTER_SITES=	http://www.blackie.dk/dotfile/download/
  
 -MAINTAINER=	beat@FreeBSD.org
 +MAINTAINER=	ports@FreeBSD.org
  COMMENT=	A GUI dotfile generator program to create .config files
  
  BUILD_DEPENDS=	formail:${PORTSDIR}/mail/procmail
 @@ -22,20 +22,22 @@ NO_BUILD=	yes
  
  MAN1=		dotfile.1
  
 -OPTIONS=	JAPANESE "Use Japanese as default language" off
 +OPTIONS_DEFINE=	JAPANESE
 +JAPANESE_DESC=	Use Japanese as default language
  
 -USE_TK=		82
 -USE_TK_BUILD=	82
 +USE_TK=		yes
  
  .include <bsd.port.pre.mk>
  
 -.if defined(WITH_JAPANESE)
 +.if ${PORT_OPTIONS:MJAPANESE}
  CONFIGURE_ENV+=	LANGUAGE="japanese"
  .endif
  
  post-patch:
 -	@${RM} ${WRKSRC}/Modules/english/procmail/configure.orig
 -	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dotfile
 +	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; s|%%WISH%%|wish${TK_VER}|g; \
 +		s|%%TCLSH%%|tclsh${TCL_VER}|g" ${WRKSRC}/${CONFIGURE_SCRIPT} \
 +		${WRKSRC}/Generator/makeHelp ${WRKSRC}/Modules/english/procmail/${CONFIGURE_SCRIPT}
 +	${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 +45,9 @@ post-configure:
  	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
 
 Added: head/misc/dotfile/files/patch-Generator_types.tcl
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/misc/dotfile/files/patch-Generator_types.tcl	Thu Sep 20 14:44:13 2012	(r304583)
 @@ -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\""
 +     }
 
 Modified: head/misc/dotfile/files/patch-Modules-english-procmail-configure
 ==============================================================================
 --- head/misc/dotfile/files/patch-Modules-english-procmail-configure	Thu Sep 20 14:38:19 2012	(r304582)
 +++ head/misc/dotfile/files/patch-Modules-english-procmail-configure	Thu Sep 20 14:44:13 2012	(r304583)
 @@ -1,12 +1,11 @@
 ---- Modules/english/procmail/configure.orig	Sat Feb 19 20:15:42 2000
 -+++ Modules/english/procmail/configure	Tue Mar 13 12:59:19 2007
 -@@ -533,8 +533,7 @@
 - echo "----------------------------------------------------------------------"
 +--- Modules/english/procmail/configure.orig	2012-09-18 19:44:28.000000000 +0200
 ++++ Modules/english/procmail/configure	2012-09-18 19:44:42.000000000 +0200
 +@@ -534,7 +534,7 @@
   echo "----------------------------------------------------------------------"
   
 --
 + 
  -for ac_prog in tclsh7.6 tclsh7.5 tclsh7.4 tclsh
 -+for ac_prog in tclsh8.2 tclsh8.1 tclsh8.0 tclsh7.6 tclsh7.5 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
 
 Modified: head/misc/dotfile/files/patch-ag
 ==============================================================================
 --- head/misc/dotfile/files/patch-ag	Thu Sep 20 14:38:19 2012	(r304582)
 +++ head/misc/dotfile/files/patch-ag	Thu Sep 20 14:44:13 2012	(r304583)
 @@ -5,4 +5,4 @@
   echo "\n\n<h1>---------------</h1>" >> 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
 
 Modified: head/misc/dotfile/files/patch-configure
 ==============================================================================
 --- head/misc/dotfile/files/patch-configure	Thu Sep 20 14:38:19 2012	(r304582)
 +++ head/misc/dotfile/files/patch-configure	Thu Sep 20 14:44:13 2012	(r304583)
 @@ -12,7 +12,16 @@
  +  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
 +@@ -679,7 +686,7 @@
 + 
 + 
 + if test "$WISH" = ""; then
 +-  for ac_prog in wish8.2jp wish8.2 wish8.1jp wish8.1 wish8.0jp wish8.0 wish4.2jp wish4.2 wish4.1jp wish4.1 wish4.0jp wish4.0 wish
 ++  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 +30,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
 
 Modified: head/misc/dotfile/pkg-plist
 ==============================================================================
 --- head/misc/dotfile/pkg-plist	Thu Sep 20 14:38:19 2012	(r304582)
 +++ head/misc/dotfile/pkg-plist	Thu Sep 20 14:44:13 2012	(r304583)
 @@ -42,7 +42,6 @@ lib/%%DISTNAME%%/Generator/language.tcl
  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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
