[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/
commit: 6eb198608ec3087deffd074ab6a8be044165051a
Author: John Helmert III posteo net>
AuthorDate: Fri Oct 16 01:12:57 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 11 00:25:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb19860
media-gfx/sam2p: drop 0.49.3 (security)
Bug: https://bugs.gentoo.org/636876
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/17945
Signed-off-by: Sam James gentoo.org>
media-gfx/sam2p/Manifest | 1 -
.../sam2p/files/sam2p-0.49.3-build-fixes.patch | 160 -
media-gfx/sam2p/files/sam2p-0.49.3-perl526.patch | 23 ---
media-gfx/sam2p/sam2p-0.49.3.ebuild| 47 --
4 files changed, 231 deletions(-)
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index d8df300a1fd..53c2024bccf 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,2 +1 @@
-DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B
47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674
SHA512
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B
3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6
SHA512
1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
deleted file mode 100644
index dfad65cc05d..000
--- a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Fix literal suffix errors in C++14, caused by missing spaces between
-C-strings and macros.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
-
a/configure.in
-+++ b/configure.in
-@@ -81,8 +81,6 @@
- dnl Checks for programs.
- dnl AC_PROG_CC
- AC_LANG_CPLUSPLUS
--CXXFLAGS=" "
--dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
- CCC="$CCC g++"
- dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
- AC_PROG_CXX
-@@ -216,7 +214,7 @@
-
- dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot
compute depends)])
- rm -f Makedep
--AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
-+AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
- AC_PTS_OK
- echo "configure done. Now you should run: make; make install"
-
a/gensio.cpp
-+++ b/gensio.cpp
-@@ -494,7 +494,7 @@
-
- #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 @@
- 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);
-@@ -730,12 +730,7 @@
-
- /* --- */
-
--
--#if HAVE_lstat_in_sys_stat
--# define PTS_lstat lstat
--#else
- # define PTS_lstat stat
--#endif
-
- /** @param fname must start with '/' (dir separator)
- * @return true if file successfully created
a/in_ps.cpp
-+++ b/in_ps.cpp
-@@ -137,7 +137,7 @@
- // 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,
-- "<>setpagedevice\n"
-+ "<>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 +14
[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/
commit: fed7eb00df36cec72f22422b72973fe1723d5d86
Author: John Helmert III posteo net>
AuthorDate: Sat Oct 10 03:15:13 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 10 04:58:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed7eb00
media-gfx/sam2p: correct compiler configuration
Closes: https://bugs.gentoo.org/746638
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/17869
Signed-off-by: Sam James gentoo.org>
media-gfx/sam2p/files/sam2p-build-fixes.patch | 53 ++
media-gfx/sam2p/files/sam2p-configure-strip.patch | 30
...718.ebuild => sam2p-0.49.4_p20190718-r1.ebuild} | 8 ++--
3 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/media-gfx/sam2p/files/sam2p-build-fixes.patch
b/media-gfx/sam2p/files/sam2p-build-fixes.patch
new file mode 100644
index 000..6a1c8017512
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-build-fixes.patch
@@ -0,0 +1,53 @@
+Make stripping configurable, correct CC/CXX/CFLAGS/CXXFLAGS handling, add
+missing include
+
+diff --git a/Makefile b/Makefile
+index 1433167..38bb7cc 100644
+--- a/Makefile
b/Makefile
+@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
+ MAKE_DIST=000
+ endif
+
++GCC_STRIP ?= -s
+ BASH=bash
+ PERL_BADLANG=x
+ export PERL_BADLANG
+
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -46,8 +47,8 @@ CXXX=$(CXD_checker)
+ LDALL=checkerg++ $(LDFLAGS) $(LIBS)
+ endif
+
+-CXXALL=$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
+-CCALL =$(CXXX) $(CXXFLAGS) $(CXXFLAGSB)
++CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB)
++CCALL =$(CC) $(CFLAGS) $(CXXFLAGSB)
+ CXDFAL=$(CXXFLAGS) $(CXXFLAGSB) $(LDFLAGS) $(LIBS)
+
+ .PHONY: clean dist dist-noautoconf dist-more allclean distclean dist-install
+@@ -67,7 +68,7 @@ ifeq ($(MAKE_DIST),)
+ #
+ # echo to config.h is needed to make config.h younger than config.h.in;
+ # configure doesn't change the timestamp of config.h if it's unchanged.
+- Makedep config.h: configure Makehelp.in config.h.in ccdep.pl
sam2p_version.h; ./configure MAKE=$(MAKE) --enable-gif --enable-lzw && echo ""
>>config.h
++ Makedep config.h: configure Makehelp.in config.h.in ccdep.pl
sam2p_version.h;
+ Makehelp:;
+ include Makehelp # Defines CXX. File generated by ./configure.
+ include Makedep # Contains ALL+=... .
+@@ -101,8 +102,8 @@ IDE_MODES := release debug
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+
+-CXD_assert =$(CXX) -s -O2
+-CXD_no =$(CXX) -s -DNDEBUG -O3
++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
++CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
+ # CXD_yes=$(CXX) $(GFLAG) -lefence
+ CXD_yes=$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/files/sam2p-configure-strip.patch
b/media-gfx/sam2p/files/sam2p-configure-strip.patch
deleted file mode 100644
index be78fad0f73..000
--- a/media-gfx/sam2p/files/sam2p-configure-strip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1433167..b662e33 100644
a/Makefile
-+++ b/Makefile
-@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
- MAKE_DIST=000
- endif
-
-+GCC_STRIP ?= -s
- BASH=bash
- PERL_BADLANG=x
- export PERL_BADLANG
-
- CXXX=$(CXD_assert)
--LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
-+LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
- ifeq ($(ENABLE_DEBUG), no)
- CXXX=$(CXD_no)
- endif
-@@ -101,8 +102,8 @@ IDE_MODES := release debug
- IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
- IDE_TARGETS_release := $(TARGETS)
-
--CXD_assert =$(CXX) -s -O2
--CXD_no =$(CXX) -s -DNDEBUG -O3
-+CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
-+CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
- # CXD_yes=$(CXX) $(GFLAG) -lefence
- CXD_yes=$(CXX) $(GFLAG)
- CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
similarity index 84%
rename from media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
rename to media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 2460983318f..e95883c8eca 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -21,7 +21,7 @@ BDEPEND="dev-lang/perl"
S="${WORKDIR}/${PN}-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${PN}-configure-strip.patch )
+PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch )
src_prepare() {
default
@@ -29,15 +29,15 @@ src_prepare() {
# configure.in files are deprecated
mv configure.{in,ac} || die
- # upstream thinks they're being helpful by running configure with `make`
- sed -i '/Makedep/s/ .\/configure.*//' Makefile || die
+ # missing include for memset
+ sed -i '1s;^;#include \n;' pts_defl.c
# eautoreconf is still
[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/
commit: 173810552f074b83f9d0bdee1e50e5691904b9d9
Author: John Helmert III posteo net>
AuthorDate: Sun Oct 4 17:09:13 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Oct 4 17:09:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17381055
media-gfx/sam2p: Security bump
Bug: https://bugs.gentoo.org/631636
Bug: https://bugs.gentoo.org/636876
Bug: https://bugs.gentoo.org/649750
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16286
Signed-off-by: David Seifert gentoo.org>
media-gfx/sam2p/Manifest | 1 +
media-gfx/sam2p/files/sam2p-configure-strip.patch | 30 +++
media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild | 62 +++
3 files changed, 93 insertions(+)
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index b141a11da73..d8df300a1fd 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1 +1,2 @@
DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B
47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674
SHA512
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
+DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B
3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6
SHA512
1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
diff --git a/media-gfx/sam2p/files/sam2p-configure-strip.patch
b/media-gfx/sam2p/files/sam2p-configure-strip.patch
new file mode 100644
index 000..be78fad0f73
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-configure-strip.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index 1433167..b662e33 100644
+--- a/Makefile
b/Makefile
+@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force)
+ MAKE_DIST=000
+ endif
+
++GCC_STRIP ?= -s
+ BASH=bash
+ PERL_BADLANG=x
+ export PERL_BADLANG
+
+ CXXX=$(CXD_assert)
+-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS)
++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG), no)
+ CXXX=$(CXD_no)
+ endif
+@@ -101,8 +102,8 @@ IDE_MODES := release debug
+ IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS))
+ IDE_TARGETS_release := $(TARGETS)
+
+-CXD_assert =$(CXX) -s -O2
+-CXD_no =$(CXX) -s -DNDEBUG -O3
++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
++CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS)
+ # CXD_yes=$(CXX) $(GFLAG) -lefence
+ CXD_yes=$(CXX) $(GFLAG)
+ CXD_checker=checkerg++ $(GFLAG)
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
b/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
new file mode 100644
index 000..2460983318f
--- /dev/null
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+COMMIT="b953f63307c4a83fa4615a4863e3fb250205cd98"
+
+DESCRIPTION="Utility to convert raster images to EPS, PDF and many others"
+HOMEPAGE="https://github.com/pts/sam2p";
+SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~x64-macos"
+IUSE="examples gif"
+RESTRICT="test"
+
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${PN}-configure-strip.patch )
+
+src_prepare() {
+ default
+
+ # configure.in files are deprecated
+ mv configure.{in,ac} || die
+
+ # upstream thinks they're being helpful by running configure with `make`
+ sed -i '/Makedep/s/ .\/configure.*//' Makefile || die
+
+ # eautoreconf is still needed or you get bad warnings
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CXX
+
+ econf \
+ --enable-lzw \
+ $(use_enable gif)
+}
+
+src_compile() {
+ emake GCC_STRIP=
+}
+
+src_install() {
+ dobin sam2p
+ einstalldocs
+
+ if use examples; then
+ # clear pre-compressed files
+ rm examples/*.gz || die
+
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/
commit: 1e4d9bfb79505198acd14497f4da8841ef7b314e
Author: Jonathan Scruggs gmail com>
AuthorDate: Fri Oct 28 15:53:26 2016 +
Commit: David Seifert gentoo org>
CommitDate: Fri Oct 28 22:30:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4d9bfb
media-gfx/sam2p: version bump to 0.49.3
Gentoo-bug: 585630, 598362
- Switch to EAPI 6
- Simplify ebuild
- Update to new HOMEPAGE
Signed off by: Jonathan Scruggs (j.scrugs gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/2688
Signed-off-by: David Seifert gentoo.org>
media-gfx/sam2p/Manifest | 1 +
.../sam2p/files/sam2p-0.49.3-build-fixes.patch | 160 +
media-gfx/sam2p/sam2p-0.49.3.ebuild| 48 +++
3 files changed, 209 insertions(+)
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 639fc75..845eb43 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,2 +1,3 @@
DIST sam2p-0.49.1.tar.gz 562304 SHA256
d97a270e3ad4ad138378b5fcb10e489e9af48a8150f308458771808dfceb069a SHA512
58565fdcb7c450ad23c2971b70f0362dbf4ecfd8c4dedf19c25b56fc98c8799696c6ecf75d47650bc3b21f88b8454d7c4e6b206f7c0ae0e5de35d608262c1220
WHIRLPOOL
809512e56f7e0b4ac0b8a00be1da1088a1249fbccf1b59470b4e25036ffdaf36884374c7735bad6a3440166e835c02ade7f87dc9eb00b92b84382602884517d5
DIST sam2p-0.49.2.tar.gz 562733 SHA256
0e75d94bed380f8d8bd629f7797a0ca533b5d0b40eba2dab339146dedc1f79bf SHA512
8e4d629df192381bddf8468687c6a41d459b70788a5e9defc68d5497f855cbae838f2f6f924237b17e4a8e6fbf982fb2709615c8fb1d9c8cec5ec7ecf91ec6ce
WHIRLPOOL
90ede2ba7b8f1dbc056cfdcfbaedd3cc995ccb58439050d6b4c51ab24a33f91b022110ea3a72ffe8b72e42f9104e936511fdbcdc1bf579fdac26c145ff2bb949
+DIST sam2p-0.49.3.tar.gz 2184864 SHA256
687210c3ccd12da646db2a6e53f2de5a3a7639a7bcb0c381a61789eca50a824d SHA512
9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
WHIRLPOOL
5362348d1955f67ae6f64b72ec0d53e88e21c46d281e3e844329059f7d0f2c4a1ac2b2faeca48c1a923fbbbcff1c9732bb016192c001a2de1970197a17051f9b
diff --git a/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
new file mode 100644
index ..dfad65c
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.49.3-build-fixes.patch
@@ -0,0 +1,160 @@
+Fix literal suffix errors in C++14, caused by missing spaces between
+C-strings and macros.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=585630
+
+--- a/configure.in
b/configure.in
+@@ -81,8 +81,6 @@
+ dnl Checks for programs.
+ dnl AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+-CXXFLAGS=" "
+-dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
+ CCC="$CCC g++"
+ dnl ^^^ check g++ before c++ (see acspecific.m4, grep AC_PROG_CXX)
+ AC_PROG_CXX
+@@ -216,7 +214,7 @@
+
+ dnl AC_PTS_RUN_OK([perl -x -S ./ccdep.pl $CXX], [], [AC_MSG_ERROR(cannot
compute depends)])
+ rm -f Makedep
+-AC_PTS_RUN_OK([make Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
++AC_PTS_RUN_OK([gmake Makedep], [], [AC_MSG_ERROR(cannot compute depends)])
+ AC_PTS_OK
+ echo "configure done. Now you should run: make; make install"
+
+--- a/gensio.cpp
b/gensio.cpp
+@@ -494,7 +494,7 @@
+
+ #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 @@
+ 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);
+@@ -730,12 +730,7 @@
+
+ /* --- */
+
+-
+-#if HAVE_lstat_in_sys_stat
+-# define PTS_lstat lstat
+-#else
+ # define PTS_lstat stat
+-#endif
+
+ /** @param fname must start with '/' (dir separator)
+ * @return true if file successfully created
+--- a/in_ps.cpp
b/in_ps.cpp
+@@ -137,7 +137,7 @@
+ // fprintf(stderr, "bbox=[%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g
%"PTS_CFG_PRINTFGLEN"g %"PTS_CFG_PRINTFGLEN"g]\n", llx, lly, urx, ury);
+ /* D
