Date: Wed, 3 Oct 2018 12:38:56 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481158 - in head/graphics/sam2p: . files Message-ID: <201810031238.w93CcuJu063176@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Oct 3 12:38:56 2018 New Revision: 481158 URL: https://svnweb.freebsd.org/changeset/ports/481158 Log: Regenerate all patches and add the necessary changes for Makedep to work on FreeBSD 11.2 and 12. Remove BROKEN. No PORTREVISION bump necessary. Added: head/graphics/sam2p/files/patch-in__ps.cpp (contents, props changed) head/graphics/sam2p/files/patch-minips.cpp (contents, props changed) Modified: head/graphics/sam2p/Makefile head/graphics/sam2p/files/patch-configure head/graphics/sam2p/files/patch-gensio.cpp head/graphics/sam2p/files/patch-ps__tiny.c head/graphics/sam2p/files/patch-pts__defl.c head/graphics/sam2p/files/patch-pts__lzw.c Modified: head/graphics/sam2p/Makefile ============================================================================== --- head/graphics/sam2p/Makefile Wed Oct 3 12:28:03 2018 (r481157) +++ head/graphics/sam2p/Makefile Wed Oct 3 12:38:56 2018 (r481158) @@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= zip:archivers/zip \ tif22pnm:graphics/tif22pnm -BROKEN_FreeBSD_12= running make Makedep... error; configure: error: cannot compute depends - #USE_GITHUB= yes GH_ACCOUNT= pts Modified: head/graphics/sam2p/files/patch-configure ============================================================================== --- head/graphics/sam2p/files/patch-configure Wed Oct 3 12:28:03 2018 (r481157) +++ head/graphics/sam2p/files/patch-configure Wed Oct 3 12:38:56 2018 (r481158) @@ -1,6 +1,6 @@ ---- configure.orig Wed Oct 1 19:19:53 2003 -+++ configure Sun Jan 11 20:48:06 2004 -@@ -7502,7 +7502,7 @@ +--- configure.orig 2014-01-19 19:50:35 UTC ++++ configure +@@ -7520,7 +7520,7 @@ rm -f Makedep ac_n="${ac_n:-$ECHO_N}" echo $ac_n "running make Makedep""... $ac_c" 1>&6 echo "configure:7504: running make Makedep" >&5 Modified: head/graphics/sam2p/files/patch-gensio.cpp ============================================================================== --- head/graphics/sam2p/files/patch-gensio.cpp Wed Oct 3 12:28:03 2018 (r481157) +++ head/graphics/sam2p/files/patch-gensio.cpp Wed Oct 3 12:38:56 2018 (r481158) @@ -1,6 +1,24 @@ ---- gensio.cpp.orig Fri Feb 7 02:24:56 2003 -+++ gensio.cpp Fri Feb 7 02:25:11 2003 -@@ -491,11 +491,7 @@ +--- gensio.cpp.orig 2014-01-19 19:50:35 UTC ++++ gensio.cpp +@@ -494,7 +494,7 @@ Filter::PipeE::PipeE(GenBuffer::Writable + + #if HAVE_PTS_POPEN + if (!tmpsname) { +- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; ++ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeE" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; + signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ + } else { + #else +@@ -622,7 +622,7 @@ slen_t Filter::PipeD::vi_read(char *tobu + if (state==0) { /* Read the whole stream from `in', write it to `tmpsname' */ + #if HAVE_PTS_POPEN + if (!tmpsname) { +- if (NULLP==(p=popen(redir_cmd(), "w"CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; ++ if (NULLP==(p=popen(redir_cmd(), "w" CFG_PTS_POPEN_B))) Error::sev(Error::EERROR) << "Filter::PipeD" << ": popen() failed: " << (SimBuffer::B().appendDumpC(redir_cmd)) << (Error*)0; + signal(SIGPIPE, SIG_IGN); /* Don't abort process with SIGPIPE signals if child cannot read our data */ + vi_precopy(); + in.vi_read(0,0); +@@ -731,11 +731,7 @@ slen_t Filter::FlatD::vi_read(char *to_b /* --- */ Added: head/graphics/sam2p/files/patch-in__ps.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/sam2p/files/patch-in__ps.cpp Wed Oct 3 12:38:56 2018 (r481158) @@ -0,0 +1,20 @@ +--- in_ps.cpp.orig 2014-01-19 19:50:35 UTC ++++ in_ps.cpp +@@ -137,7 +137,7 @@ static Image::Sampled *in_eps_reader(Ima + // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury); + /* Dat: we must call translate _after_ setpagedevice (so it will take effect), at least with ESP Ghostscript 7.05.6 (2003-02-05); BUGFIX at Fri Aug 12 22:49:07 CEST 2005 */ + sprintf(bboxline, +- "<</PageSize[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]>>setpagedevice\n" ++ "<</PageSize[%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g]>>setpagedevice\n" + /* removing /PageSize also cancels /a4, /a5 etc. */ + /* we need `currentmatrix ... setpagedevice setmatrix' because + * setpagedevice cancels the current transformation matrix so our +@@ -147,7 +147,7 @@ static Image::Sampled *in_eps_reader(Ima + "/setpagedevice{matrix currentmatrix exch " + "dup length dict copy dup /PageSize undef setpagedevice " + "setmatrix}bind def\n" +- "%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g translate\n" ++ "%" PTS_CFG_PRINTFGLEN "g %" PTS_CFG_PRINTFGLEN "g translate\n" + , urx-llx, ury-lly, -llx, -lly); + } else { + Error::sev(Error::WARNING) << "in_eps_reader: missing EPS bbox" << (Error*)0; Added: head/graphics/sam2p/files/patch-minips.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/sam2p/files/patch-minips.cpp Wed Oct 3 12:38:56 2018 (r481158) @@ -0,0 +1,32 @@ +--- minips.cpp.orig 2014-01-19 19:50:35 UTC ++++ minips.cpp +@@ -292,9 +292,9 @@ MiniPS::Real::Real(double d_, char const + void MiniPS::Real::dump(GenBuffer::Writable &out_, bool dumpPS_force) { + char buf[64]; /* Imp: should be enough?? */ + if (metric!=0 && (dumpPS_force || dumpPS)) { +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g%s", d, me_psfactor[metric]); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g%s", d, me_psfactor[metric]); + } else { +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d*me_factor[metric]); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d*me_factor[metric]); + } + out_ << buf; + } +@@ -1044,7 +1044,7 @@ void MiniPS::dumpScale(GenBuffer::Writab + } else { + d = d < 0 ? 72.0 / -d : d / 72.0; + char buf[64]; /* Dat: enough */ +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); + out << buf; + } + } +@@ -1093,7 +1093,7 @@ void MiniPS::dumpAdd3(GenBuffer::Writabl + out << (rounding>=2 && ll<0 ? 0 : ll); + } else { + char buf[64]; /* Dat: enough */ +- sprintf(buf, "%"PTS_CFG_PRINTFGLEN"g", d); ++ sprintf(buf, "%" PTS_CFG_PRINTFGLEN "g", d); + out << buf; + } + } Modified: head/graphics/sam2p/files/patch-ps__tiny.c ============================================================================== --- head/graphics/sam2p/files/patch-ps__tiny.c Wed Oct 3 12:28:03 2018 (r481157) +++ head/graphics/sam2p/files/patch-ps__tiny.c Wed Oct 3 12:38:56 2018 (r481158) @@ -1,5 +1,5 @@ ---- ps_tiny.c.orig 2005-02-22 08:22:22.000000000 +0900 -+++ ps_tiny.c 2010-03-19 05:54:19.000000000 +0900 +--- ps_tiny.c.orig 2014-09-16 08:52:28 UTC ++++ ps_tiny.c @@ -1,10 +1,3 @@ -#define DUMMY \ -set -ex; \ @@ -11,3 +11,30 @@ /* ps_tiny.c -- read .pin files, write short PostScript code * by pts@fazekas.hu at Sat Aug 24 12:46:14 CEST 2002 * -- Sat Aug 24 18:23:08 CEST 2002 +@@ -151,7 +144,7 @@ static void ungetcc(int c) { + } + + static void erri(char const*msg1, char const*msg2) { +- fprintf(stderr, "%s: error at %"SLEN_P"u.%"SLEN_P"u.%"SLEN_P"u: %s%s\n", ++ fprintf(stderr, "%s: error at %" SLEN_P "u.%" SLEN_P "u.%" SLEN_P "u: %s%s\n", + PROGNAME, curline, curofs-leftofs+1, curofs, msg1, msg2?msg2:""); + exit(3); + } +@@ -230,7 +223,7 @@ static sbool is_wordx(char const *s) { + /** @param b: assume null-terminated @return true on error */ + static /*inline*/ sbool toInteger(char *s, psint_t *ret) { + int n=0; /* BUGFIX?? found by __CHECKER__ */ +- return sscanf(s, "%"SLEN_P"i%n", ret, &n)<1 || s[n]!='\0'; ++ return sscanf(s, "%" SLEN_P "i%n", ret, &n)<1 || s[n]!='\0'; + } + + /** @param b: assume null-terminated @return true on error */ +@@ -700,7 +693,7 @@ int main(int argc, char**argv) { + getotag("Abbr"); + getkey("acount"); acount=getuintval(); + getkey("xcount"); xcount=getuintval(); +- sprintf(tmp,"%"SLEN_P"u dict%%</I>", acount+xcount); ++ sprintf(tmp,"%" SLEN_P "u dict%%</I>", acount+xcount); + setifmt(tmp,0); copy("I"); noifmt(); + gettagbeg(); + Modified: head/graphics/sam2p/files/patch-pts__defl.c ============================================================================== --- head/graphics/sam2p/files/patch-pts__defl.c Wed Oct 3 12:28:03 2018 (r481157) +++ head/graphics/sam2p/files/patch-pts__defl.c Wed Oct 3 12:38:56 2018 (r481158) @@ -1,5 +1,5 @@ ---- pts_defl.c.orig 2008-08-29 05:16:47.000000000 +0900 -+++ pts_defl.c 2010-03-19 05:54:55.000000000 +0900 +--- pts_defl.c.orig 2014-09-16 08:52:28 UTC ++++ pts_defl.c @@ -1,10 +1,3 @@ -#define DUMMY \ -set -ex; \ Modified: head/graphics/sam2p/files/patch-pts__lzw.c ============================================================================== --- head/graphics/sam2p/files/patch-pts__lzw.c Wed Oct 3 12:28:03 2018 (r481157) +++ head/graphics/sam2p/files/patch-pts__lzw.c Wed Oct 3 12:38:56 2018 (r481158) @@ -1,5 +1,5 @@ ---- pts_lzw.c.orig 2002-12-12 01:43:08.000000000 +0900 -+++ pts_lzw.c 2010-03-19 05:56:24.000000000 +0900 +--- pts_lzw.c.orig 2014-09-16 08:52:28 UTC ++++ pts_lzw.c @@ -1,10 +1,3 @@ -#define DUMMY \ -set -ex; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810031238.w93CcuJu063176>