Attachment #127759 for bug #171612

View | Details | Raw Unified | Return to bug 171612
Collapse All | Expand All

Lines 5-10 Link Here

(-)files/patch-af (-1 / +1 lines)
5	echo ""	5	echo ""
6	else	6	else
7	- exec /usr/local/bin/wish -f Generator/dotfile.tcl Generator Modules/$1 $2	7	- exec /usr/local/bin/wish -f Generator/dotfile.tcl Generator Modules/$1 $2
8	+ exec %%LOCALBASE%%/bin/wish8.2 -f Generator/dotfile.tcl Generator Modules/$1 $2	8	+ exec %%WISH%% -f Generator/dotfile.tcl Generator Modules/$1 $2
9	fi	9	fi
10		10

Lines 5-8 Link Here

(-)files/patch-ag (-1 / +1 lines)
5	echo "\n\n<h1>---------------</h1>" >> helpfile.data	5	echo "\n\n<h1>---------------</h1>" >> helpfile.data
6	cat $2 >> helpfile.data	6	cat $2 >> helpfile.data
7	-wish $1/makeHelp.tcl helpfile.data generatedHelp $1	7	-wish $1/makeHelp.tcl helpfile.data generatedHelp $1
8	+wish8.2 $1/makeHelp.tcl helpfile.data generatedHelp $1	8	+%%WISH%% $1/makeHelp.tcl helpfile.data generatedHelp $1




--- 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\""
     }

Lines 12-18 Link Here

(-)files/patch-configure (-2 / +2 lines)
12	+ LANGUAGE="english";	12	+ LANGUAGE="english";
13	+fi	13	+fi
14	+	14	+
15	+for ac_prog in wish8.2 wish8.1 wish8.0 wish4.2jp wish4.2 wish4.1jp wish4.1 wish4.0jp wish4.0	15	+for ac_prog in %%WISH%%
16	do	16	do
17	# Extract the first word of "$ac_prog", so it can be a program name with args.	17	# Extract the first word of "$ac_prog", so it can be a program name with args.
18	set dummy $ac_prog; ac_word=$2	18	set dummy $ac_prog; ac_word=$2
Lines 21-27 Link Here
21	fi	21	fi
22	fi	22	fi
23	-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	23	-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
24	+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	24	+for ac_prog in %%TCLSH%%
25	do	25	do
26	# Extract the first word of "$ac_prog", so it can be a program name with args.	26	# Extract the first word of "$ac_prog", so it can be a program name with args.
27	set dummy $ac_prog; ac_word=$2	27	set dummy $ac_prog; ac_word=$2

Lines 42-48 Link Here

(-)pkg-plist (-1 lines)
42	lib/%%DISTNAME%%/Generator/load.tcl	42	lib/%%DISTNAME%%/Generator/load.tcl
43	lib/%%DISTNAME%%/Generator/mail.tcl	43	lib/%%DISTNAME%%/Generator/mail.tcl
44	lib/%%DISTNAME%%/Generator/makeHelp	44	lib/%%DISTNAME%%/Generator/makeHelp
45	lib/%%DISTNAME%%/Generator/makeHelp.orig
46	lib/%%DISTNAME%%/Generator/makeHelp.tcl	45	lib/%%DISTNAME%%/Generator/makeHelp.tcl
47	lib/%%DISTNAME%%/Generator/menus.tcl	46	lib/%%DISTNAME%%/Generator/menus.tcl
48	lib/%%DISTNAME%%/Generator/parse.tcl	47	lib/%%DISTNAME%%/Generator/parse.tcl

Lines 24-31 Link Here

(-)Makefile (-3 / +7 lines)
24		24
25	OPTIONS= JAPANESE "Use Japanese as default language" off	25	OPTIONS= JAPANESE "Use Japanese as default language" off
26		26
27	USE_TK= 82	27	USE_TK= yes
28	USE_TK_BUILD= 82
29		28
30	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
31		30
Lines 35-41 Link Here
35		34
36	post-patch:	35	post-patch:
37	@${RM} ${WRKSRC}/Modules/english/procmail/configure.orig	36	@${RM} ${WRKSRC}/Modules/english/procmail/configure.orig
38	@${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" ${WRKSRC}/dotfile	37	@${REINPLACE_CMD} -e "s\|%%WISH%%\|wish${TK_VER}\|g; s\|%%TCLSH%%\|tclsh${TCL_VER}\|g" \
		38	${WRKSRC}/dotfile ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/Generator/makeHelp
		39	${FIND} ${WRKSRC} $ -name ".orig" -o -name ".bak" $ -delete
39		40
40	post-configure:	41	post-configure:
41	@(cd ${WRKSRC}/Modules/english/procmail && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \	42	@(cd ${WRKSRC}/Modules/english/procmail && CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS}" \
Lines 43-48 Link Here
43	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \	44	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
44	${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})	45	${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
45		46
		47	do-install:
		48	cd ${WRKSRC} && ${SETENV} LC_ALL=C ${MAKE} install
		49
46	post-install:	50	post-install:
47	.ifndef(NOPORTDOCS)	51	.ifndef(NOPORTDOCS)
48	@${MKDIR} ${DOCSDIR}/dotfile	52	@${MKDIR} ${DOCSDIR}/dotfile

Return to bug 171612

Line 0 Link Here

(-)files/patch-Generator_types.tcl (+13 lines)
	1	--- Generator/types.tcl.orig 2012-09-13 17:01:08.000000000 +0200
	2	+++ Generator/types.tcl 2012-09-13 17:01:48.000000000 +0200
	3	@@ -1540,7 +1540,9 @@
	4	}
	5	}
	6	line -
	7	- header {} ;# please ignore.
	8	+ header {
	9	+ ;# please ignore.
	10	+ }
	11	default {
	12	warning "setVariable: unknow widget type: \"$type\""
	13	}