ports/132144: [PATCH]lang/tcl85: unbreak build WITH_TCL85_MAN, fix plist WITH_TZDATA

[bf]

>Number:         132144
>Category:       ports
>Synopsis:       [PATCH]lang/tcl85: unbreak build WITH_TCL85_MAN, fix plist WITH_TZDATA
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 27 00:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        8-CURRENT i386
>Organization:
-
>Environment:
>Description:
The install target is broken if WITH_TCL85_MAN is defined:

"/bin/mkdir -p /usr/local/share/tcl8.5
install  -o root -g wheel -m 444 /tmp/usr/ports/lang/tcl85/work/tcl8.5.6/unix/../doc/man.macros /usr/local/share/tcl8.5
/bin/mkdir -p /usr/local/man/man1
install  -o root -g wheel -m 444 /tmp/usr/ports/lang/tcl85/work/tcl8.5.6/unix/../doc/tclsh.1 /usr/local/man/man1/tclsh8.5.1
sed: /tmp/usr/ports/lang/tcl85/work/tcl8.5.6/unix/../doc/tclsh8.5.1: No such file or directory
*** Error code 1"

Also, there is a superfluous empty line, and the plist is missing some files
in the WITH_TZDATA case.

Since this is an important port, there should be more testing, even of non-default
OPTIONS, before future commits.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN tcl85.orig/Makefile tcl85/Makefile
--- tcl85.orig/Makefile	2009-02-26 23:54:04.000000000 +0000
+++ tcl85/Makefile	2009-02-26 23:57:16.000000000 +0000
@@ -72,7 +72,6 @@
 
 CONFIGURE_ARGS+=	--disable-threads
 
-
 .if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL85_MAN)
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
@@ -755,7 +754,7 @@
 	${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1
 .if !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL85_MAN)
-. for mp in ${MAN1} ${MAN3} ${MANN}
+. for mp in ${MAN3} ${MANN}
 	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
 		${WRKSRC}/../doc/${mp}
 . endfor
diff -ruN tcl85.orig/pkg-plist tcl85/pkg-plist
--- tcl85.orig/pkg-plist	2009-02-26 23:54:04.000000000 +0000
+++ tcl85/pkg-plist	2009-02-27 00:03:08.000000000 +0000
@@ -354,6 +354,7 @@
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/La_Rioja
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Mendoza
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Rio_Gallegos
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Salta
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Juan
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/San_Luis
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Argentina/Tucuman
@@ -460,6 +461,7 @@
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Resolute
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Rio_Branco
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Rosario
+%%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santarem
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santiago
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Santo_Domingo
 %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/America/Sao_Paulo


>Release-Note:
>Audit-Trail:
>Unformatted: