# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1631451088 14400
# Node ID b96d29842043841146c599b57143d071346563c4
# Parent  d1f4f3739a52daa174b530eb5b34dd24cb3b33b2
transfig: update to v3.2.8b

* src/transfig.mk: update version, checksum

* src/transfig-1-fixes.patch: update patch

diff -r d1f4f3739a52 -r b96d29842043 src/transfig-1-fixes.patch
--- a/src/transfig-1-fixes.patch	Sat Sep 11 06:17:40 2021 -0400
+++ b/src/transfig-1-fixes.patch	Sun Sep 12 08:51:28 2021 -0400
@@ -1,20 +1,33 @@
-diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8/fig2dev/dev/genbitmaps.c
---- fig2dev-3.2.8.orig/fig2dev/dev/genbitmaps.c	2020-12-24 07:58:17.831822681 -0500
-+++ fig2dev-3.2.8/fig2dev/dev/genbitmaps.c	2020-12-24 07:59:41.971440443 -0500
-@@ -493,8 +493,9 @@
- 		err_msg("Cannot write command for conversion to bitmap");
+diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c
+--- fig2dev-3.2.8b.orig/fig2dev/dev/genbitmaps.c	2021-09-06 12:57:54.175751149 -0400
++++ fig2dev-3.2.8b/fig2dev/dev/genbitmaps.c	2021-09-06 13:10:27.022794005 -0400
+@@ -95,6 +95,13 @@
+ static int	border_margin = 0;
+ static int	smooth = 0;
+ 
++#if defined (__WIN32__) || !defined (__CYGWIN__)
++  #define WEXITSTATUS(w)  (w)
++  #define WIFEXITED(w)	  (true)
++  #define WIFSIGNALED(w)  (false)
++  #define WTERMSIG(w)     (0)
++#endif
++
+ void
+ genbitmaps_option(char opt, char *optarg)
+ {
+@@ -498,7 +505,9 @@
  		BITMAP_EXIT_FAILURE;
  	}
--
+ 
 +#if !defined (__WIN32__) || defined (__CYGWIN__)
  	(void) signal(SIGPIPE, bitmaps_broken_pipe);
 +#endif
  	if ((tfp = popen(com, "w")) == NULL) {
  		fprintf(stderr, "fig2dev: Cannot open pipe to ghostscript\n");
  		fprintf(stderr, "command was: %s\n", com);
-@@ -534,8 +535,9 @@
- 
- 	status = pclose(tfp);
+@@ -542,8 +551,9 @@
+ 	else
+ 		status = -1;
  	tfp = NULL;	/* Otherwise main() tries to close tfp again */
 +#if !defined (__WIN32__) || defined (__CYGWIN__)
  	(void) signal(SIGPIPE, SIG_DFL);
@@ -23,9 +36,9 @@
  	if (status != 0) {
  		FILE	*f;
  
-diff -ur fig2dev-3.2.8.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8/fig2dev/dev/genpdf.c
---- fig2dev-3.2.8.orig/fig2dev/dev/genpdf.c	2020-12-24 07:58:17.831822681 -0500
-+++ fig2dev-3.2.8/fig2dev/dev/genpdf.c	2020-12-24 08:01:13.368456502 -0500
+diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c fig2dev-3.2.8b/fig2dev/dev/genpdf.c
+--- fig2dev-3.2.8b.orig/fig2dev/dev/genpdf.c	2021-09-06 12:57:54.174751090 -0400
++++ fig2dev-3.2.8b/fig2dev/dev/genpdf.c	2021-09-06 13:00:15.862053203 -0400
 @@ -111,7 +111,9 @@
  		exit(EXIT_FAILURE);
  	}
@@ -46,3 +59,39 @@
  	}
  
  	if (com != com_buf)
+diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c fig2dev-3.2.8b/fig2dev/dev/readeps.c
+--- fig2dev-3.2.8b.orig/fig2dev/dev/readeps.c	2021-09-06 12:57:54.173751032 -0400
++++ fig2dev-3.2.8b/fig2dev/dev/readeps.c	2021-09-06 13:13:39.700059768 -0400
+@@ -35,6 +35,13 @@
+ #include "messages.h"
+ #include "readpics.h"
+ 
++#if defined (__WIN32__) || !defined (__CYGWIN__)
++  #define WEXITSTATUS(w)  (w)
++  #define WIFEXITED(w)	  (true)
++  #define WIFSIGNALED(w)  (false)
++  #define WTERMSIG(w)     (0)
++#endif
++
+ int	read_eps(F_pic *pic, struct xfig_stream *restrict pic_stream,
+ 		int *llx, int *lly);
+ 
+diff -ur fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c fig2dev-3.2.8b/fig2dev/dev/readpics.c
+--- fig2dev-3.2.8b.orig/fig2dev/dev/readpics.c	2021-09-06 12:57:54.173751032 -0400
++++ fig2dev-3.2.8b/fig2dev/dev/readpics.c	2021-09-06 13:11:49.848636802 -0400
+@@ -36,6 +36,15 @@
+ #include "xtmpfile.h"
+ 
+ 
++#if defined (__WIN32__) || !defined (__CYGWIN__)
++  #define WEXITSTATUS(w)  (w)
++  #define WIFEXITED(w)	  (true)
++  #define WIFSIGNALED(w)  (false)
++  #define WTERMSIG(w)     (0)
++#endif
++
++
++
+ void
+ init_stream(struct xfig_stream *restrict xf_stream)
+ {
diff -r d1f4f3739a52 -r b96d29842043 src/transfig.mk
--- a/src/transfig.mk	Sat Sep 11 06:17:40 2021 -0400
+++ b/src/transfig.mk	Sun Sep 12 08:51:28 2021 -0400
@@ -3,8 +3,8 @@
 
 PKG             := transfig
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.2.8a
-$(PKG)_CHECKSUM := 9f607b31aae1ecf27b45c0fe374f2705fb00ec05
+$(PKG)_VERSION  := 3.2.8b
+$(PKG)_CHECKSUM := 9a85b37a0770d73915584f1e75e58375b093d9bd
 $(PKG)_SUBDIR   := fig2dev-$($(PKG)_VERSION)
 $(PKG)_FILE     := fig2dev-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/mcj/$($(PKG)_FILE)