Date: Wed, 3 Oct 2018 16:41:35 +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: r481168 - in head/graphics/sam2p: . files Message-ID: <201810031641.w93GfZgx090448@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Wed Oct 3 16:41:35 2018 New Revision: 481168 URL: https://svnweb.freebsd.org/changeset/ports/481168 Log: Upgrade to 0.49.4 with re-rolled tarball. Deleted: head/graphics/sam2p/files/patch-gensh.hpp head/graphics/sam2p/files/patch-in__ps.cpp head/graphics/sam2p/files/patch-minips.cpp Modified: head/graphics/sam2p/Makefile head/graphics/sam2p/distinfo head/graphics/sam2p/files/patch-configure head/graphics/sam2p/files/patch-gensio.cpp head/graphics/sam2p/files/patch-ps__tiny.c Modified: head/graphics/sam2p/Makefile ============================================================================== --- head/graphics/sam2p/Makefile Wed Oct 3 15:11:12 2018 (r481167) +++ head/graphics/sam2p/Makefile Wed Oct 3 16:41:35 2018 (r481168) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sam2p -PORTVERSION= 0.49.3 +PORTVERSION= 0.49.4 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${PORTVERSION}/ @@ -22,8 +22,9 @@ GH_ACCOUNT= pts USES= ghostscript:run gmake jpeg:run perl5 USE_PERL5= build GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_pts_bash="${SH}" +CONFIGURE_ENV= MAKE=gmake ac_cv_path_pts_bash="${SH}" CONFIGURE_ARGS= --enable-gif +MAKE_ENV= MAKE=gmake ALL_TARGET= ${PORTNAME} PORTDOCS= * Modified: head/graphics/sam2p/distinfo ============================================================================== --- head/graphics/sam2p/distinfo Wed Oct 3 15:11:12 2018 (r481167) +++ head/graphics/sam2p/distinfo Wed Oct 3 16:41:35 2018 (r481168) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476179820 -SHA256 (sam2p-0.49.3.tar.gz) = 33b1bf018a19b19c30d41defcb8b20c7cdcbc7ddd7703040c3a54d9cb1fcaaea -SIZE (sam2p-0.49.3.tar.gz) = 564098 +TIMESTAMP = 1538584194 +SHA256 (sam2p-0.49.4.tar.gz) = 5bc5b5a526bc798315da23b02564d6a1bfea51b364b8b03f76695a833f6d2bed +SIZE (sam2p-0.49.4.tar.gz) = 497193 Modified: head/graphics/sam2p/files/patch-configure ============================================================================== --- head/graphics/sam2p/files/patch-configure Wed Oct 3 15:11:12 2018 (r481167) +++ head/graphics/sam2p/files/patch-configure Wed Oct 3 16:41:35 2018 (r481168) @@ -1,11 +1,15 @@ ---- configure.orig 2014-01-19 19:50:35 UTC +--- configure.orig 2017-09-13 12:09:54 UTC +++ configure -@@ -7520,7 +7520,7 @@ rm -f Makedep +@@ -7518,9 +7518,9 @@ fi + + 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 --if >&5 2>&5 make Makedep; then : -+if >&5 2>&5 gmake Makedep; then : +-echo $ac_n "running make Makedep.force""... $ac_c" 1>&6 +-echo "configure:7504: running make Makedep.force" >&5 +-if >&5 2>&5 make Makedep.force; then : ++echo $ac_n "running ${MAKE:-make} Makedep.force""... $ac_c" 1>&6 ++echo "configure:7504: running ${MAKE:-make} Makedep.force" >&5 ++if >&5 2>&5 ${MAKE:-make} Makedep.force; then : echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 Modified: head/graphics/sam2p/files/patch-gensio.cpp ============================================================================== --- head/graphics/sam2p/files/patch-gensio.cpp Wed Oct 3 15:11:12 2018 (r481167) +++ head/graphics/sam2p/files/patch-gensio.cpp Wed Oct 3 16:41:35 2018 (r481168) @@ -1,23 +1,5 @@ --- 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 /* --- */ Modified: head/graphics/sam2p/files/patch-ps__tiny.c ============================================================================== --- head/graphics/sam2p/files/patch-ps__tiny.c Wed Oct 3 15:11:12 2018 (r481167) +++ head/graphics/sam2p/files/patch-ps__tiny.c Wed Oct 3 16:41:35 2018 (r481168) @@ -11,30 +11,3 @@ /* 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(); -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810031641.w93GfZgx090448>