From d2d3a39b8d938f996eb4ba1f0d916c5e7b30264b Mon Sep 17 00:00:00 2001 From: fcambus Date: Thu, 8 Dec 2022 20:35:22 +0000 Subject: [PATCH] Update xfig to 3.2.8b. --- graphics/xfig/Makefile | 3 +-- graphics/xfig/distinfo | 4 ++-- graphics/xfig/patches/patch-fig_h | 11 ----------- graphics/xfig/patches/patch-src_d_text_c | 12 ------------ graphics/xfig/patches/patch-u_error_c | 14 -------------- graphics/xfig/pkg/PLIST | 8 +------- 6 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 graphics/xfig/patches/patch-fig_h delete mode 100644 graphics/xfig/patches/patch-src_d_text_c delete mode 100644 graphics/xfig/patches/patch-u_error_c diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index fbebbdadb1b..c742a111f59 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,8 +1,7 @@ COMMENT= CAD drawing program for X11 # print/transfig usually needs to be in-sync -DISTNAME= xfig-3.2.7b -REVISION= 0 +DISTNAME= xfig-3.2.8b CATEGORIES= graphics x11 HOMEPAGE= http://mcj.sourceforge.net/ diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo index d8083955bb6..395731b2576 100644 --- a/graphics/xfig/distinfo +++ b/graphics/xfig/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfig-3.2.7b.tar.xz) = u8HEqo63/AZVmlv4PEeY8CK+QTUZd4pdXNzNJPOaC84= -SIZE (xfig-3.2.7b.tar.xz) = 5059984 +SHA256 (xfig-3.2.8b.tar.xz) = ssyBgc+zVva3XMKHcZcER/aauh1yii2sDgvPGup6zTo= +SIZE (xfig-3.2.8b.tar.xz) = 5382524 diff --git a/graphics/xfig/patches/patch-fig_h b/graphics/xfig/patches/patch-fig_h deleted file mode 100644 index eee5d0ecafa..00000000000 --- a/graphics/xfig/patches/patch-fig_h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fig.h.orig Mon Jun 20 22:29:39 2016 -+++ src/fig.h Thu Dec 22 12:32:54 2016 -@@ -149,7 +149,7 @@ extern double drand48(); - extern long random(); - extern void srandom(unsigned int); - --#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__) -+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__) && !defined(__OpenBSD__) - extern void srandom(int); - - #endif diff --git a/graphics/xfig/patches/patch-src_d_text_c b/graphics/xfig/patches/patch-src_d_text_c deleted file mode 100644 index 757844c215c..00000000000 --- a/graphics/xfig/patches/patch-src_d_text_c +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/d_text.c ---- src/d_text.c.orig -+++ src/d_text.c -@@ -2166,7 +2166,7 @@ static void - paste_preedit_proc(int x, int y) - { - FILE *fp; -- char ch; -+ int ch; - if (!is_preedit_running()) { - open_preedit_proc(x, y); - } else if ((fp = fopen(preedit_filename, "r")) != NULL) { diff --git a/graphics/xfig/patches/patch-u_error_c b/graphics/xfig/patches/patch-u_error_c deleted file mode 100644 index 1dd90f4160d..00000000000 --- a/graphics/xfig/patches/patch-u_error_c +++ /dev/null @@ -1,14 +0,0 @@ -Avoids null deref->segfault->core seen if you exit by closing the window. - ---- src/u_error.c.orig Thu May 5 00:05:10 2016 -+++ src/u_error.c Thu Dec 22 12:22:20 2016 -@@ -65,6 +65,9 @@ int X_error_handler(Display *d, XErrorEvent *err_ev) - /* uninstall error handlers so we don't recurse if another error happens! */ - XSetErrorHandler(NULL); - XSetIOErrorHandler((XIOErrorHandler) NULL); -+ if (!err_ev) { -+ return 0; -+ } - XGetErrorText(tool_d, (int) (err_ev->error_code), err_msg, MAXERRMSGLEN - 1); - (void) fprintf(stderr, - "xfig%s: X error trapped - error message follows:\n%s\n", diff --git a/graphics/xfig/pkg/PLIST b/graphics/xfig/pkg/PLIST index a5063c7c0de..94e499e4286 100644 --- a/graphics/xfig/pkg/PLIST +++ b/graphics/xfig/pkg/PLIST @@ -1,5 +1,6 @@ @bin bin/xfig lib/X11/app-defaults/Fig +lib/X11/xfig/ lib/X11/xfig/CompKeyDB lib/X11/xfig/Libraries/ lib/X11/xfig/Libraries/Arrows/ @@ -1275,9 +1276,7 @@ lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/e_schmitt-symbol.fig lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/f_trans-bip-npn.fig lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/f_trans-bip-pnp.fig lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/f_trans-fet-n-type.fig -lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/f_trans-fet-n-type.fig.bak lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/f_trans-fet-p-type.fig -lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/f_trans-fet-p-type.fig.bak lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/logic_and-and-gate.fig lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/logic_and-nand-gate.fig lib/X11/xfig/Libraries/Electronic/Schematic/Imperial/logic_buffer-inverting.fig @@ -2958,7 +2957,6 @@ share/doc/xfig/html/images/polyline-example.png share/doc/xfig/html/images/power-supply.png share/doc/xfig/html/images/power-supply_sm.png share/doc/xfig/html/images/print-panel.png -share/doc/xfig/html/images/pspbrwse.jbf share/doc/xfig/html/images/redball.png share/doc/xfig/html/images/redballdot.png share/doc/xfig/html/images/regular-polygon-button.png @@ -3024,9 +3022,6 @@ share/doc/xfig/html/images/view-menu-button.png share/doc/xfig/html/images/watch.png share/doc/xfig/html/images/watch_sm.png share/doc/xfig/html/images/xfig-logo.png -share/doc/xfig/html/images/xfig-title-old.png -share/doc/xfig/html/images/xfig-title.fig -share/doc/xfig/html/images/xfig-title.fig.in share/doc/xfig/html/images/xfig-title.png share/doc/xfig/html/images/xfig_splash_logo.png share/doc/xfig/html/images/xfighelp.png @@ -3114,7 +3109,6 @@ share/doc/xfig/html/panning.html share/doc/xfig/html/printing.html share/doc/xfig/html/screen_image_map.html share/doc/xfig/xfig-howto.pdf -share/doc/xfig/xfig-title.png share/doc/xfig/xfig_man.html share/doc/xfig/xfig_ref_en.pdf share/pixmaps/