Date: Thu, 30 Mar 2017 23:54:24 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437337 - in head/textproc/heirloom-doctools: . files Message-ID: <201703302354.v2UNsOoh039248@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu Mar 30 23:54:24 2017 New Revision: 437337 URL: https://svnweb.freebsd.org/changeset/ports/437337 Log: - Fix bugs which could cause SIGSEGV. - Fix an odd error message "sort: file not found". It was not harmful but confusing. - Increase the maximum number of vertexes in a spline curve. 100 vertexes were too small in modern environments. - Use _PATH_* wherever possible. Added: head/textproc/heirloom-doctools/files/ head/textproc/heirloom-doctools/files/patch-refer_inv1.c (contents, props changed) head/textproc/heirloom-doctools/files/patch-refer_refer5.c (contents, props changed) head/textproc/heirloom-doctools/files/patch-refer_refer7.c (contents, props changed) head/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c (contents, props changed) Modified: head/textproc/heirloom-doctools/Makefile Modified: head/textproc/heirloom-doctools/Makefile ============================================================================== --- head/textproc/heirloom-doctools/Makefile Thu Mar 30 23:24:00 2017 (r437336) +++ head/textproc/heirloom-doctools/Makefile Thu Mar 30 23:54:24 2017 (r437337) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= heirloom-doctools -DISTVERSION= 160308 +PORTVERSION= 160308 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= hrs@FreeBSD.org Added: head/textproc/heirloom-doctools/files/patch-refer_inv1.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/heirloom-doctools/files/patch-refer_inv1.c Thu Mar 30 23:54:24 2017 (r437337) @@ -0,0 +1,24 @@ +--- refer/inv1.c.orig 2016-03-09 21:27:38 UTC ++++ refer/inv1.c +@@ -28,6 +28,9 @@ + #include <stdio.h> + #include <locale.h> + #include <assert.h> ++#ifdef __FreeBSD__ ++#include <paths.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include "refer..c" +@@ -59,7 +62,11 @@ main(int argc, char **argv) + int iflong =0; + char *sortdir; + ++#ifdef __FreeBSD__ ++ sortdir = _PATH_VARTMP; ++#else + sortdir = (access("/crp/tmp", 06)==0) ? "/crp/tmp" : "/var/tmp"; ++#endif + while (argc>1 && argv[1][0] == '-') + { + switch(argv[1][1]) Added: head/textproc/heirloom-doctools/files/patch-refer_refer5.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/heirloom-doctools/files/patch-refer_refer5.c Thu Mar 30 23:54:24 2017 (r437337) @@ -0,0 +1,22 @@ +--- refer/refer5.c.orig 2016-03-09 21:27:38 UTC ++++ refer/refer5.c +@@ -148,14 +148,18 @@ putsig (int nf, char **flds, int nref, c + flout(); + sig[0] = 0; + prevsig = 0; +- if (fo == fhide) { ++ if (fhide != NULL && fo == fhide) { + int ch; + fclose(fhide); + fhide = fopen(hidenam, "r"); ++ if (fhide == NULL) ++ err("Can't get scratch file %s", ++ hidenam); + fo = ftemp; + while ((ch = getc(fhide)) != EOF) + putc(ch, fo); + fclose(fhide); ++ fhide = NULL; + unlink(hidenam); + } + } Added: head/textproc/heirloom-doctools/files/patch-refer_refer7.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/heirloom-doctools/files/patch-refer_refer7.c Thu Mar 30 23:54:24 2017 (r437337) @@ -0,0 +1,29 @@ +--- refer/refer7.c.orig 2016-03-09 21:27:38 UTC ++++ refer/refer7.c +@@ -56,16 +56,21 @@ dumpold(void) + + if (!endpush) + return; +- fclose(fo); +- fo = NULL; ++ if (fo != NULL) { ++ fclose(fo); ++ fo = NULL; ++ } ++ fi = fopen(tfile, "r"); ++ if (fi == NULL) ++ return; + if (sort) { + char comm[100]; ++ ++ fclose(fi); + snprintf(comm, sizeof(comm), "sort -f %s -o %s", tfile, tfile); + system(comm); ++ fi = fopen(tfile, "r"); + } +- fi = fopen(tfile, "r"); +- if (fi == NULL) +- return; + flout(); + fprintf(ftemp, ".]<\n"); + while ((c = getc(fi)) > 0) { Added: head/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/heirloom-doctools/files/patch-troff_troff.d_dpost.d_draw.c Thu Mar 30 23:54:24 2017 (r437337) @@ -0,0 +1,11 @@ +--- troff/troff.d/dpost.d/draw.c.orig 2016-03-09 21:27:38 UTC ++++ troff/troff.d/dpost.d/draw.c +@@ -348,7 +348,7 @@ drawspline( + { + + +- int x[100], y[100]; ++ int x[5000], y[5000]; + int i, N; + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703302354.v2UNsOoh039248>