Date: Tue, 29 Jul 2014 15:20:01 +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: r363336 - in head/textproc: gdict/files jade/files libxslt/files man2html/files mgdiff mgdiff/files openjade/files opensched/files ruby-xmlparser/files rxp/files sgmls/files sgrep/files... Message-ID: <201407291520.s6TFK1UK037917@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Jul 29 15:20:01 2014 New Revision: 363336 URL: http://svnweb.freebsd.org/changeset/ports/363336 QAT: https://qat.redports.org/buildarchive/r363336/ Log: Rename textproc/ patch-xy patches to reflect the files they modify. Added: head/textproc/gdict/files/patch-Makefile - copied unchanged from r363316, head/textproc/gdict/files/patch-aa head/textproc/gdict/files/patch-dict.c - copied unchanged from r363316, head/textproc/gdict/files/patch-ab head/textproc/gdict/files/patch-gdict.c - copied unchanged from r363316, head/textproc/gdict/files/patch-ac head/textproc/jade/files/patch-lib__instmac.m4 - copied unchanged from r363316, head/textproc/jade/files/patch-ac head/textproc/libxslt/files/patch-Makefile.in - copied unchanged from r363316, head/textproc/libxslt/files/patch-aa head/textproc/libxslt/files/patch-libxslt__xsltconfig.h.in - copied unchanged from r363316, head/textproc/libxslt/files/patch-ab head/textproc/man2html/files/patch-man.cgi - copied unchanged from r363316, head/textproc/man2html/files/patch-aa head/textproc/mgdiff/files/patach-Imakefile - copied unchanged from r363316, head/textproc/mgdiff/files/patch-aa head/textproc/openjade/files/patch-Makefile.prog.in - copied unchanged from r363316, head/textproc/openjade/files/patch-ad head/textproc/openjade/files/patch-configure - copied unchanged from r363316, head/textproc/openjade/files/patch-ae head/textproc/opensched/files/patch-Makefile - copied unchanged from r363316, head/textproc/opensched/files/patch-aa head/textproc/opensched/files/patch-src__Makefile - copied unchanged from r363316, head/textproc/opensched/files/patch-af head/textproc/opensched/files/patch-src__graph.c - copied unchanged from r363316, head/textproc/opensched/files/patch-ae head/textproc/opensched/files/patch-src__loadfile.c - copied unchanged from r363316, head/textproc/opensched/files/patch-ag head/textproc/opensched/files/patch-src__print.c - copied unchanged from r363316, head/textproc/opensched/files/patch-ac head/textproc/opensched/files/patch-test__Makefile - copied unchanged from r363316, head/textproc/opensched/files/patch-ab head/textproc/opensched/files/patch-test__test.tex - copied unchanged from r363316, head/textproc/opensched/files/patch-ad head/textproc/ruby-xmlparser/files/patch-lib__wget.rb - copied unchanged from r363316, head/textproc/ruby-xmlparser/files/patch-ab head/textproc/rxp/files/patch-Makefile - copied unchanged from r363316, head/textproc/rxp/files/patch-aa head/textproc/sgmls/files/patch-configure - copied unchanged from r363316, head/textproc/sgmls/files/patch-aa head/textproc/sgrep/files/patch-Makefile - copied unchanged from r363316, head/textproc/sgrep/files/patch-aa head/textproc/sgrep/files/patch-sgrep.1 - copied unchanged from r363316, head/textproc/sgrep/files/patch-ab head/textproc/tclExpat/files/patch-tclexpat.c - copied unchanged from r363316, head/textproc/tclExpat/files/patch-aa head/textproc/wordnet/files/patch-include__wn.h - copied unchanged from r363316, head/textproc/wordnet/files/patch-wn.h head/textproc/wordnet/files/patch-lib__binsrch.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-binsrch head/textproc/wordnet/files/patch-lib__morph.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-ah head/textproc/wordnet/files/patch-lib__search.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-ae head/textproc/wordnet/files/patch-lib__wnglobal.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-wnglobal head/textproc/wordnet/files/patch-lib__wnhelp.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-wnhelp head/textproc/wordnet/files/patch-lib__wnrtl.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-wnrtl head/textproc/wordnet/files/patch-lib__wnutil.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-ab head/textproc/wordnet/files/patch-src__stubs.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-ac head/textproc/wordnet/files/patch-src__wn.c - copied unchanged from r363316, head/textproc/wordnet/files/patch-wn.c head/textproc/wordnet/files/patch-src__wnb_1 - copied unchanged from r363316, head/textproc/wordnet/files/patch-ad head/textproc/wordnet/files/patch-src__wnb_2 - copied unchanged from r363316, head/textproc/wordnet/files/patch-wnb head/textproc/xerces-c2-devel/files/patch-obj__Makefile.in - copied unchanged from r363316, head/textproc/xerces-c2-devel/files/patch-ab head/textproc/xerces-c2-devel/files/patch-threading - copied unchanged from r363316, head/textproc/xerces-c2-devel/files/patch-aa head/textproc/xerces-c2/files/patch-obj__Makefile.in - copied unchanged from r363316, head/textproc/xerces-c2/files/patch-ab head/textproc/xerces-c2/files/patch-threading - copied unchanged from r363316, head/textproc/xerces-c2/files/patch-aa head/textproc/xlhtml/files/patch-xlhtml__xlhtml.c - copied unchanged from r363316, head/textproc/xlhtml/files/patch-ac Deleted: head/textproc/gdict/files/patch-aa head/textproc/gdict/files/patch-ab head/textproc/gdict/files/patch-ac head/textproc/jade/files/patch-ac head/textproc/libxslt/files/patch-aa head/textproc/libxslt/files/patch-ab head/textproc/man2html/files/patch-aa head/textproc/mgdiff/files/patch-aa head/textproc/openjade/files/patch-ad head/textproc/openjade/files/patch-ae head/textproc/opensched/files/patch-aa head/textproc/opensched/files/patch-ab head/textproc/opensched/files/patch-ac head/textproc/opensched/files/patch-ad head/textproc/opensched/files/patch-ae head/textproc/opensched/files/patch-af head/textproc/opensched/files/patch-ag head/textproc/ruby-xmlparser/files/patch-ab head/textproc/rxp/files/patch-aa head/textproc/sgmls/files/patch-aa head/textproc/sgrep/files/patch-aa head/textproc/sgrep/files/patch-ab head/textproc/tclExpat/files/patch-aa head/textproc/wordnet/files/patch-ab head/textproc/wordnet/files/patch-ac head/textproc/wordnet/files/patch-ad head/textproc/wordnet/files/patch-ae head/textproc/wordnet/files/patch-ah head/textproc/wordnet/files/patch-binsrch head/textproc/wordnet/files/patch-wn.c head/textproc/wordnet/files/patch-wn.h head/textproc/wordnet/files/patch-wnb head/textproc/wordnet/files/patch-wnglobal head/textproc/wordnet/files/patch-wnhelp head/textproc/wordnet/files/patch-wnrtl head/textproc/xerces-c2-devel/files/patch-aa head/textproc/xerces-c2-devel/files/patch-ab head/textproc/xerces-c2/files/patch-aa head/textproc/xerces-c2/files/patch-ab head/textproc/xlhtml/files/patch-ac Modified: head/textproc/mgdiff/Makefile Copied: head/textproc/gdict/files/patch-Makefile (from r363316, head/textproc/gdict/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/gdict/files/patch-Makefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/gdict/files/patch-aa) @@ -0,0 +1,14 @@ +--- Makefile Mon Mar 29 08:02:27 1999 ++++ Makefile~ Thu Jul 22 22:25:09 1999 +@@ -1,8 +1,8 @@ + # Makefile for gdict + +-CC = gcc +-CFLAGS = -O6 -Wall +-CFL_GTK = $(CFLAGS) `gtk-config --cflags` `gtk-config --libs` ++CC ?= gcc ++CFLAGS ?= -O6 -Wall ++CFL_GTK = $(CFLAGS) `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs` + CFL = $(CFLAGS) + OBJECTS_GDICT = gdict.c + OBJECTS_DICT = dict.c Copied: head/textproc/gdict/files/patch-dict.c (from r363316, head/textproc/gdict/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/gdict/files/patch-dict.c Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/gdict/files/patch-ab) @@ -0,0 +1,25 @@ +--- dict.c Mon Mar 29 08:10:35 1999 ++++ dict.c~ Thu Jul 22 22:25:16 1999 +@@ -4,11 +4,12 @@ + * Thanks goes out to #linuxos also. :) + */ + ++#include <sys/types.h> + #include <stdio.h> + #include <sys/socket.h> + #include <unistd.h> +-#include <arpa/inet.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <string.h> + + int main (int argc, char *argv[]) { +@@ -40,7 +41,7 @@ + Sockaddr.sin_port = htons(2627); + Sockaddr.sin_addr.s_addr = inet_addr("128.52.39.7"); + +- err = connect (sd, &Sockaddr, sizeof(Sockaddr) ); ++ err = connect (sd, (struct sockaddr *) &Sockaddr, sizeof(Sockaddr) ); + + if (err != 0) { + printf("Could not connect to dictionary server!\n"); Copied: head/textproc/gdict/files/patch-gdict.c (from r363316, head/textproc/gdict/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/gdict/files/patch-gdict.c Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/gdict/files/patch-ac) @@ -0,0 +1,26 @@ +--- gdict.c Mon Mar 29 17:35:54 1999 ++++ gdict.c~ Thu Jul 22 22:25:19 1999 +@@ -13,12 +13,13 @@ + * Window resizing and cleanup by Iain (Nodatadj, EFNet) 23-Mar-1999 + */ + ++#include <sys/types.h> + #include <gtk/gtk.h> + #include <stdio.h> + #include <sys/socket.h> + #include <unistd.h> +-#include <arpa/inet.h> + #include <netinet/in.h> ++#include <arpa/inet.h> + #include <string.h> + + /* globals */ +@@ -154,7 +155,7 @@ + Sockaddr.sin_port = htons(2627); + Sockaddr.sin_addr.s_addr = inet_addr ("128.52.39.7"); + +- err = connect (sd, &Sockaddr, sizeof(Sockaddr)); ++ err = connect (sd, (struct sockaddr *) &Sockaddr, sizeof(Sockaddr)); + + if (err != 0) { + sprintf (buffer, "Could not connect to dictionary server!"); Copied: head/textproc/jade/files/patch-lib__instmac.m4 (from r363316, head/textproc/jade/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/jade/files/patch-lib__instmac.m4 Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/jade/files/patch-ac) @@ -0,0 +1,19 @@ +*** lib/instmac.m4.orig Sun Jul 6 20:20:04 1997 +--- lib/instmac.m4 Sun Jul 6 20:20:54 1997 +*************** +*** 75,81 **** + __undefine(`undefine')__dnl + __undefine(`undivert')__dnl + __undefine(`unix')__dnl +! __dnl __changequote(,)__dnl disable quoting + + #ifdef SP_NAMESPACE + } +--- 75,81 ---- + __undefine(`undefine')__dnl + __undefine(`undivert')__dnl + __undefine(`unix')__dnl +! __dnl __changequote(,)__dnl + + #ifdef SP_NAMESPACE + } Copied: head/textproc/libxslt/files/patch-Makefile.in (from r363316, head/textproc/libxslt/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxslt/files/patch-Makefile.in Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/libxslt/files/patch-aa) @@ -0,0 +1,12 @@ +--- Makefile.in.orig 2012-10-22 16:13:46.000000000 +0000 ++++ Makefile.in 2012-10-22 16:14:29.000000000 +0000 +@@ -327,8 +327,7 @@ + libexslt \ + xsltproc \ + doc \ +- $(PYTHON_SUBDIR) \ +- tests ++ $(PYTHON_SUBDIR) + + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests + confexecdir = $(libdir) Copied: head/textproc/libxslt/files/patch-libxslt__xsltconfig.h.in (from r363316, head/textproc/libxslt/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libxslt/files/patch-libxslt__xsltconfig.h.in Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/libxslt/files/patch-ab) @@ -0,0 +1,8 @@ +--- libxslt/xsltconfig.h.in.orig Mon Mar 26 20:55:08 2001 ++++ libxslt/xsltconfig.h.in Thu Apr 19 22:20:46 2001 +@@ -23,3 +23,5 @@ + #ifdef __GNUC__ ++#ifndef __FreeBSD__ + #include <ansidecl.h> ++#endif + #ifndef ATTRIBUTE_UNUSED Copied: head/textproc/man2html/files/patch-man.cgi (from r363316, head/textproc/man2html/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/man2html/files/patch-man.cgi Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/man2html/files/patch-aa) @@ -0,0 +1,67 @@ +--- man.cgi.orig Wed Aug 13 01:19:18 1997 ++++ man.cgi Sat Sep 30 00:46:55 2000 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl5.00503 + ##---------------------------------------------------------------------------## + ## File: + ## @(#) man.cgi 1.2 97/08/12 12:58:26 @(#) +@@ -59,8 +59,8 @@ + ## systems. If using Tom Christiansen's Perl man program, than + ## define use "". + +-#$SectOpt = ""; +-$SectOpt = "-s"; ++$SectOpt = ""; ++#$SectOpt = "-s"; + + ## man2html program (needs to be a full pathname) + +@@ -77,15 +77,15 @@ + + #@ConvArgs = ("-compress"); + #@ConvArgs = ("-compress", "-leftm", "1", "-topm", "8"); +-@ConvArgs = ("-compress", "-sun"); ++#@ConvArgs = ("-compress", "-sun"); + + ## Keyword search processing arguments for man2html. Normally, + ## '-k' is adequate. However, if on a Solaris system, the + ## '-solaris' option should be specified with '-k'. See + ## man2html documentation on information about the '-solaris' option. + +-#@KeyWArgs = ("-k"); # Normal +-@KeyWArgs = ("-k", "-solaris"); # For Solaris ++@KeyWArgs = ("-k"); # Normal ++#@KeyWArgs = ("-k", "-solaris"); # For Solaris + + ## Possible manual sections. This array is used to determine the + ## the choices available in an option menu. +@@ -124,9 +124,9 @@ + ## know about + + @ManPath = qw( ++ /usr/share/man + /usr/local/man +- /usr/openwin/man +- /usr/man ++ /usr/X11R6/man + ); + + ## PATH setting. Modify as see fit. Once useful modification +@@ -134,7 +134,6 @@ + ## be invoked over the systems nroff when man formats a manpage. + + @Path = qw( +- /opt/FSFgroff/bin + /bin + /usr/bin + ); +@@ -270,7 +269,7 @@ + + # Convert output from man to html + #-------------------------------- +- close(STDERR); ++ open(STDERR, ">&/dev/null"); + open(MANPRG, "-|") or exec($ManPrg, @manargs); + $Man2Html::InFH = \*MANPRG; # set input filehandle + require $ManConvPrg or Modified: head/textproc/mgdiff/Makefile ============================================================================== --- head/textproc/mgdiff/Makefile Tue Jul 29 15:00:12 2014 (r363335) +++ head/textproc/mgdiff/Makefile Tue Jul 29 15:20:01 2014 (r363336) @@ -18,6 +18,6 @@ SUB_FILES= pkg-message post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/mgdiff - @${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/lib/X11/mgdiff + ${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${STAGEDIR}${PREFIX}/lib/X11/mgdiff .include <bsd.port.mk> Copied: head/textproc/mgdiff/files/patach-Imakefile (from r363316, head/textproc/mgdiff/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/mgdiff/files/patach-Imakefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/mgdiff/files/patch-aa) @@ -0,0 +1,27 @@ +*** Imakefile.orig Thu May 19 04:01:00 1994 +--- Imakefile Sat Nov 2 17:06:31 1996 +*************** +*** 5,14 **** + XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp + +! XMLIB = -lXm + XCOMM +! XCOMM for Dell SVR4 + XCOMM +! EXTRA_LIBRARIES = -lc -lucb + + SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c + OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o +--- 5,16 ---- + XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp + +! XMLIB = ${MOTIFLIB} ++ + XCOMM +! XCOMM The gnuregex library is needed for the Motif file selection box widget. + XCOMM +! XCOMM +! EXTRA_LIBRARIES = -lgnuregex + + SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c + OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o Copied: head/textproc/openjade/files/patch-Makefile.prog.in (from r363316, head/textproc/openjade/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/openjade/files/patch-Makefile.prog.in Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/openjade/files/patch-ad) @@ -0,0 +1,22 @@ +--- Makefile.prog.in.orig Tue Jan 22 20:57:53 2002 ++++ Makefile.prog.in Sun Aug 22 05:48:16 2004 +@@ -12,7 +12,9 @@ + + ALL_LIBS = $(XLIBS) $(LIBS) + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo 'LT_LIBS='`echo "$(ALL_LIBS)" | sed -e "s/\.a/.la/g" -e "s,[^ ]*libosp\.la[^ ]*,,"` "\\" >Makefile.lt ++ echo " " `echo "$(ALL_LIBS)" | awk '{print $$4}'` >> Makefile.lt ++# echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + +@@ -25,7 +27,7 @@ + -test -d $(DESTDIR)$(bindir) || \ + (mkdir $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) + -rm -f $(DESTDIR)$(bindir)/$(PROG) +- $(LIBTOOL) --mode=install $(INSTALL) $(PROG) $(DESTDIR)$(bindir) ++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir) + + depend: depend_src + depend.temp: $(GENSRCS) Copied: head/textproc/openjade/files/patch-configure (from r363316, head/textproc/openjade/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/openjade/files/patch-configure Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/openjade/files/patch-ae) @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- configure.orig Sun Dec 1 17:18:40 2002 ++++ configure Fri Feb 28 03:26:00 2003 +@@ -4899,6 +4899,8 @@ + + fi + ++if false; then # begin <wchar.h>-disabling hack ++ + echo "$as_me:$LINENO: checking for towupper" >&5 + echo $ECHO_N "checking for towupper... $ECHO_C" >&6 + if test "${ac_cv_func_towupper+set}" = set; then +@@ -4970,6 +4972,8 @@ + + fi + ++fi # end <wchar.h>-disabling hack ++ + echo "$as_me:$LINENO: checking for gettext" >&5 + echo $ECHO_N "checking for gettext... $ECHO_C" >&6 + if test "${ac_cv_func_gettext+set}" = set; then Copied: head/textproc/opensched/files/patch-Makefile (from r363316, head/textproc/opensched/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-Makefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-aa) @@ -0,0 +1,79 @@ +*** Makefile.orig Tue Nov 16 04:02:39 1999 +--- Makefile Wed Jan 31 14:51:57 2001 +*************** +*** 13,26 **** + + build: opensched manpage + +! all: opensched printman test sample + + BINDIR=/usr/local/bin + MANDIR=/usr/local/man/man1 + + install: opensched manpage +! install -o root -g root -m 755 opensched $(BINDIR) +! install -o root -g root -m 755 doc/opensched.1 $(MANDIR) + + browseman: manpage + groff -t -man -Tlatin1 doc/opensched.1 | less +--- 13,26 ---- + + build: opensched manpage + +! all: opensched printman test + + BINDIR=/usr/local/bin + MANDIR=/usr/local/man/man1 + + install: opensched manpage +! install -o root -g 0 -m 755 src/opensched $(BINDIR) +! install -o root -g 0 -m 755 doc/opensched.1 $(MANDIR) + + browseman: manpage + groff -t -man -Tlatin1 doc/opensched.1 | less +*************** +*** 33,42 **** + + opensched: dummy + # opensched: +! (cd src; make opensched) + + gcc-dos: dummy +! pushd src; make gcc-dos; popd + + backup: veryclean + /bin/rm -rf opensched-`cat VERSION` +--- 33,42 ---- + + opensched: dummy + # opensched: +! (cd src; ${MAKE} opensched) + + gcc-dos: dummy +! pushd src; ${MAKE} gcc-dos; popd + + backup: veryclean + /bin/rm -rf opensched-`cat VERSION` +*************** +*** 66,75 **** + /bin/chmod 755 `find . -type d -or -name '*.sh' -or -name opensched` + + test: opensched dummy +! (cd test; make test) + + sample: opensched dummy +! (cd sample; make sample) + + dummy: + +--- 66,75 ---- + /bin/chmod 755 `find . -type d -or -name '*.sh' -or -name opensched` + + test: opensched dummy +! (cd test; ${MAKE} test) + + sample: opensched dummy +! (cd sample; ${MAKE} sample) + + dummy: + Copied: head/textproc/opensched/files/patch-src__Makefile (from r363316, head/textproc/opensched/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-src__Makefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-af) @@ -0,0 +1,11 @@ +--- src/Makefile.orig Tue Oct 26 01:41:45 1999 ++++ src/Makefile Sat Oct 19 15:13:56 2002 +@@ -1,6 +1,6 @@ +-CFLAGS=-Wall -g ++CFLAGS+=-Wall + LIBS=-lm +-CC=gcc ++CC?=cc + CDEPEND = $(CC) -M + CDEPENDFLAGS = + Copied: head/textproc/opensched/files/patch-src__graph.c (from r363316, head/textproc/opensched/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-src__graph.c Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-ae) @@ -0,0 +1,58 @@ +*** src/graph.c.org Wed Jan 31 15:15:27 2001 +--- src/graph.c Wed Jan 31 15:22:39 2001 +*************** +*** 66,71 **** +--- 66,95 ---- + fprintf(f," fill\n"); + fprintf(f," } def\n"); + ++ fprintf(f,"/REDBOX\n"); ++ fprintf(f," {\n"); ++ fprintf(f," /y2 exch def /y1 exch def /x2 exch def /x1 exch def\n"); ++ fprintf(f," x1 y1 moveto\n"); ++ fprintf(f," x2 y1 lineto\n"); ++ fprintf(f," x2 y2 lineto\n"); ++ fprintf(f," x1 y2 lineto\n"); ++ fprintf(f," closepath\n"); ++ fprintf(f," 1 %f %f setrgbcolor\n",tg_gray,tg_gray); ++ fprintf(f," fill\n"); ++ fprintf(f," } def\n"); ++ ++ fprintf(f,"/BLUEBOX\n"); ++ fprintf(f," {\n"); ++ fprintf(f," /y2 exch def /y1 exch def /x2 exch def /x1 exch def\n"); ++ fprintf(f," x1 y1 moveto\n"); ++ fprintf(f," x2 y1 lineto\n"); ++ fprintf(f," x2 y2 lineto\n"); ++ fprintf(f," x1 y2 lineto\n"); ++ fprintf(f," closepath\n"); ++ fprintf(f," %f %f 1 setrgbcolor\n",tg_gray,tg_gray); ++ fprintf(f," fill\n"); ++ fprintf(f," } def\n"); ++ + fprintf(f,"/OUTLINE\n"); + fprintf(f," {\n"); + fprintf(f," /y2 exch def /y1 exch def /x2 exch def /x1 exch def\n"); +*************** +*** 267,273 **** + for( i=tb->start; i<=tb->finish; ++i ) + { + tb_x1 = MapX( i, start, finish ); +! fprintf(f,"%d %d %d %d BOX\n", tb_x1, tb_x1+tg_width, tb_y1, tb_y2); + } + } + +--- 291,303 ---- + for( i=tb->start; i<=tb->finish; ++i ) + { + tb_x1 = MapX( i, start, finish ); +! if (t->children > 0) +! fprintf(f,"%d %d %d %d REDBOX\n", +! tb_x1, tb_x1+tg_width, tb_y1, tb_y2); +! else +! fprintf(f,"%d %d %d %d BLUEBOX\n", +! tb_x1, tb_x1+tg_width, tb_y1, tb_y2); +! + } + } + Copied: head/textproc/opensched/files/patch-src__loadfile.c (from r363316, head/textproc/opensched/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-src__loadfile.c Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-ag) @@ -0,0 +1,10 @@ +--- src/loadfile.c.orig Sat Oct 19 15:29:13 2002 ++++ src/loadfile.c Sat Oct 19 15:28:40 2002 +@@ -268,6 +268,7 @@ + t = (TASK*)malloc(sizeof(TASK)); + if ( t == NULL ) + Error("Can't malloc task in AddTask()"); ++ memset(t, 0, sizeof(TASK)); + + t->id = strdup(id); + t->name = strdup(name); Copied: head/textproc/opensched/files/patch-src__print.c (from r363316, head/textproc/opensched/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-src__print.c Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-ac) @@ -0,0 +1,75 @@ +*** src/print.c.org Wed Jan 31 14:29:34 2001 +--- src/print.c Wed Jan 31 14:30:44 2001 +*************** +*** 579,612 **** + + SortMilestones(); + +! fprintf(f, "\\subsection{Milestone List}\n\\label{milestones}\n\n"); +! +! fprintf(f, "\\begin{itemize}\n"); +! +! for ( i = 0; i < Nmilestones; ++i ) +! { + m = sorted_milestones[i].milestone; +! + fprintf(f, "\\item "); + if ( milestone_ids ) +! fprintf(f, "%s %s\\\\", +! TeXFix(buf1,m->id), +! TeXFix(buf2,m->name)); + else +! fprintf(f, "%s\\\\", +! TeXFix(buf2,m->name)); + fprintf(f, " \\emph{%s}\n\n", + days[m->day].s); + if ( m->bday != INVALIDDAYNO ) + { +! fprintf(f, "Baseline\\\\\emph{%s}\n", +! days[m->bday].s); + } + fprintf(f, "\n\n"); +! } +! +! fprintf(f, "\\end{itemize}\n\n"); + + fprintf(f,"\\subsection{Resources And Task Assignment}\n\n"); + + for( rl=reslist; rl!=NULL; rl=rl->next ) +--- 579,614 ---- + + SortMilestones(); + +! if (Nmilestones > 0) { +! fprintf(f, "\\subsection{Milestone List}\n\\label{milestones}\n\n"); +! +! fprintf(f, "\\begin{itemize}\n"); +! +! for ( i = 0; i < Nmilestones; ++i ) +! { + m = sorted_milestones[i].milestone; +! + fprintf(f, "\\item "); + if ( milestone_ids ) +! fprintf(f, "%s %s\\\\", +! TeXFix(buf1,m->id), +! TeXFix(buf2,m->name)); + else +! fprintf(f, "%s\\\\", +! TeXFix(buf2,m->name)); + fprintf(f, " \\emph{%s}\n\n", + days[m->day].s); + if ( m->bday != INVALIDDAYNO ) + { +! fprintf(f, "Baseline\\\\\emph{%s}\n", +! days[m->bday].s); + } + fprintf(f, "\n\n"); +! } + ++ fprintf(f, "\\end{itemize}\n\n"); ++ } ++ + fprintf(f,"\\subsection{Resources And Task Assignment}\n\n"); + + for( rl=reslist; rl!=NULL; rl=rl->next ) Copied: head/textproc/opensched/files/patch-test__Makefile (from r363316, head/textproc/opensched/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-test__Makefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-ab) @@ -0,0 +1,13 @@ +*** test/Makefile.org Wed Jan 31 14:21:51 2001 +--- test/Makefile Wed Jan 31 14:22:01 2001 +*************** +*** 14,17 **** + dvips test -o test.ps + + test_gantt_1.eps: test.sched +! ../opensched test.sched +--- 14,17 ---- + dvips test -o test.ps + + test_gantt_1.eps: test.sched +! ../src/opensched test.sched Copied: head/textproc/opensched/files/patch-test__test.tex (from r363316, head/textproc/opensched/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/opensched/files/patch-test__test.tex Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/opensched/files/patch-ad) @@ -0,0 +1,41 @@ +*** test/test.tex.org Wed Jan 31 14:26:20 2001 +--- test/test.tex Wed Jan 31 14:34:28 2001 +*************** +*** 1,4 **** +! \documentstyle[rotate,times,12pt,epsf,supertabular]{article} + \textwidth=7.0in + \textheight=8.0in + \oddsidemargin=-0.25in +--- 1,9 ---- +! \documentclass[dvips,12pt]{article} +! \usepackage{epsfig} +! \usepackage{supertabular} +! \usepackage{rotate} +! \usepackage{float} +! + \textwidth=7.0in + \textheight=8.0in + \oddsidemargin=-0.25in +*************** +*** 36,44 **** + + \section{GANTT Charts} + +! \centerline{ +! \rotate[l]{\epsfxsize=0.95\textheight \epsfbox{test_gantt_1.eps}} +! } + + \end{document} + +--- 41,51 ---- + + \section{GANTT Charts} + +! \begin{figure}[H] +! \begin{center} +! \epsfig{figure=./test_gantt_1.eps,width=8in,angle=270} +! \end{center} +! \end{figure} + + \end{document} + Copied: head/textproc/ruby-xmlparser/files/patch-lib__wget.rb (from r363316, head/textproc/ruby-xmlparser/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/ruby-xmlparser/files/patch-lib__wget.rb Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/ruby-xmlparser/files/patch-ab) @@ -0,0 +1,35 @@ +--- lib/wget.rb.orig Tue Mar 23 17:30:30 1999 ++++ lib/wget.rb Fri Aug 11 03:23:28 2000 +@@ -19,17 +19,18 @@ + if url =~ /^\/|^\./ || (url !~ /^http:|^ftp:/ && FileTest.exist?(url)) + File::open(url, *rest) + else +- ENV['http_proxy'] = PARAM['http_proxy'] if PARAM['http_proxy'] +- ENV['ftp_proxy'] = PARAM['ftp_proxy'] if PARAM['ftp_proxy'] ++ ENV['HTTP_PROXY'] = ENV['http_proxy'] = PARAM['http_proxy'] if PARAM['http_proxy'] ++ ENV['FTP_PROXY'] = ENV['ftp_proxy'] = PARAM['ftp_proxy'] if PARAM['ftp_proxy'] + IO::popen(PARAM['wget'] + ' ' + PARAM['opts'] + ' ' + url) + end + end + module_function :open + end + +-[ '/usr/local/bin/wget', '/usr/bin/wget', +- '/usr/local/bin/lynx', '/usr/bin/lynx', +- '/usr/local/bin/lwp-request', '/usr/bin/lwp-request' ].each do |p| ++[ '%%PREFIX%%/bin/wget', ++ '%%PREFIX%%/bin/lynx', ++ '%%PREFIX%%/bin/lwp-request', ++ '/usr/bin/fetch' ].each do |p| + if FileTest.executable?(p) + WGET::PARAM['wget'] = p + case p +@@ -39,6 +40,8 @@ + WGET::PARAM['opts'] = '-source' + when /lwp-request$/ + WGET::PARAM['opts'] = '-m GET' ++ when /fetch$/ ++ WGET::PARAM['opts'] = '-o -' + end + break + end Copied: head/textproc/rxp/files/patch-Makefile (from r363316, head/textproc/rxp/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/rxp/files/patch-Makefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/rxp/files/patch-aa) @@ -0,0 +1,14 @@ +--- Makefile.orig Fri Nov 23 22:27:59 2001 ++++ Makefile Sat Jun 29 11:29:34 2002 +@@ -3,9 +3,10 @@ + CHAR_SIZE=16 + + DEBUG= -g +-CC= gcc ++CC?= gcc + GCCFLAGS= -Wall -ansi -pedantic + # HP-UX users may need to add -D_HPUX_SOURCE ++CFLAGS?= -O + CFLAGS= $(GCCFLAGS) $(DEBUG) -O -DCHAR_SIZE=$(CHAR_SIZE) + LDFLAGS= $(DEBUG) + Copied: head/textproc/sgmls/files/patch-configure (from r363316, head/textproc/sgmls/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sgmls/files/patch-configure Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/sgmls/files/patch-aa) @@ -0,0 +1,11 @@ +--- configure.orig Fri Jun 2 19:18:37 2000 ++++ configure Fri Jun 2 19:18:50 2000 +@@ -605,7 +605,7 @@ + edit="$edit -e 's/^typedef .*VOID;/typedef $void_ret VOID;/'" + edit="$edit -e 's/^typedef .*UNIV;/typedef ${void_star}UNIV;/'" + +-if test "X$(PREFIX)" != "X/usr/local" ++if test "X$PREFIX" != "X/usr/local" + then + edit="$edit -e '/DEFAULT_PATH/s;/usr/local;$PREFIX;g'" + fi Copied: head/textproc/sgrep/files/patch-Makefile (from r363316, head/textproc/sgrep/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sgrep/files/patch-Makefile Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/sgrep/files/patch-aa) @@ -0,0 +1,39 @@ +--- Makefile.orig 1996-05-02 19:58:24.000000000 +0800 ++++ Makefile 2011-09-07 09:33:07.000000000 +0800 +@@ -10,11 +10,11 @@ + # + + # This is where the executable goes +-BINDIR = /usr/local/bin/ ++BINDIR = ${PREFIX}/bin + # Where sgrep library files are placed (sgreprc) +-LIBDIR = /usr/local/lib ++LIBDIR = ${PREFIX}/share + # Where the manual page goes +-MANFILE = /usr/local/man/man1/sgrep.1 ++MANFILE = ${PREFIX}/man/man1/sgrep.1 + # Where the sample rc file goes + RCFILE = $(LIBDIR)/sgreprc + # If you can't install as root you might wan't to use this as rc file +@@ -25,7 +25,7 @@ VERSION = 0.99 + CFLAGS = -O -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\" + LDFLAGS = + # if cc fails to you use gcc +-CC = cc ++#CC = cc + CPPFLAGS = + LIBS = + +@@ -45,11 +45,7 @@ sgrep: $(OBJECTS) + clean: + -rm -f $(OBJECTS) + +-install: sgrep +- cp sgrep $(BINDIR)/sgrep +- chmod 755 $(BINDIR)/sgrep +- cp sgrep.1 $(MANFILE) +- chmod 644 $(MANFILE) ++install: + + install.rc: sample.sgreprc + cp sample.sgreprc $(RCFILE) Copied: head/textproc/sgrep/files/patch-sgrep.1 (from r363316, head/textproc/sgrep/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sgrep/files/patch-sgrep.1 Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/sgrep/files/patch-ab) @@ -0,0 +1,11 @@ +--- sgrep.1-- Wed Apr 29 12:26:40 1998 ++++ sgrep.1 Wed Apr 29 12:26:49 1998 +@@ -91,7 +91,7 @@ + \fB$HOME/.sgreprc,\fP + or if it doesn't exist, + from file +-\fB/usr/lib/sgreprc, \fP ++\fB/usr/local/share/sgreprc, \fP + and then from the command line. Different behavior + can be specified through command line options. + .Pp Copied: head/textproc/tclExpat/files/patch-tclexpat.c (from r363316, head/textproc/tclExpat/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/tclExpat/files/patch-tclexpat.c Tue Jul 29 15:20:01 2014 (r363336, copy of r363316, head/textproc/tclExpat/files/patch-aa) @@ -0,0 +1,500 @@ +--- tclexpat.c.orig 1998-08-22 09:35:44.000000000 +0200 ++++ tclexpat.c 2013-05-13 12:11:18.000000000 +0200 +@@ -18,8 +18,9 @@ + * + */ + ++#include <string.h> + #include <tcl.h> +-#include "xmlparse.h" ++#include <expat.h> + + /* + * The structure below is used to refer to an expat parser object. +@@ -53,6 +54,8 @@ + * Prototypes for procedures defined later in this file: + */ + ++int Tclexpat_Init (Tcl_Interp *); ++static void TclExpatHandlerResult(TclExpatInfo *, int result); + static Tcl_ObjCmdProc TclExpatObjCmd; + static Tcl_ObjCmdProc TclExpatInstanceCmd; + static Tcl_CmdDeleteProc TclExpatDeleteCmd; +@@ -72,32 +75,32 @@ + int objc, + Tcl_Obj *CONST objv[])); + +-static void * (TclExpatElementStartHandler) _ANSI_ARGS_((void *userdata, ++static void (TclExpatElementStartHandler) _ANSI_ARGS_((void *userdata, + const XML_Char *name, + const XML_Char **atts)); +-static void * (TclExpatElementEndHandler) _ANSI_ARGS_((void *userData, ++static void (TclExpatElementEndHandler) _ANSI_ARGS_((void *userData, + const XML_Char *name)); +-static void * (TclExpatCharacterDataHandler) _ANSI_ARGS_((void *userData, ++static void (TclExpatCharacterDataHandler) _ANSI_ARGS_((void *userData, + const XML_Char *s, + int len)); +-static void * (TclExpatProcessingInstructionHandler) _ANSI_ARGS_((void *userData, ++static void (TclExpatProcessingInstructionHandler) _ANSI_ARGS_((void *userData, + const XML_Char *target, + const XML_Char *data)); +-static void * (TclExpatExternalEntityRefHandler) _ANSI_ARGS_((XML_Parser parser, ++static int (TclExpatExternalEntityRefHandler) _ANSI_ARGS_((XML_Parser parser, + const XML_Char *openEntityNames, + const XML_Char *base, + const XML_Char *systemId, + const XML_Char *publicId)); +-static void * (TclExpatDefaultHandler) _ANSI_ARGS_ ((void *userData, ++static void (TclExpatDefaultHandler) _ANSI_ARGS_ ((void *userData, + const XML_Char *s, + int len)); +-static void * (TclExpatUnparsedDeclHandler) _ANSI_ARGS_ ((void *userData, ++static void (TclExpatUnparsedDeclHandler) _ANSI_ARGS_ ((void *userData, + const XML_Char *entityname, + const XML_Char *base, + const XML_Char *systemId, + const XML_Char *publicId, + const XML_Char *notationName)); +-static void * (TclExpatNotationDeclHandler) _ANSI_ARGS_ ((void *userData, ++static void (TclExpatNotationDeclHandler) _ANSI_ARGS_ ((void *userData, + const XML_Char *notationName, + const XML_Char *base, + const XML_Char *systemId, +@@ -106,7 +109,7 @@ + const XML_Char *name, + XML_Encoding *info)); + +-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0) ++#if (TCL_MAJOR_VERSION >= 8) && !defined(Tcl_GetString) + + /* + *---------------------------------------------------------------------------- +@@ -134,7 +137,7 @@ + s = Tcl_GetStringFromObj(obj, &i); + return s; + } +-#endif /* TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0 */ ++#endif /* TCL_MAJOR_VERSION >= 8 */ + + /* + *---------------------------------------------------------------------------- +@@ -157,6 +160,10 @@ + Tcl_Interp *interp; /* Interpreter to initialise. */ + { + ++ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { ++ return TCL_ERROR; ++ } ++ + Tcl_PkgProvide(interp, "expat", "1.1"); + + Tcl_CreateObjCommand(interp, "expat", TclExpatObjCmd, NULL, NULL); +@@ -267,7 +274,6 @@ + Tcl_Interp *interp; + TclExpatInfo *expat; + { +- int len; + + if (!(expat->parser = XML_ParserCreate(NULL))) { + Tcl_SetResult(interp, "unable to create expat parser", NULL); +@@ -284,22 +290,22 @@ + */ + + XML_SetElementHandler(expat->parser, +- (XML_StartElementHandler) TclExpatElementStartHandler, +- (XML_EndElementHandler) TclExpatElementEndHandler); ++ TclExpatElementStartHandler, ++ TclExpatElementEndHandler); + XML_SetCharacterDataHandler(expat->parser, +- (XML_CharacterDataHandler) TclExpatCharacterDataHandler); ++ TclExpatCharacterDataHandler); + XML_SetProcessingInstructionHandler(expat->parser, +- (XML_ProcessingInstructionHandler) TclExpatProcessingInstructionHandler); ++ TclExpatProcessingInstructionHandler); + XML_SetDefaultHandler(expat->parser, +- (XML_DefaultHandler) TclExpatDefaultHandler); ++ TclExpatDefaultHandler); + XML_SetUnparsedEntityDeclHandler(expat->parser, +- (XML_UnparsedEntityDeclHandler) TclExpatUnparsedDeclHandler); ++ TclExpatUnparsedDeclHandler); + XML_SetNotationDeclHandler(expat->parser, +- (XML_NotationDeclHandler) TclExpatNotationDeclHandler); ++ TclExpatNotationDeclHandler); + XML_SetExternalEntityRefHandler(expat->parser, +- (XML_ExternalEntityRefHandler) TclExpatExternalEntityRefHandler); ++ TclExpatExternalEntityRefHandler); + XML_SetUnknownEncodingHandler(expat->parser, +- (XML_UnknownEncodingHandler) TclExpatUnknownEncodingHandler, ++ TclExpatUnknownEncodingHandler, + (void *) expat); + XML_SetUserData(expat->parser, + (void *) expat); +@@ -327,7 +333,6 @@ + TclExpatFreeParser(expat) + TclExpatInfo *expat; + { +- int len; + + XML_ParserFree(expat->parser); + expat->parser = NULL; +@@ -357,9 +362,9 @@ + Tcl_Obj *CONST objv[]; + { + TclExpatInfo *expat = (TclExpatInfo *) clientData; +- char *method, *data; ++ char *data; + int len, index, result = TCL_OK; +- static char *options[] = { ++ static CONST char * options[] = { + "configure", "cget", "parse", "reset", NULL + }; + enum options { +@@ -464,10 +469,10 @@ + + if (!result) { + Tcl_ResetResult(interp); +- sprintf(s, "%d", XML_GetCurrentLineNumber(expat->parser)); ++ sprintf(s, "%ld", (long)XML_GetCurrentLineNumber(expat->parser)); + Tcl_AppendResult(interp, "error \"", XML_ErrorString(XML_GetErrorCode(expat->parser)), + "\" at line ", s, " character ", NULL); +- sprintf(s, "%d", XML_GetCurrentColumnNumber(expat->parser)); ++ sprintf(s, "%ld", (long)XML_GetCurrentColumnNumber(expat->parser)); + Tcl_AppendResult(interp, s, NULL); + + return TCL_ERROR; +@@ -514,7 +519,7 @@ + int objc; + Tcl_Obj *CONST objv[]; + { +- static char *switches[] = { ++ static CONST char *switches[] = { + "-final", + "-baseurl", + "-elementstartcommand", +@@ -688,7 +693,7 @@ + } + + if (doParse) { +- return TclExpatParse(interp, expat->parser, "", 0); ++ return TclExpatParse(interp, expat, "", 0); + } else { + return TCL_OK; + } +@@ -739,7 +744,7 @@ + *---------------------------------------------------------------------------- + */ + +-void ++static void + TclExpatHandlerResult(expat, result) + TclExpatInfo *expat; + int result; +@@ -795,7 +800,7 @@ + *---------------------------------------------------------------------------- + */ + +-static void * ++static void + TclExpatElementStartHandler(userData, name, atts) + void *userData; + const char *name; +@@ -828,8 +833,8 @@ + + atList = Tcl_NewListObj(0, NULL); + for (atPtr = atts; atPtr[0] && atPtr[1]; atPtr += 2) { +- Tcl_ListObjAppendElement(expat->interp, atList, Tcl_NewStringObj((char *)atPtr[0], strlen(atPtr[0]))); +- Tcl_ListObjAppendElement(expat->interp, atList, Tcl_NewStringObj((char *)atPtr[1], strlen(atPtr[1]))); ++ Tcl_ListObjAppendElement(expat->interp, atList, Tcl_NewStringObj(atPtr[0], -1)); ++ Tcl_ListObjAppendElement(expat->interp, atList, Tcl_NewStringObj(atPtr[1], -1)); + } + + /* +@@ -840,14 +845,14 @@ + Tcl_IncrRefCount(cmdPtr); + Tcl_Preserve((ClientData) expat->interp); + +- Tcl_ListObjAppendElement(expat->interp, cmdPtr, Tcl_NewStringObj((char *)name, strlen(name))); ++ Tcl_ListObjAppendElement(expat->interp, cmdPtr, Tcl_NewStringObj(name, -1)); + Tcl_ListObjAppendElement(expat->interp, cmdPtr, atList); + + /* + * It would be desirable to be able to terminate parsing + * if the return result is TCL_ERROR or TCL_BREAK. + */ +-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0) ++#if (TCL_MAJOR_VERSION >= 8) + result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); + #else + result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); +@@ -877,7 +882,7 @@ + *---------------------------------------------------------------------------- + */ + +-static void * ++static void + TclExpatElementEndHandler(userData, name) + void *userData; + CONST char *name; +@@ -911,13 +916,13 @@ + Tcl_IncrRefCount(cmdPtr); + Tcl_Preserve((ClientData) expat->interp); + +- Tcl_ListObjAppendElement(expat->interp, cmdPtr, Tcl_NewStringObj((char *)name, strlen(name))); ++ Tcl_ListObjAppendElement(expat->interp, cmdPtr, Tcl_NewStringObj(name, -1)); + + /* + * It would be desirable to be able to terminate parsing + * if the return result is TCL_ERROR or TCL_BREAK. + */ +-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0) ++#if (TCL_MAJOR_VERSION >= 8) + result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); + #else + result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); +@@ -947,7 +952,7 @@ + *---------------------------------------------------------------------------- + */ + +-static void * ++static void + TclExpatCharacterDataHandler(userData, s, len) + void *userData; + CONST char *s; +@@ -970,13 +975,13 @@ + Tcl_IncrRefCount(cmdPtr); + Tcl_Preserve((ClientData) expat->interp); + +- Tcl_ListObjAppendElement(expat->interp, cmdPtr, Tcl_NewStringObj((char *)s, len)); ++ Tcl_ListObjAppendElement(expat->interp, cmdPtr, Tcl_NewStringObj(s, len)); + + /* + * It would be desirable to be able to terminate parsing + * if the return result is TCL_ERROR or TCL_BREAK. + */ +-#if (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0) ++#if (TCL_MAJOR_VERSION >= 8) + result = Tcl_GlobalEvalObj(expat->interp, cmdPtr); + #else + result = Tcl_EvalObj(expat->interp, cmdPtr, TCL_EVAL_GLOBAL); +@@ -1006,7 +1011,7 @@ + *---------------------------------------------------------------------------- *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407291520.s6TFK1UK037917>