From owner-svn-ports-head@FreeBSD.ORG Tue Jul 29 01:16:51 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6FC7E82; Tue, 29 Jul 2014 01:16:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0B042EA0; Tue, 29 Jul 2014 01:16:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6T1GpQx032309; Tue, 29 Jul 2014 01:16:51 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6T1GkHA032270; Tue, 29 Jul 2014 01:16:46 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407290116.s6T1GkHA032270@svn.freebsd.org> From: Adam Weinberger Date: Tue, 29 Jul 2014 01:16:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363282 - in head/misc: astrolog/files bbjd/files bottlerocket/files brs/files deco deco/files detachtty/files figlet/files gctpc gctpc/files histring/files man.el man.el/files nsf/file... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2014 01:16:52 -0000 Author: adamw Date: Tue Jul 29 01:16:45 2014 New Revision: 363282 URL: http://svnweb.freebsd.org/changeset/ports/363282 QAT: https://qat.redports.org/buildarchive/r363282/ Log: Rename misc/ patch-xy patches to reflect the files they modify. Added: head/misc/astrolog/files/patch-astrolog.c - copied unchanged from r363279, head/misc/astrolog/files/patch-ac head/misc/astrolog/files/patch-astrolog.h - copied unchanged from r363279, head/misc/astrolog/files/patch-ab head/misc/astrolog/files/patch-general.c - copied unchanged from r363279, head/misc/astrolog/files/patch-ad head/misc/astrolog/files/patch-makefile - copied unchanged from r363279, head/misc/astrolog/files/patch-aa head/misc/bbjd/files/patch-Makefile - copied unchanged from r363279, head/misc/bbjd/files/patch-aa head/misc/bottlerocket/files/patch-Makefile.in - copied unchanged from r363279, head/misc/bottlerocket/files/patch-aa head/misc/brs/files/patch-Makefile - copied unchanged from r363279, head/misc/brs/files/patch-aa head/misc/brs/files/patch-bible.1 - copied unchanged from r363279, head/misc/brs/files/patch-ab head/misc/brs/files/patch-brl.c - copied unchanged from r363279, head/misc/brs/files/patch-ac head/misc/brs/files/patch-tsl.c - copied unchanged from r363279, head/misc/brs/files/patch-ad head/misc/deco/files/patch-dir.c - copied unchanged from r363279, head/misc/deco/files/patch-ad head/misc/deco/files/patch-ex.c - copied unchanged from r363279, head/misc/deco/files/patch-aa head/misc/deco/files/patch-help.c - copied unchanged from r363279, head/misc/deco/files/patch-ab head/misc/deco/files/patch-rec.h - copied unchanged from r363279, head/misc/deco/files/patch-af head/misc/deco/files/patch-scr.c - copied unchanged from r363279, head/misc/deco/files/patch-ae head/misc/detachtty/files/patch-Makefile - copied unchanged from r363279, head/misc/detachtty/files/patch-aa head/misc/figlet/files/patch-Makefile - copied unchanged from r363279, head/misc/figlet/files/patch-aa head/misc/figlet/files/patch-figlet.6 - copied unchanged from r363279, head/misc/figlet/files/patch-ab head/misc/gctpc/files/patch-Makefile - copied unchanged from r363279, head/misc/gctpc/files/patch-aa head/misc/gctpc/files/patch-cproj.h - copied unchanged from r363279, head/misc/gctpc/files/patch-ab head/misc/histring/files/patch-histring.c - copied unchanged from r363279, head/misc/histring/files/patch-aa head/misc/man.el/files/patch-i18n-man-ja.el - copied unchanged from r363279, head/misc/man.el/files/patch-aa head/misc/nsf/files/patch-sample.sh - copied unchanged from r363279, head/misc/nsf/files/patch-aa head/misc/shuffle/files/patch-shuffle.c_1 - copied unchanged from r363279, head/misc/shuffle/files/patch-aa head/misc/shuffle/files/patch-shuffle.c_2 - copied unchanged from r363279, head/misc/shuffle/files/patch-shuffle.c head/misc/tcb/files/patch-config.sh - copied unchanged from r363279, head/misc/tcb/files/patch-aa head/misc/tkcron/files/patch-tkcron.tcl - copied unchanged from r363279, head/misc/tkcron/files/patch-aa head/misc/upclient/files/patch-src_Makefile - copied unchanged from r363279, head/misc/upclient/files/patch-aa head/misc/upclient/files/patch-src_conf_upclient.conf - copied unchanged from r363279, head/misc/upclient/files/patch-ab head/misc/vera/files/patch-vera.texi - copied unchanged from r363279, head/misc/vera/files/patch-aa head/misc/viz/files/patch-viz.c - copied unchanged from r363279, head/misc/viz/files/patch-aa head/misc/viz/files/patch-vizgrammar.y - copied unchanged from r363279, head/misc/viz/files/patch-ab head/misc/xpns/files/patch-makefile - copied unchanged from r363279, head/misc/xpns/files/patch-aa head/misc/xpns/files/patch-xpns - copied unchanged from r363279, head/misc/xpns/files/patch-ab head/misc/xtar/files/patch-XTar.ad - copied unchanged from r363279, head/misc/xtar/files/patch-ad head/misc/xtar/files/patch-common_str.c - copied unchanged from r363279, head/misc/xtar/files/patch-aa head/misc/xtar/files/patch-xtar.c - copied unchanged from r363279, head/misc/xtar/files/patch-ab head/misc/ytree/files/patch-Makefile - copied unchanged from r363279, head/misc/ytree/files/patch-aa head/misc/ytree/files/patch-filewin.c - copied unchanged from r363279, head/misc/ytree/files/patch-ag head/misc/ytree/files/patch-freesp.c - copied unchanged from r363279, head/misc/ytree/files/patch-ab Deleted: head/misc/astrolog/files/patch-aa head/misc/astrolog/files/patch-ab head/misc/astrolog/files/patch-ac head/misc/astrolog/files/patch-ad head/misc/bbjd/files/patch-aa head/misc/bottlerocket/files/patch-aa head/misc/brs/files/patch-aa head/misc/brs/files/patch-ab head/misc/brs/files/patch-ac head/misc/brs/files/patch-ad head/misc/deco/files/patch-aa head/misc/deco/files/patch-ab head/misc/deco/files/patch-ad head/misc/deco/files/patch-ae head/misc/deco/files/patch-af head/misc/detachtty/files/patch-aa head/misc/figlet/files/patch-aa head/misc/figlet/files/patch-ab head/misc/gctpc/files/patch-aa head/misc/gctpc/files/patch-ab head/misc/histring/files/patch-aa head/misc/man.el/files/patch-aa head/misc/nsf/files/patch-aa head/misc/shuffle/files/patch-aa head/misc/shuffle/files/patch-shuffle.c head/misc/tcb/files/patch-aa head/misc/tkcron/files/patch-aa head/misc/upclient/files/patch-aa head/misc/upclient/files/patch-ab head/misc/vera/files/patch-aa head/misc/viz/files/patch-aa head/misc/viz/files/patch-ab head/misc/xpns/files/patch-aa head/misc/xpns/files/patch-ab head/misc/xtar/files/patch-aa head/misc/xtar/files/patch-ab head/misc/xtar/files/patch-ad head/misc/ytree/files/patch-aa head/misc/ytree/files/patch-ab head/misc/ytree/files/patch-ag Modified: head/misc/deco/Makefile head/misc/gctpc/Makefile head/misc/man.el/Makefile head/misc/upclient/Makefile head/misc/vera/Makefile head/misc/viz/Makefile Copied: head/misc/astrolog/files/patch-astrolog.c (from r363279, head/misc/astrolog/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/astrolog/files/patch-astrolog.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/astrolog/files/patch-ac) @@ -0,0 +1,94 @@ +diff --git astrolog.c astrolog.c +index 5a26c68..8294d3e 100644 +--- astrolog.c ++++ astrolog.c +@@ -38,6 +38,7 @@ + ** Modifications from version 5.40 to 5.41 are by Alois Treindl. + */ + ++#include + #include "astrolog.h" + + +@@ -255,7 +256,7 @@ byte **argv; + byte *pch = szLine; + + /* Split the entered line up into its individual switch strings. */ +- while (*pch >= ' ' || *pch == chTab) { ++ while (!iscntrl((_char)*pch) || *pch == chTab) { + if (*pch == ' ' || *pch == chTab) { + if (fSpace) + /* Skip over the current run of spaces between strings. */ +@@ -1470,8 +1471,18 @@ byte **argv; + case 'z': + if (ch1 == '0') { + if (argc <= 1 || RParseSz(argv[1], pmZon) == rLarge) { +- i = us.dstDef != 0.0; +- SwitchF(i); ++ if (argc > 1 && strcasecmp(argv[1], "current") == 0) { ++ time_t t; ++ struct tm *tm; ++ ++ (void) time(&t); ++ tm = localtime(&t); ++ i = tm->tm_isdst != 0; ++ argc--; argv++; ++ } else { ++ i = us.dstDef != 0.0; ++ SwitchF(i); ++ } + SS = us.dstDef = i ? 1.0 : 0.0; + } else { + SS = us.dstDef = RParseSz(argv[1], pmZon); +@@ -1556,13 +1567,39 @@ byte **argv; + return fFalse; + } + ciCore.nam = SzPersist(argv[1]); ++ if (CchSz(ciCore.nam) > 29) /* see charts1.c */ ++ ciCore.nam[29] = chNull; ++ for (pch = ciCore.nam; *pch; pch++) { ++ if (*pch == '"') /* see io.c */ ++ *pch = '\''; ++ else if (iscntrl((_char)*pch)) /* see xgeneral.c */ ++ *pch = ' '; ++ } + ciCore.loc = SzPersist(argv[2]); ++ if (CchSz(ciCore.loc) > 29) /* see charts1.c */ ++ ciCore.loc[29] = chNull; ++ for (pch = ciCore.loc; *pch; pch++) { ++ if (*pch == '"') /* see io.c */ ++ *pch = '\''; ++ else if (iscntrl((_char)*pch)) /* see xgeneral.c */ ++ *pch = ' '; ++ } + argc -= 2; argv += 2; + break; + } +- if (argc <= 1 || RParseSz(argv[1], pmZon) == rLarge) +- ZZ -= 1.0; +- else { ++ if (argc <= 1 || RParseSz(argv[1], pmZon) == rLarge) { ++ if (argc > 1 && strcasecmp(argv[1], "current") == 0) { ++ time_t t; ++ struct tm *tm; ++ ++ (void) time(&t); ++ tm = localtime(&t); ++ ZZ = us.zonDef = (tm->tm_isdst ? 1 : 0) - ++ (real)tm->tm_gmtoff/(60*60); ++ argc--; argv++; ++ } else ++ ZZ -= 1.0; ++ } else { + ZZ = us.zonDef = RParseSz(argv[1], pmZon); + if (!FValidZon(us.zonDef)) { + ErrorValR("z", us.zonDef); +@@ -2213,7 +2250,7 @@ byte **argv; + #ifdef SWITCHES + void main(argc, argv) + int argc; +-byte **argv; ++char **argv; + { + #else + void main() Copied: head/misc/astrolog/files/patch-astrolog.h (from r363279, head/misc/astrolog/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/astrolog/files/patch-astrolog.h Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/astrolog/files/patch-ab) @@ -0,0 +1,51 @@ +--- astrolog.h.orig 2002-04-27 22:50:39.000000000 +0400 ++++ astrolog.h 2012-02-25 21:25:04.000000000 +0400 +@@ -72,9 +72,11 @@ + /*#define MACG /* Comment out this #define if you don't have a Mac, or else */ + /* have one and don't wish to compile in Mac screen graphics. */ + +-/*#define MOUSE /* Comment out this #define if you don't have a mouse, or */ ++#if defined(X11) || defined(WIN) || defined(MSG) || defined(BGI) || defined(MACG) ++#define MOUSE /* Comment out this #define if you don't have a mouse, or */ + /* don't wish to compile in mouse tracking features. This is */ + /* only valid if X11, WIN, MSG, BGI, or MACG above are set. */ ++#endif + + #define TIME /* Comment out this #define if your compiler can't take the */ + /* calls to the 'time' or 'localtime' functions as in time.h */ +@@ -138,9 +140,13 @@ + */ + + #ifndef PC ++#ifndef DEFAULT_DIR + #define DEFAULT_DIR "~/astrolog" + #define EPHE_DIR "~/astrolog/ephe" + #else ++#define EPHE_DIR DEFAULT_DIR ++#endif ++#else + #define DEFAULT_DIR "C:\\ASTROLOG" + #define EPHE_DIR DEFAULT_DIR + #endif +@@ -292,6 +298,8 @@ + #define ISG + #include + #include ++#else ++#include + #endif + #ifdef WIN + #define ISG +@@ -1068,9 +1076,9 @@ + */ + + #define byte unsigned char +-#define word unsigned short +-#define dword unsigned long +-#define word4 long ++#define word u_int16_t ++#define dword u_int32_t ++#define word4 int32_t + #define real double + #define _char unsigned char + #define _int unsigned int Copied: head/misc/astrolog/files/patch-general.c (from r363279, head/misc/astrolog/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/astrolog/files/patch-general.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/astrolog/files/patch-ad) @@ -0,0 +1,47 @@ +--- general.c.orig 2002-04-27 22:33:57.000000000 +0400 ++++ general.c 2012-02-26 11:13:09.000000000 +0400 +@@ -900,14 +900,32 @@ + + /* Return a string containing the given time zone, given as a real value */ + /* having the hours before GMT in the integer part and minutes fractionally. */ ++/* Seconds are printed when needed. */ + + byte *SzZone(zon) + real zon; + { +- static byte szZon[7]; ++ static byte szZon[10]; ++ int hr, min, sec; ++ real rMin; + +- sprintf(szZon, "%c%d:%02d", zon > 0.0 ? '-' : '+', (int)RAbs(zon), +- (int)(RFract(RAbs(zon))*100.0+rRound/60.0)); ++ hr = NFloor(RAbs(zon)); ++ rMin = RFract(RAbs(zon)) * 100.0; ++ min = (int)(rMin + rRound / 600.0); ++ rFractal = RFract(rMin); ++ if (rFractal > rOne) ++ rFractal = rSmall; ++ sec = (int)(60.0*rFractal + rRound); ++ while (min >= 60) { ++ min -= 60; ++ hr++; ++ } ++ while (hr >= 24) ++ hr -= 24; ++ if (sec == 0) ++ sprintf(szZon, "%c%d:%02d", zon > 0.0 ? '-' : '+', hr, min); ++ else ++ sprintf(szZon, "%c%d:%02d:%02d", zon > 0.0 ? '-' : '+', hr, min, sec); + return szZon; + } + +@@ -970,7 +988,7 @@ + int *mon, *day, *yea; + real *tim, zon; + { +- dword curtimer; ++ time_t curtimer; + int min, sec; + real hr; + Copied: head/misc/astrolog/files/patch-makefile (from r363279, head/misc/astrolog/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/astrolog/files/patch-makefile Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/astrolog/files/patch-aa) @@ -0,0 +1,28 @@ +--- makefile.orig 2002-04-27 22:48:52.000000000 +0400 ++++ makefile 2012-11-21 12:12:08.000000000 +0400 +@@ -17,6 +17,7 @@ + # edited, is compile each source file, and link them together with the math + # library, and if applicable, the main X library. + # ++.PATH: src + NAME = astrolog + OBJ = astrolog.o data.o data2.o general.o io.o\ + calc.o matrix.o charts0.o charts1.o charts2.o charts3.o\ +@@ -28,9 +29,15 @@ + # LIBS = -lm -lX11 + # with Debian Linux and X windows worked + # LIBS = -lm -L/usr/X11R6/lib -lX11 +-LIBS= -lm ++.if defined(X11) ++LIBS = -L${LOCALBASE}/lib -lX11 -lm ++CFLAGS += -Isrc -DX11 -I${LOCALBASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" ++.else ++LIBS = -lm ++CFLAGS += -Isrc -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" ++.endif + # +-CFLAGS = -O -DHPUX_SOURCE ++#CFLAGS = -O -DHPUX_SOURCE + # + # CFLAGS from 5.41 original sources + # CFLAGS = -g -Aa -DHPUX_SOURCE Copied: head/misc/bbjd/files/patch-Makefile (from r363279, head/misc/bbjd/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/bbjd/files/patch-Makefile Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/bbjd/files/patch-aa) @@ -0,0 +1,34 @@ +--- Makefile.orig Mon Oct 26 02:47:44 1998 ++++ Makefile Sun Feb 6 16:58:34 2000 +@@ -6,18 +6,18 @@ + OBJECTS = $(SOURCES:.c=.o) + + ######## compiler options ######## +-CC = gcc ++CC ?= gcc + LANG_OPTIONS = + WARN_OPTIONS = -Wall -Wtraditional -Wpointer-arith \ + -Wconversion -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wreturn-type \ + -Wnested-externs -Wwrite-strings -Wcast-qual + INCDIR = -I. -I/usr/include +-CFLAGS = $(DEFINES) $(LANG_OPTIONS) $(WARN_OPTIONS) $(INCDIR) +-COPTS = -O2 ++CFLAGS?= -O2 ++CFLAGS+= $(DEFINES) $(LANG_OPTIONS) $(WARN_OPTIONS) $(INCDIR) + + ######## link options ######## +-LD = gcc ++LD = $(CC) + LIBDIR = + LIBRARIES = #-lm + LDFLAGS = $(LIBDIR) +@@ -36,7 +36,7 @@ + + %o: %c + @echo --- compiling: $< --- +- $(CC) $(CFLAGS) $(COPTS) -c $< -o $@ ++ $(CC) $(CFLAGS) -c $< -o $@ + + clean: + rm -f probability.o interactive.o display.o simulate.o core Copied: head/misc/bottlerocket/files/patch-Makefile.in (from r363279, head/misc/bottlerocket/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/bottlerocket/files/patch-Makefile.in Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/bottlerocket/files/patch-aa) @@ -0,0 +1,22 @@ +--- Makefile.in.orig 1999-07-18 03:03:14.000000000 +0800 ++++ Makefile.in 2014-06-08 23:21:27.239061744 +0800 +@@ -23,7 +23,7 @@ includedir = @includedir@ + + CFLAGS = @CFLAGS@ + +-CFLAGS += -I. -Wall -O2 -DX10_PORTNAME=\"@X10PORT@\" ++CFLAGS += -I. -Wall -DX10_PORTNAME=\"@X10PORT@\" + DEFS=@DEFS@ + LIBS=@LIBS@ + INSTALL= @INSTALL@ +@@ -49,8 +49,8 @@ br_cmd.o: ${srcdir}/br_cmd.c ${srcdir}/b + ${CC} ${CFLAGS} ${DEFS} -c ${srcdir}/br_cmd.c + + install: br +- ${INSTALL} -d -m 755 ${bindir} +- ${INSTALL} -m 555 br ${bindir} ++ ${INSTALL} -d -m 755 $(DESTDIR)${bindir} ++ ${INSTALL} -m 555 br $(DESTDIR)${bindir} + + clean: + -rm -f *.o br Copied: head/misc/brs/files/patch-Makefile (from r363279, head/misc/brs/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/brs/files/patch-Makefile Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/brs/files/patch-aa) @@ -0,0 +1,120 @@ +--- Makefile.orig 1995-08-10 07:49:09.000000000 +0800 ++++ Makefile 2014-07-15 20:46:53.626067731 +0800 +@@ -177,9 +177,6 @@ README = README.$(PROGRAM) + # primary man page + MAN = $(PROGRAM).1 + +-# raw data file +-RAWDATA = $(PROGRAM).rawtext +- + # Derived data file. Comes from processing raw data file. + DATA = $(PROGRAM).data + +@@ -187,12 +184,12 @@ DATA = $(PROGRAM).data + NINSTPKG = $(PROGRAM).pkg + + # where to install this stuff +-DEST = /usr/local ++DEST = $(PREFIX) + #DEST = $(HOME)/local + DESTBIN = $(DEST)/bin +-DESTLIB = $(DEST)/lib ++DESTLIB = $(DEST)/share/brs + DESTMAN = $(DEST)/man +-DESTMAN1 = $(DESTMAN)/man1.Z ++DESTMAN1 = $(DESTMAN)/man1 + + # release directories. Nobody should care about this but me + FTPHOME = /mnt/ftp +@@ -349,10 +346,6 @@ squish.stats squish.data: $(RAWDATA) + else rm squish.tmpdata squish.stats; fi + + +-$(PROGINDEX).c: $(RAWDATA) +- make makeindex +- ./makeindex $(RAWDATA) > $@ +- + $(DATA): squish.stats squish.data + make buildcmp + ./buildcmp +@@ -366,19 +359,6 @@ $(DATA): squish.stats squish.data + # Note that $(PROGINDEX).c is included in source distributions, while + # $(RAWDATA) is NOT included in all distributions. $(PROGINDEX).c does NOT + # need to be rebuilt unless someone (probably me) has munged $(RAWDATA). +-SAFEDATE = 0101000193 +-$(RAWDATA): +- @touch $(SAFEDATE) $@ +- @if [ -r $(SAFEDATE) ]; then \ +- /bin/rm $(SAFEDATE) $@; \ +- if [ -x /usr/5bin/touch ]; then \ +- /usr/5bin/touch $(SAFEDATE) $@; \ +- else \ +- # major kludge alert! ... \ +- touch brl-startverse.h brl-startchapter.h $(PROGINDEX).c; \ +- fi; \ +- fi +- @echo " A dummy $(RAWDATA) file has been created." + + # The dependency on $(RAWDATA) helps to ensure that the raw concordance file + # is not rebuilt unnecessarily. +@@ -392,10 +372,6 @@ $(PROGRAM).rawconcordance: $(RAWDATA) + ./makeconc.pl + # ./makeconcordance + +-$(MAN).Z: $(MAN) +- /bin/rm $@ +- compress < $(MAN) > $(MAN).Z +- + clean:; @rm -f $(PROGOBJS) $(TOOLOBJS) core + + clobber:; @rm -f $(PROGOBJS) $(TOOLOBJS) $(PROGRAM) $(TOOLS) $(DATA) \ +@@ -536,31 +512,28 @@ ninstall: $(NINSTPKG) + # The "install" target could be of general use. That's why there are + # no explicit dependencies here. They just confuse things... + install: +- @if [ ! -r $(DEST) ]; then mkdir $(DEST); fi ++ @if [ ! -r $(DESTDIR)$(DEST) ]; then mkdir $(DESTDIR)$(DEST); fi + @echo Installing $(PROGRAM) in $(DESTBIN) + @-strip $(PROGRAM) +- @if [ ! -r $(DESTBIN) ]; then mkdir $(DESTBIN); fi +- @if [ $(DESTBIN) != . ]; then \ +- ((cd $(DESTBIN);rm -f $(PROGRAM)); \ +- cp $(PROGRAM) $(DESTBIN)); \ +- chown bin $(DESTBIN)/$(PROGRAM); \ +- chgrp bin $(DESTBIN)/$(PROGRAM); \ +- chmod 755 $(DESTBIN)/$(PROGRAM); fi ++ @if [ ! -r $(DESTDIR)$(DESTBIN) ]; then mkdir $(DESTDIR)$(DESTBIN); fi ++ @if [ $(DESTDIR)$(DESTBIN) != . ]; then \ ++ ((cd $(DESTDIR)$(DESTBIN);rm -f $(PROGRAM)); \ ++ cp $(PROGRAM) $(DESTDIR)$(DESTBIN)); \ ++ chown root:wheel $(DESTDIR)$(DESTBIN)/$(PROGRAM); \ ++ chmod 755 $(DESTDIR)$(DESTBIN)/$(PROGRAM); fi + @echo Installing $(DATA) and $(DATA).conc in $(DESTLIB) +- @if [ ! -r $(DESTLIB) ]; then mkdir $(DESTLIB); fi +- @if [ $(DESTLIB) != . ]; then \ +- cp $(DATA) $(DATA).conc $(DESTLIB); \ +- chown bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ +- chgrp bin $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; \ +- chmod 644 $(DESTLIB)/$(DATA) $(DESTLIB)/$(DATA).conc; fi +- @if [ ! -r $(DESTMAN) ]; then mkdir $(DESTMAN); fi ++ @if [ ! -r $(DESTDIR)$(DESTLIB) ]; then mkdir $(DESTDIR)$(DESTLIB); fi ++ @if [ $(DESTDIR)$(DESTLIB) != . ]; then \ ++ cp $(DATA) $(DATA).conc $(DESTDIR)$(DESTLIB); \ ++ chown root:wheel $(DESTDIR)$(DESTLIB)/$(DATA) $(DESTDIR)$(DESTLIB)/$(DATA).conc; \ ++ chmod 644 $(DESTDIR)$(DESTLIB)/$(DATA) $(DESTDIR)$(DESTLIB)/$(DATA).conc; fi ++ @if [ ! -r $(DESTDIR)$(DESTMAN) ]; then mkdir $(DESTDIR)$(DESTMAN); fi + @echo Installing $(MAN) in $(DESTMAN1) +- @if [ ! -r $(DESTMAN1) ]; then mkdir $(DESTMAN1); fi +- @if [ $(DESTMAN1) != . ]; then \ +- cp $(MAN).Z $(DESTMAN1)/$(MAN); \ +- chown bin $(DESTMAN1)/$(MAN); \ +- chgrp bin $(DESTMAN1)/$(MAN); \ +- chmod 644 $(DESTMAN1)/$(MAN); fi ++ @if [ ! -r $(DESTDIR)$(DESTMAN1) ]; then mkdir $(DESTDIR)$(DESTMAN1); fi ++ @if [ $(DESTDIR)$(DESTMAN1) != . ]; then \ ++ cp $(MAN) $(DESTDIR)$(DESTMAN1)/$(MAN); \ ++ chown root:wheel $(DESTDIR)$(DESTMAN1)/$(MAN); \ ++ chmod 644 $(DESTDIR)$(DESTMAN1)/$(MAN); fi + + uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN) + rm -f $(DESTBIN)/$(PROGRAM) Copied: head/misc/brs/files/patch-bible.1 (from r363279, head/misc/brs/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/brs/files/patch-bible.1 Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/brs/files/patch-ab) @@ -0,0 +1,60 @@ +*** bible.1.orig Fri Apr 23 15:07:57 1993 +--- bible.1 Thu Jul 10 22:55:07 2003 +*************** +*** 314,330 **** + Miscellaneous program control commands: + + .TP 15 "\w'\-t\ prefix\ \ 'u" +! .B \?, ?h, ?help + Prints help text. + .TP +! .B \?f + Toggles output formatting modes. + .TP +! .BI \?w file + Begin writing program output to a file. If file exists, output is + appended to what's there already. + .TP +! .B \?w + Stop writing to a file. + .TP + .B \>, \< +--- 314,330 ---- + Miscellaneous program control commands: + + .TP 15 "\w'\-t\ prefix\ \ 'u" +! .B ?, ?h, ?help + Prints help text. + .TP +! .B ?f + Toggles output formatting modes. + .TP +! .BI ?w file + Begin writing program output to a file. If file exists, output is + appended to what's there already. + .TP +! .B ?w + Stop writing to a file. + .TP + .B \>, \< +*************** +*** 369,377 **** + results in a range of Matthew 1:1 to Revelation 1:1, instead of extending + all the way to Revelation 22:21. + .SH FILES +! /usr/local/lib/bible.data + .br +! /usr/local/lib/bible.data.conc + .SH SEE ALSO + Rev3:20 + .SH AUTHOR +--- 369,377 ---- + results in a range of Matthew 1:1 to Revelation 1:1, instead of extending + all the way to Revelation 22:21. + .SH FILES +! %%PREFIX%%/share/brs/bible.data + .br +! %%PREFIX%%/share/brs/bible.data.conc + .SH SEE ALSO + Rev3:20 + .SH AUTHOR Copied: head/misc/brs/files/patch-brl.c (from r363279, head/misc/brs/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/brs/files/patch-brl.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/brs/files/patch-ac) @@ -0,0 +1,19 @@ +*** brl.c.orig Tue Apr 12 19:31:59 1994 +--- brl.c Thu Jul 10 23:06:55 2003 +*************** +*** 1146,1152 **** + if (dfname == NULL) + dfname = "bible.data"; + if (dfpath == NULL) +! dfpath = "./ /usr/local/lib/"; + tsl_init( dfname, dfpath, memlimit ); + + /* Set (low) illegal value for current context. +--- 1146,1152 ---- + if (dfname == NULL) + dfname = "bible.data"; + if (dfpath == NULL) +! dfpath = "./ %%PREFIX%%/share/brs/"; + tsl_init( dfname, dfpath, memlimit ); + + /* Set (low) illegal value for current context. Copied: head/misc/brs/files/patch-tsl.c (from r363279, head/misc/brs/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/brs/files/patch-tsl.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/brs/files/patch-ad) @@ -0,0 +1,63 @@ +*** tsl.c.orig Wed Aug 9 19:47:29 1995 +--- tsl.c Fri Nov 21 17:31:35 2003 +*************** +*** 106,112 **** + \*----------------------------------------------------------------------*/ + + #include +! #include + #include "tsl.h" + + +--- 106,112 ---- + \*----------------------------------------------------------------------*/ + + #include +! #include + #include "tsl.h" + + +*************** +*** 155,161 **** + + + +! tsl_error( fatal, va_alist ) + /*---------------------------------------------------------------------- + | NAME: + | tsl_error +--- 155,161 ---- + + + +! tsl_error( int fatal, ... ) + /*---------------------------------------------------------------------- + | NAME: + | tsl_error +*************** +*** 172,184 **** + | + \*----------------------------------------------------------------------*/ + +- int fatal; +- va_dcl + { + va_list ap; + char *format; + +! va_start(ap); + + format = va_arg(ap, char *); + vfprintf(stderr, format, ap); +--- 172,182 ---- + | + \*----------------------------------------------------------------------*/ + + { + va_list ap; + char *format; + +! va_start(ap, fatal); + + format = va_arg(ap, char *); + vfprintf(stderr, format, ap); Modified: head/misc/deco/Makefile ============================================================================== --- head/misc/deco/Makefile Tue Jul 29 00:43:41 2014 (r363281) +++ head/misc/deco/Makefile Tue Jul 29 01:16:45 2014 (r363282) @@ -8,11 +8,11 @@ CATEGORIES= misc MASTER_SITES= SF/${PORTNAME}/Deco%20Sources/${PORTVERSION} PKGNAMESUFFIX= -misc DISTNAME= deco39 -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Demos Commander, a free Norton Commander clone +USES= tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share CONFIGURE_ENV= ac_cv_lib_ncurses_tgetent=no Copied: head/misc/deco/files/patch-dir.c (from r363279, head/misc/deco/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/deco/files/patch-dir.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/deco/files/patch-ad) @@ -0,0 +1,12 @@ +Index: dir.c +@@ -358,8 +358,10 @@ + + d->topfile = d->curfile = 0; + ++ if (d->sort != SORTSKIP) { + compdir = d; + qsort ((char*)d->cat, (unsigned) d->num, sizeof (d->cat[0]), compfile); ++ } + + if (! dirname) { + /* retag files, restore curfile */ Copied: head/misc/deco/files/patch-ex.c (from r363279, head/misc/deco/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/deco/files/patch-ex.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/deco/files/patch-aa) @@ -0,0 +1,17 @@ +--- ex.c Sat Jul 12 18:54:34 1997 ++++ /home/andy/tmp/wrk/ex.c Tue Dec 16 12:14:53 1997 +@@ -59,11 +59,11 @@ + #define UMFILE ".menu" + #define INITFILE ".decoini" + #define ULDINITFILE "/usr/lib/deco/initfile" +-#define ULLDINITFILE "/usr/local/lib/deco/initfile" ++#define ULLDINITFILE "/usr/local/share/deco/initfile" + #define ULDUMFILE "/usr/lib/deco/menu" +-#define ULLDUMFILE "/usr/local/lib/deco/menu" ++#define ULLDUMFILE "/usr/local/share/deco/menu" + #define ULDEXFILE "/usr/lib/deco/profile" +-#define ULLDEXFILE "/usr/local/lib/deco/profile" ++#define ULLDEXFILE "/usr/local/share/deco/profile" + + struct ex { + char *pat; Copied: head/misc/deco/files/patch-help.c (from r363279, head/misc/deco/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/deco/files/patch-help.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/deco/files/patch-ab) @@ -0,0 +1,11 @@ +--- help.c Sat Jul 12 18:54:34 1997 ++++ /home/andy/tmp/wrk/help.c Tue Dec 16 12:15:00 1997 +@@ -10,7 +10,7 @@ + + #define CS 34 + #define HELPDIR "/usr/lib/deco/help/" +-#define LCLHELPDIR "/usr/local/lib/deco/help/" ++#define LCLHELPDIR "/usr/local/share/deco/help/" + + struct helptab { + char row; Copied: head/misc/deco/files/patch-rec.h (from r363279, head/misc/deco/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/deco/files/patch-rec.h Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/deco/files/patch-af) @@ -0,0 +1,20 @@ +--- rec.h.orig Fri Jul 11 22:01:27 1997 ++++ rec.h Tue Nov 18 16:58:49 2003 +@@ -15,7 +15,7 @@ + + struct map { /* pool cell descriptor */ + short busy; /* cell busy */ +- short index; /* index in lindex */ ++ int index; /* index in lindex */ + long time; /* time of last access */ + }; + +@@ -37,7 +37,7 @@ + short fd; /* file descriptor */ + short bakfd; /* bak file descriptor */ + short tfd; /* temp file descriptor */ +- short len; /* length of file in lines */ ++ int len; /* length of file in lines */ + short broken; /* there are broken lines */ + } REC; + Copied: head/misc/deco/files/patch-scr.c (from r363279, head/misc/deco/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/deco/files/patch-scr.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/deco/files/patch-ae) @@ -0,0 +1,36 @@ +Index: scr.c +@@ -167,7 +167,7 @@ + + static char *CL, *CM, *SE, *SO, *TE, *TI, *VE, *VS, + *AL, *DL, *IS, *IF, *FS, *MD, *MH, *ME, *MR, +- *CF, *CB, *AF, *AB, *Sf, *Sb, *MF, *MB; ++ *CF, *CB, *AF, *AB, *Sf, *Sb, *MF, *MB, *OP; + static NF, NB; + static char MS, C2; + +@@ -231,6 +231,7 @@ + { "Cs", CAPSTR, 0, 0, 0, &Cs, }, + { "Ce", CAPSTR, 0, 0, 0, &Ce, }, + { "Ct", CAPSTR, 0, 0, 0, &Ct, }, ++ { "op", CAPSTR, 0, 0, 0, &OP, }, + { { 0, 0, }, 0, 0, 0, 0, 0, }, + }; + +@@ -413,6 +414,8 @@ + tputs (TE); + if (KE) + tputs (KE); ++ if (OP) ++ tputs (OP); + VFlush (); + TtyReset (); + } +@@ -425,6 +428,8 @@ + tputs (VE); + if (KE) + tputs (KE); ++ if (OP) ++ tputs (OP); + VFlush (); + TtyReset (); + } Copied: head/misc/detachtty/files/patch-Makefile (from r363279, head/misc/detachtty/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/detachtty/files/patch-Makefile Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/detachtty/files/patch-aa) @@ -0,0 +1,23 @@ +--- Makefile.orig 2003-08-04 17:32:23.000000000 +0800 ++++ Makefile 2014-06-08 23:33:51.093015991 +0800 +@@ -3,9 +3,9 @@ + # for details + + # Linux 2.4 +-OS_CFLAGS=-DNEED_PTY_H ++#OS_CFLAGS=-DNEED_PTY_H + # FreeBSD, version unknown +-#OS_CFLAGS=-DNEED_LIBUTIL_H ++OS_CFLAGS=-DNEED_LIBUTIL_H + # Solaris, some version of + #OS_CFLAGS=-DNEED_STRINGS_H -DNEED_LOCAL_FORKPTY_H + # MacOS X needs libpoll from fink +@@ -23,7 +23,7 @@ OS_OBJECTS= + # no forkpty in Solaris or MacOS X + # OS_OBJECTS=forkpty.o + +-INSTALL_DIR=/usr/local/bin ++INSTALL_DIR=${PREFIX}/bin + + # You probably don't need to edit anything below this line + Copied: head/misc/figlet/files/patch-Makefile (from r363279, head/misc/figlet/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/figlet/files/patch-Makefile Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/figlet/files/patch-aa) @@ -0,0 +1,31 @@ +--- Makefile.orig 2011-01-26 18:36:21.000000000 +0800 ++++ Makefile 2011-07-21 09:58:28.753010869 +0800 +@@ -19,8 +19,8 @@ + SHELL = /bin/sh + + # The C compiler and linker to use +-CC = gcc +-CFLAGS = -g -O2 -Wall ++#CC = gcc ++#CFLAGS = -g -O2 -Wall + LD = gcc + LDFLAGS = + +@@ -29,7 +29,7 @@ + XCFLAGS = -DTLF_FONTS + + # Where to install files +-prefix = /usr/local ++#prefix = /usr/local + + # Where the executables should be put + BINDIR = $(prefix)/bin +@@ -38,7 +38,7 @@ + MANDIR = $(prefix)/man + + # Where figlet will search first for fonts (the ".flf" files). +-DEFAULTFONTDIR = $(prefix)/share/figlet ++DEFAULTFONTDIR = $(datadir) + # Use this definition if you can't put things in $(prefix)/share/figlet + #DEFAULTFONTDIR = fonts + Copied: head/misc/figlet/files/patch-figlet.6 (from r363279, head/misc/figlet/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/figlet/files/patch-figlet.6 Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/figlet/files/patch-ab) @@ -0,0 +1,55 @@ +--- figlet.6.orig Tue Feb 18 15:02:28 1997 ++++ figlet.6 Sat Jan 17 16:03:56 1998 +@@ -50,7 +50,27 @@ + [ + .I message + ] +- ++.br ++.B chkfont ++.I fontfile ++[ ++.I ... ++] ++.br ++.B figlist ++[ ++.B \-d ++.I font_directory ++] ++.br ++.B showfigfonts ++[ ++.B \-d ++.I font_directory ++] ++[ ++sample_word ++] + .SH DESCRIPTION + .B FIGlet + prints its input using large characters +@@ -94,6 +114,23 @@ + in compressed form. + See + .BR "COMPRESSED FONTS" . ++ ++.B chkfont ++checks ++.B FIGlet ++fonts for formatting errors. ++.B chkfont ++is useful for those wishing to design or edit their own fonts. ++ ++.B figlist ++lists all the available fonts and control files. ++ ++.B showfigfonts ++displays a sample of each avaiable font in ++.I font_directory ++using the name of the font as the sample text, unless ++.I sample_word ++is specified. + + .SH USAGE + Just start up Modified: head/misc/gctpc/Makefile ============================================================================== --- head/misc/gctpc/Makefile Tue Jul 29 00:43:41 2014 (r363281) +++ head/misc/gctpc/Makefile Tue Jul 29 01:16:45 2014 (r363282) @@ -6,7 +6,6 @@ PORTVERSION= 2.0 CATEGORIES= misc geography MASTER_SITES= http://edcftp.cr.usgs.gov/pub/software/gctpc/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= USGS General Cartographic Transformation Package (GCTP) @@ -15,7 +14,7 @@ OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/${PORTNAME}/source -USES= gmake +USES= gmake tar:Z ALL_TARGET= libgctpc.so.1 USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes Copied: head/misc/gctpc/files/patch-Makefile (from r363279, head/misc/gctpc/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/gctpc/files/patch-Makefile Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/gctpc/files/patch-aa) @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- Makefile.orig Fri Feb 24 17:05:37 1995 ++++ Makefile Thu May 31 15:33:40 2001 +@@ -1,10 +1,12 @@ + + INCDIR = +-ARCHIVE = geolib.a ++SHLIB = libgctpc.so.1 ++ARCHIVE = libgctpc.a + LIBDIR = + SRCDIR = . + INCS = cproj.h proj.h +-CC = cc ++CC ?= cc ++CFLAGS += -fPIC -DPIC + + OBJECTS= \ + $(ARCHIVE)(alberfor.o) $(ARCHIVE)(alberinv.o) \ +@@ -56,6 +58,11 @@ + cproj.c report.c lamccfor.c lamccinv.c paksz.c untfz.c sphdz.c \ + br_gctp.c Makefile cproj.h proj.h + ++$(SHLIB): $(ARCHIVE) ++ mkdir objs ++ cd objs && ar x ../$(ARCHIVE) && $(CC) -shared -o ../$(SHLIB) *.o ++ rm -rf objs ++ + $(ARCHIVE): $(OBJECTS) + + Copied: head/misc/gctpc/files/patch-cproj.h (from r363279, head/misc/gctpc/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/gctpc/files/patch-cproj.h Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/gctpc/files/patch-ab) @@ -0,0 +1,42 @@ +--- ../work/gctpc/source/cproj.h Fri Nov 19 14:32:06 1993 ++++ cproj.h Sun Feb 11 12:32:19 2001 +@@ -1,3 +1,6 @@ ++#ifndef INCLUDED_CPROJ_H ++#define INCLUDED_CPROJ_H ++ + #include + + #define PI 3.141592653589793238 +@@ -26,3 +29,32 @@ + + #define IMOD(A, B) (A) - (((A) / (B)) * (B)) /* Integer mod function */ + ++/* Not part of the original gctpc distribution. */ ++ ++#ifdef NEED_SINCOS ++void ++sincos(double val, double *sin_val, double *cos_val); ++#endif ++ ++double asinz (double con); ++double msfnz (double eccent, double sinphi, double cosphi); ++double qsfnz (double eccent, double sinphi, double cosphi); ++double phi1z (double eccent, double qs, long int *flag); ++double phi2z(double eccent, double ts, long int *flag); ++double phi3z(double ml, double e0, double e1, double e2, double e3, long int *flag); ++double phi4z (double eccent, double e0, double e1, double e2, double e3, ++ double a, double b, double *c, double *phi); ++double pakcz(double pak); ++double pakr2dm(double pak); ++double tsfnz(double eccent, double phi, double sinphi); ++int sign(double x); ++double adjust_lon(double x); ++double e0fn(double x); ++double e1fn(double x); ++double e2fn(double x); ++double e3fn(double x); ++double e4fn(double x); ++double mlfn(double e0, double e1, double e2, double e3, double phi); ++long calc_utm_zone(double lon); ++ ++#endif // INCLUDED_CPROJ_H Copied: head/misc/histring/files/patch-histring.c (from r363279, head/misc/histring/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/histring/files/patch-histring.c Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/histring/files/patch-aa) @@ -0,0 +1,11 @@ +--- histring.c 2000/10/18 13:39:37 1.1 ++++ histring.c 2000/10/18 13:44:11 1.2 +@@ -15,6 +15,8 @@ + # include + #endif + ++#include ++ + #ifdef HAVE_GETOPT_H + # include + #endif Modified: head/misc/man.el/Makefile ============================================================================== --- head/misc/man.el/Makefile Tue Jul 29 00:43:41 2014 (r363281) +++ head/misc/man.el/Makefile Tue Jul 29 01:16:45 2014 (r363282) @@ -20,9 +20,9 @@ PKGMODULES= i18n-man-de i18n-man-en i18n do-install: @${MKDIR} ${STAGEDIR}${ELISPDIR} ${STAGEDIR}${PREFIX}/share/doc/i18n-man - @cd ${WRKSRC}; \ - ${INSTALL_DATA} `${TAR} tzf ${DISTDIR}/${DISTFILES}` \ - ${STAGEDIR}${ELISPDIR} + @(cd ${WRKSRC}; \ + ${INSTALL_DATA} `${TAR} tzf ${DISTDIR}/${DISTFILES}` \ + ${STAGEDIR}${ELISPDIR}) # For xemacs package install configuration @${MKDIR} ${STAGEDIR}${SITEPKGDIR}/pkginfo .for f in ${PKGMODULES} Copied: head/misc/man.el/files/patch-i18n-man-ja.el (from r363279, head/misc/man.el/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/man.el/files/patch-i18n-man-ja.el Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/man.el/files/patch-aa) @@ -0,0 +1,10 @@ +--- i18n-man-ja.el~ Tue Dec 8 01:48:18 1998 ++++ i18n-man-ja.el Tue Dec 8 01:48:48 1998 +@@ -62,7 +62,6 @@ + "Hook for the Japanese manpage depend default coding system setting. + Also save original values of variable to the local variable temporary." + (setenv "LC_CTYPE" "ja_JP.EUC") +- (setenv "MANPATH" (format "/usr/share/man/ja:" (getenv "MANPATH"))) + (if (featurep 'mule) + (case emacs-major-version + (20 ;; XEmacs or Emacs-20.x (Mule-2.4, 3.0 or later) Copied: head/misc/nsf/files/patch-sample.sh (from r363279, head/misc/nsf/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/nsf/files/patch-sample.sh Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/nsf/files/patch-aa) @@ -0,0 +1,11 @@ +--- sample.sh Sat Aug 31 03:27:52 1996 ++++ sample.sh.new Mon Sep 18 00:07:47 2000 +@@ -7,7 +7,7 @@ + *cursor [~~~~~~] + *screen saver [~~~~~~~~~~~~~] *time out [~~~~] + +-#v=keymap#s=:`cd /usr/share/syscons/keymaps;echo *.kbd|sed 's/ /:/g'`:#d=jp.106.kbd# ++#v=keymap#d=jp.106.kbd# + #v=keyrate#s=:slow:normal:fast:default:# + #v=cursor#s=:normal:blink:destructive:NO:# + #v=saver#s=:green:blank:snake:star:#d=green#v=blanktime#a=rf#d=600# Copied: head/misc/shuffle/files/patch-shuffle.c_1 (from r363279, head/misc/shuffle/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/shuffle/files/patch-shuffle.c_1 Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/shuffle/files/patch-aa) @@ -0,0 +1,24 @@ +Index: shuffle.c +=================================================================== +RCS file: /stl/src/NetBSD/basesrc/usr.bin/shuffle/shuffle.c,v +retrieving revision 1.9 +diff -u -r1.9 shuffle.c +--- shuffle.c 2001/03/16 08:02:32 1.9 ++++ shuffle.c 2001/06/03 22:21:49 +@@ -37,6 +37,7 @@ + #endif /* not lint */ + + #include ++#include + #include + #include + #include +@@ -255,7 +256,7 @@ + nlines = pick; + } + +- for (i = 0; i < nlines; i++) { ++ for (i = 0; (unsigned)i < nlines; i++) { + if (nflag) + printf("%ld\n", (long)shuffle[i]); + else Copied: head/misc/shuffle/files/patch-shuffle.c_2 (from r363279, head/misc/shuffle/files/patch-shuffle.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/shuffle/files/patch-shuffle.c_2 Tue Jul 29 01:16:45 2014 (r363282, copy of r363279, head/misc/shuffle/files/patch-shuffle.c) @@ -0,0 +1,15 @@ +--- shuffle.c.orig Wed Jun 13 22:07:36 2001 ++++ shuffle.c Wed Jun 13 22:07:36 2001 +@@ -133,10 +133,11 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***