Date: Mon, 28 Jul 2014 22:18:42 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363266 - in head/lang: Gofer/files bwbasic/files emacs-lisp-intro/files pbasic/files tcl84/files tclX/files Message-ID: <201407282218.s6SMIgOP041450@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 22:18:41 2014 New Revision: 363266 URL: http://svnweb.freebsd.org/changeset/ports/363266 QAT: https://qat.redports.org/buildarchive/r363266/ Log: Rename lang/ patch-xy patches to reflect the files they modify. Added: head/lang/Gofer/files/patch-prelude.h - copied unchanged from r363257, head/lang/Gofer/files/patch-ab head/lang/Gofer/files/patch-scripts_gofer - copied unchanged from r363257, head/lang/Gofer/files/patch-ac head/lang/Gofer/files/patch-scripts_goferc - copied unchanged from r363257, head/lang/Gofer/files/patch-ad head/lang/bwbasic/files/patch-bwb_dio.c - copied unchanged from r363257, head/lang/bwbasic/files/patch-ab head/lang/emacs-lisp-intro/files/patch-Makefile.in - copied unchanged from r363257, head/lang/emacs-lisp-intro/files/patch-ac head/lang/emacs-lisp-intro/files/patch-emacs-lisp-intro.texi - copied unchanged from r363257, head/lang/emacs-lisp-intro/files/patch-ab head/lang/pbasic/files/patch-bas6.c - copied unchanged from r363257, head/lang/pbasic/files/patch-aa head/lang/pbasic/files/patch-bas8.c - copied unchanged from r363257, head/lang/pbasic/files/patch-ab head/lang/tcl84/files/patch-Makefile.in - copied unchanged from r363257, head/lang/tcl84/files/patch-aa head/lang/tclX/files/patch-unix_tools_bldmanhelp.tcl - copied unchanged from r363257, head/lang/tclX/files/patch-af Deleted: head/lang/Gofer/files/patch-ab head/lang/Gofer/files/patch-ac head/lang/Gofer/files/patch-ad head/lang/bwbasic/files/patch-ab head/lang/emacs-lisp-intro/files/patch-ab head/lang/emacs-lisp-intro/files/patch-ac head/lang/pbasic/files/patch-aa head/lang/pbasic/files/patch-ab head/lang/tcl84/files/patch-aa head/lang/tclX/files/patch-af Copied: head/lang/Gofer/files/patch-prelude.h (from r363257, head/lang/Gofer/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/Gofer/files/patch-prelude.h Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/Gofer/files/patch-ab) @@ -0,0 +1,46 @@ +--- prelude.h.orig Fri Mar 31 19:13:52 1995 ++++ prelude.h Wed Jan 31 01:41:35 2001 +@@ -28,7 +28,7 @@ + #define ZTC 0 /* For IBM PC (>= 386) Zortech C++ v3.0 (-mx) */ + #define DJGPP 0 /* For DJGPP version 1.09 (gcc2.2.2) and DOS 5.0 */ + #define OS2 0 /* For IBM OS/2 2.0 using EMX GCC */ +-#define SUNOS 1 /* For Sun 3/Sun 4 running SunOs 4.x */ ++#define SUNOS 0 /* For Sun 3/Sun 4 running SunOs 4.x */ + #define MIPS 0 /* For MIPS RC6280/Sony machine NWS-3870 UN */ + #define NEXTSTEP 0 /* For NeXTstep 3.0 using NeXT cc */ + #define NEXTGCC 0 /* For NeXTstep with gcc 2.x, doesn't work w/ NS3.2*/ +@@ -36,6 +36,7 @@ + #define AMIGA 0 /* For Amiga using gcc 2.2.2 UN */ + #define HPUX 0 /* For HPUX using gcc */ + #define LINUX 0 /* For Linux using gcc UN */ ++#define FREEBSD 1 /* For FreeBSD using gcc UN */ + #define RISCOS 0 /* For Acorn DesktopC and RISCOS2 or 3 */ + #define ALPHA 0 /* For DEC Alpha with OSF/1 (32 bit ints, no gofc) */ + #define SVR4 0 /* For SVR4 using GCC2.2 */ +@@ -82,7 +83,7 @@ + + #define UNIX (SUNOS | NEXTSTEP | HPUX | NEXTGCC | LINUX | AMIGA | \ + MINIX68K | ALPHA | OS2 | SVR4 | ULTRIX | AIX | MIPS |\ +- SGI4 | NETBSD) ++ SGI4 | NETBSD | FREEBSD) + #define SMALL_GOFER (TURBOC | BCC) + #define REGULAR_GOFER (RISCOS | DJGPP | ZTC | ATARI) + #define LARGE_GOFER (UNIX | WATCOM) +@@ -91,7 +92,7 @@ + #define TERMIO_IO (LINUX | HPUX | OS2 | SVR4 | SGI4) + #define SGTTY_IO (SUNOS | NEXTSTEP | NEXTGCC | AMIGA | MINIX68K | \ + ALPHA | ULTRIX | AIX | MIPS) +-#define TERMIOS_IO (NETBSD) ++#define TERMIOS_IO (NETBSD | FREEBSD) + #define BREAK_FLOATS (TURBOC | BCC) + #define HAS_FLOATS (REGULAR_GOFER | LARGE_GOFER | BREAK_FLOATS) + +@@ -202,7 +203,7 @@ + #define farCalloc(n,s) (Void *)valloc(((unsigned)n)*((unsigned)s)) + #endif + +-#if (HPUX | DJGPP | ZTC | LINUX | ALPHA | OS2 | SVR4 | AIX | SGI4 | NETBSD) ++#if (HPUX | DJGPP | ZTC | LINUX | ALPHA | OS2 | SVR4 | AIX | SGI4 | NETBSD | FREEBSD) + #include <stdlib.h> + #define far + #endif Copied: head/lang/Gofer/files/patch-scripts_gofer (from r363257, head/lang/Gofer/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/Gofer/files/patch-scripts_gofer Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/Gofer/files/patch-ac) @@ -0,0 +1,23 @@ +--- ../scripts/gofer.orig Fri Jun 24 01:00:00 1994 ++++ ../scripts/gofer Wed Jan 31 01:45:21 2001 +@@ -9,10 +9,10 @@ + # Edited by Jonathan Bowen, Oxford University, August 1993 + + # Location of gofer files - site specific +-ROOT=/usr/local/gofer ++ROOT=%%PREFIX%%/lib/Gofer + + # first, the location of your prelude file: +-GOFER=${GOFER-$ROOT/lib/standard.prelude} ++GOFER=${GOFER-$ROOT/standard.prelude} + export GOFER + + # next, command line argument settings. One example might be: +@@ -33,5 +33,5 @@ + esac + + # Finally, start the interpreter running: +-# exec /usr/local/lib/Gofer/gofer $GOFERARGS $* +-exec $ROOT/bin/Gofer $GOFERARGS $* ++# exec %%PREFIX%%/lib/Gofer/gofer $GOFERARGS $* ++exec $ROOT/gofer $GOFERARGS $* Copied: head/lang/Gofer/files/patch-scripts_goferc (from r363257, head/lang/Gofer/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/Gofer/files/patch-scripts_goferc Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/Gofer/files/patch-ad) @@ -0,0 +1,17 @@ +--- ../scripts/goferc.orig Fri Jun 24 01:00:00 1994 ++++ ../scripts/goferc Wed Jan 31 01:44:26 2001 +@@ -29,11 +29,10 @@ + ;; + esac + +-GOFER=/home/staff/ian/gofer/lib/standard.prelude ++GOFER=%%PREFIX%%/lib/Gofer/standard.prelude + export GOFER +-/usr/local/lib/Gofer/gofc $args ++%%PREFIX%%/lib/Gofer/gofc $args + echo '[Compiling with gcc]' +-gcc -o $prog -O $prog.c /usr/local/lib/Gofer/runtime.o -lm ++%%CC%% -o $prog %%CFLAGS%% $prog.c %%PREFIX%%/lib/Gofer/runtime.o -lm + strip $prog + rm $prog.c +- Copied: head/lang/bwbasic/files/patch-bwb_dio.c (from r363257, head/lang/bwbasic/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/bwbasic/files/patch-bwb_dio.c Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/bwbasic/files/patch-ab) @@ -0,0 +1,44 @@ +--- ../../foo/bwbasic-2.20/bwb_dio.c Sun Nov 26 09:02:18 1995 ++++ bwb_dio.c Thu Jan 16 11:10:58 1997 +@@ -90,7 +90,6 @@ + { + FILE *fp; + struct exp_ese *e; +- int previous_buffer; + char atbuf[ MAXSTRINGSIZE + 1 ]; + char first[ MAXSTRINGSIZE + 1 ]; + char devname[ MAXSTRINGSIZE + 1 ]; +@@ -98,7 +97,6 @@ + /* initialize */ + + mode = req_devnumber = rlen = -1; +- previous_buffer = FALSE; + + /* get the first expression element up to comma or whitespace */ + +@@ -435,7 +433,15 @@ + sprintf( bwb_ebuf, "in bwb_open(): using previously closed file (and buffer)" ); + bwb_debug( bwb_ebuf ); + #endif +- previous_buffer = TRUE; ++ /* ++ * Previous code assumed that buffer was always valid, and ++ * always the right size. (MJS) ++ */ ++ if (dev_table[ req_devnumber ].buffer != NULL) ++ { ++ free (dev_table[ req_devnumber ].buffer); ++ dev_table[ req_devnumber ].buffer = NULL; ++ } + } + + if ( ( dev_table[ req_devnumber ].mode != DEVMODE_CLOSED ) && +@@ -512,7 +518,7 @@ + + /* allocate a character buffer for random access */ + +- if (( mode == DEVMODE_RANDOM ) && ( previous_buffer != TRUE )) ++ if ( mode == DEVMODE_RANDOM ) + { + /* Revised to CALLOC pass-thru call by JBV */ + if ( ( dev_table[ req_devnumber ].buffer = CALLOC( rlen + 1, 1, "bwb_open" )) == NULL ) Copied: head/lang/emacs-lisp-intro/files/patch-Makefile.in (from r363257, head/lang/emacs-lisp-intro/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/emacs-lisp-intro/files/patch-Makefile.in Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/emacs-lisp-intro/files/patch-ac) @@ -0,0 +1,11 @@ +--- Makefile.in.orig Mon Dec 17 19:24:43 2001 ++++ Makefile.in Sun Dec 23 05:29:31 2001 +@@ -57,7 +57,7 @@ + NORMAL_UNINSTALL = : + PRE_UNINSTALL = : + POST_UNINSTALL = : +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + Copied: head/lang/emacs-lisp-intro/files/patch-emacs-lisp-intro.texi (from r363257, head/lang/emacs-lisp-intro/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/emacs-lisp-intro/files/patch-emacs-lisp-intro.texi Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/emacs-lisp-intro/files/patch-ab) @@ -0,0 +1,26 @@ +--- emacs-lisp-intro.texi.orig Mon Dec 17 19:19:08 2001 ++++ emacs-lisp-intro.texi Tue Jan 8 22:35:19 2002 +@@ -3,6 +3,10 @@ + @setfilename emacs-lisp-intro.info + @c sethtmlfilename emacs-lisp-intro.html + @settitle Programming in Emacs Lisp ++@dircategory Emacs Lisp programming ++@direntry ++* Emacs Lisp Intro: (emacs-lisp-intro.info). Programming in Emacs Lisp. ++@end direntry + @syncodeindex vr cp + @syncodeindex fn cp + @setchapternewpage odd +@@ -218,12 +222,6 @@ + @end tex + + @c ---------------------------------------------------- +- +-@dircategory Emacs +-@direntry +-* Emacs Lisp Intro: (eintr). +- A simple introduction to Emacs Lisp programming. +-@end direntry + + @ifinfo + This is an introduction to @cite{Programming in Emacs Lisp}, for Copied: head/lang/pbasic/files/patch-bas6.c (from r363257, head/lang/pbasic/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pbasic/files/patch-bas6.c Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/pbasic/files/patch-aa) @@ -0,0 +1,25 @@ +This patch by Julian Stacey <jhs@FreeBSD.Org> + +*** bas6.c Fri Aug 11 12:17:21 1995 +--- bas6.c Sun Aug 13 15:53:25 1995 +*************** +*** 162,168 **** +--- 162,179 ---- + * written at the same time + */ + ++ #ifndef __FreeBSD__ + long lseek(); ++ /* To phil C phil@gmrs.isar.de ++ From Julian S jhs@freebsd.org ++ Date 950813 ++ FreeBSD current has ++ off_t lseek __P((int, off_t, int)); ++ & reports ++ /usr/include/unistd.h:82: previous declaration of `lseek' ++ however you might want a more general ifndef BSD or similar perhaps ? ++ */ ++ #endif + + int + bfopen() Copied: head/lang/pbasic/files/patch-bas8.c (from r363257, head/lang/pbasic/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pbasic/files/patch-bas8.c Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/pbasic/files/patch-ab) @@ -0,0 +1,53 @@ +--- ./bas8.c.org Fri Aug 11 03:17:25 1995 ++++ ./bas8.c Mon May 10 15:18:08 1999 +@@ -10,12 +10,12 @@ + + #ifdef __STDC__ + static void clear_prog(void); +-static int listl(lpoint), pwrite(filebufp, CHAR *, int), def_fn(int, int); ++static int listl(lpoint), mypwrite(filebufp, CHAR *, int), def_fn(int, int); + static lpoint get_end(void); + static STR strpat(STR, STR, STR); + #else + static void clear_prog(); +-static int listl(), pwrite(), def_fn(); ++static int listl(), mypwrite(), def_fn(); + static lpoint get_end(); + static STR strpat(); + #endif +@@ -495,7 +495,7 @@ + */ + /*ARGSUSED*/ + static int +-pwrite(filebufp fp, CHAR *buf, int len) ++mypwrite(filebufp fp, CHAR *buf, int len) + { + fp = fp; + return((int)write(1, (char *)buf, (unsigned)len)); +@@ -517,7 +517,7 @@ + */ + /*ARGSUSED*/ + static int +-pwrite(fp, buf, len) ++mypwrite(fp, buf, len) + filebufp fp; + CHAR *buf; + int len; +@@ -585,7 +585,7 @@ + Twidth = filedes->bufsiz; + } + else { +- outfunc = pwrite; ++ outfunc = mypwrite; + curcursor= &cursor; + Twidth = ter_width; + } +@@ -806,7 +806,7 @@ + Twidth = filedes->bufsiz; + } + else { +- outfunc = pwrite; ++ outfunc = mypwrite; + curcursor= &cursor; + Twidth = ter_width; + point--; Copied: head/lang/tcl84/files/patch-Makefile.in (from r363257, head/lang/tcl84/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/tcl84/files/patch-Makefile.in Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/tcl84/files/patch-aa) @@ -0,0 +1,115 @@ +--- Makefile.in.orig 2013-06-03 19:29:06.000000000 +0200 ++++ Makefile.in 2014-02-03 09:56:38.000000000 +0100 +@@ -56,6 +56,8 @@ + + # Directory in which to install the include file tcl.h: + INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) ++GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic ++UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix + + # Path to the private tcl header dir: + PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ +@@ -101,7 +103,7 @@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) + #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) ++CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) + + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -468,7 +470,8 @@ + + all: binaries libraries doc + +-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh ++binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ ++ libtcl${SHORT_TCL_VER}.a tclsh + + libraries: + +@@ -479,6 +482,15 @@ + ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} + rm -f $@ + @MAKE_LIB@ ++ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so ++ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ ++ $(RANLIB) ${LIB_FILE}; \ ++ fi ++ ++libtcl${SHORT_TCL_VER}.a: ${OBJS} ++ rm -f libtcl${SHORT_TCL_VER}.a ++ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} ++ $(RANLIB) libtcl${SHORT_TCL_VER}.a + + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} + rm -f $@ +@@ -605,7 +617,7 @@ + dltest.marker: ${STUB_LIB_FILE} + cd dltest ; $(MAKE) + +-INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ ++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ + + install: $(INSTALL_TARGETS) + +@@ -631,9 +643,15 @@ + @if test ! -x $(SRC_DIR)/install-sh; then \ + chmod +x $(SRC_DIR)/install-sh; \ + fi +- @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" ++ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @@INSTALL_LIB@ + @chmod 555 $(DLL_INSTALL_DIR)/$(LIB_FILE) ++ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so ++ @echo "Installing libtcl${SHORT_TCL_VER}.a" ++ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ ++ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a + @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ + echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ + $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ +@@ -641,8 +659,9 @@ + fi + @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" + @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) +- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" +- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh ++ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/" ++ @mkdir -p $(SCRIPT_INSTALL_DIR) ++ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh + @if test "$(STUB_LIB_FILE)" != "" ; then \ + echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ + @INSTALL_STUB_LIB@ ; \ +@@ -668,7 +687,8 @@ + @EXTRA_INSTALL_BINARIES@ + + install-libraries: libraries +- @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ ++ @for i in "$(GENERIC_INCLUDE_INSTALL_DIR)" "$(UNIX_INCLUDE_INSTALL_DIR)" \ ++ "$(SCRIPT_INSTALL_DIR)"; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +@@ -690,11 +710,17 @@ + chmod +x $(SRC_DIR)/install-sh; \ + fi + @echo "Installing header files"; +- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ +- $(GENERIC_DIR)/tclPlatDecls.h; \ ++ @for i in $(GENERIC_DIR)/*.h ; \ ++ do \ ++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ ++ done; ++ @for i in $(UNIX_DIR)/*.h ; \ + do \ +- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ + done; ++ @ln -sf generic/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h ++ @ln -sf generic/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h ++ @ln -sf generic/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h + @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; + @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ + $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \ Copied: head/lang/tclX/files/patch-unix_tools_bldmanhelp.tcl (from r363257, head/lang/tclX/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/tclX/files/patch-unix_tools_bldmanhelp.tcl Mon Jul 28 22:18:41 2014 (r363266, copy of r363257, head/lang/tclX/files/patch-af) @@ -0,0 +1,88 @@ +--- unix/tools/bldmanhelp.tcl 2004-12-02 15:33:05.000000000 -0500 ++++ unix/tools/bldmanhelp.tcl 2009-11-28 16:41:13.000000000 -0500 +@@ -11,10 +11,9 @@ + # + # The command line is: + # +-# bldmanhelp docdir maninfo helpdir ++# bldmanhelp maninfo helpdir + # + # Where: +-# o docdir is the directory containing the manual pages. + # o maninfo is the path to a file that when sources returns a list of + # entries describing manual pages to convert. Each entry is a list + # of manual file and the path of the help file to generate. +@@ -68,18 +67,41 @@ + + proc CopyManPage {manPage outFH} { + global skipSection ++ global tcl_version + +- set stat [catch { +- open $manPage +- } fh] ++ set section [lindex [split $manPage .] end] ++ if {$section == "macros"} { ++ return ++ } ++ set manPage [file rootname $manPage] ++ if {[catch {exec man -w $section $manPage} page] && ++ [catch {exec man -w $section $manPage$tcl_version} page]} { ++ global gotErrors ++ set gotErrors 1 ++ puts stderr "can't find man-page for \"$manPage\": $page" ++ return ++ } ++ set manPage [split $page ":)"] ++ if {[llength $manPage] > 1} { # Get the source, not from cat ++ set manPage [string trim [lindex $manPage 1]] ++ } ++ ++ if {[string match *.gz $manPage]} { ++ set stat [catch {open "|gzip -d -c $manPage"} fh] ++ } elseif {[string match *.bz2 $manPage]} { ++ set stat [catch {open "|bzip2 -d -c $manPage"} fh] ++ } else { ++ set stat [catch {open $manPage} fh] ++ } + if {$stat != 0} { + global gotErrors + set gotErrors 1 +- puts stderr "can't open \"$manPage\" $fh" ++ puts stderr "can't open \"$manPage\" $fh. (cwd is [pwd])" + return + } + while {[gets $fh line] >= 0} { + switch -glob -- $line { ++ {.so man.macros} {} + .so* { + CopyManPage [lindex $line 1] $outFH + } +@@ -119,11 +141,10 @@ + # for input to buildhelp. + # + +-proc GenInputFile {docDir manInfoTbl tmpFile} { ++proc GenInputFile {manInfoTbl tmpFile} { + + set tmpFH [open $tmpFile w] + set cwd [pwd] +- cd $docDir + + foreach ent $manInfoTbl { + puts stdout " preprocessing $ent" +@@ -144,13 +165,12 @@ + + set tmpFile "bldmanhelp.tmp" + +-set docDir [lindex $argv 0] + set manInfoTbl [source [lindex $argv 1]] + set helpDir [lindex $argv 2] + set brief [lindex $argv 3] + + puts stdout "Begin preprocessing UCB manual files" +-GenInputFile $docDir $manInfoTbl $tmpFile ++GenInputFile $manInfoTbl $tmpFile + + buildhelp $helpDir $brief [list $tmpFile] +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407282218.s6SMIgOP041450>