diff --git a/print/fig2dev/Makefile b/print/fig2dev/Makefile index 4146fa68fbd5..d46a0e09324a 100644 --- a/print/fig2dev/Makefile +++ b/print/fig2dev/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2020/03/20 11:58:13 nia Exp $ +# $NetBSD: Makefile,v 1.5 2020/05/12 10:31:35 nia Exp $ -DISTNAME= fig2dev-3.2.6a +DISTNAME= fig2dev-3.2.7b CATEGORIES= graphics print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcj/} EXTRACT_SUFX= .tar.xz diff --git a/print/fig2dev/PLIST b/print/fig2dev/PLIST index 790523c580cb..9c6bc64acc5d 100644 --- a/print/fig2dev/PLIST +++ b/print/fig2dev/PLIST @@ -1,59 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2017/10/03 14:59:08 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/05/12 10:31:35 nia Exp $ bin/fig2dev bin/fig2ps2tex bin/pic2tpic man/man1/fig2dev.1 man/man1/fig2ps2tex.1 man/man1/pic2tpic.1 -share/fig2dev/bitmaps/bricks.bmp -share/fig2dev/bitmaps/circles.bmp -share/fig2dev/bitmaps/crosshatch.bmp -share/fig2dev/bitmaps/crosshatch30.bmp -share/fig2dev/bitmaps/crosshatch45.bmp -share/fig2dev/bitmaps/dash.bmp -share/fig2dev/bitmaps/dashDot.bmp -share/fig2dev/bitmaps/dashDotDot.bmp -share/fig2dev/bitmaps/dashDotDotDot.bmp -share/fig2dev/bitmaps/dot.bmp -share/fig2dev/bitmaps/fishscales.bmp -share/fig2dev/bitmaps/hexagons.bmp -share/fig2dev/bitmaps/horiz_saw.bmp -share/fig2dev/bitmaps/horizontal.bmp -share/fig2dev/bitmaps/left30.bmp -share/fig2dev/bitmaps/left45.bmp -share/fig2dev/bitmaps/leftshingle.bmp -share/fig2dev/bitmaps/octagons.bmp -share/fig2dev/bitmaps/p13.bmp -share/fig2dev/bitmaps/right30.bmp -share/fig2dev/bitmaps/right45.bmp -share/fig2dev/bitmaps/rightshingle.bmp -share/fig2dev/bitmaps/small_fishscales.bmp -share/fig2dev/bitmaps/sp0.bmp -share/fig2dev/bitmaps/sp1.bmp -share/fig2dev/bitmaps/sp10.bmp -share/fig2dev/bitmaps/sp11.bmp -share/fig2dev/bitmaps/sp12.bmp -share/fig2dev/bitmaps/sp13.bmp -share/fig2dev/bitmaps/sp14.bmp -share/fig2dev/bitmaps/sp15.bmp -share/fig2dev/bitmaps/sp16.bmp -share/fig2dev/bitmaps/sp17.bmp -share/fig2dev/bitmaps/sp18.bmp -share/fig2dev/bitmaps/sp19.bmp -share/fig2dev/bitmaps/sp2.bmp -share/fig2dev/bitmaps/sp20.bmp -share/fig2dev/bitmaps/sp3.bmp -share/fig2dev/bitmaps/sp4.bmp -share/fig2dev/bitmaps/sp5.bmp -share/fig2dev/bitmaps/sp6.bmp -share/fig2dev/bitmaps/sp7.bmp -share/fig2dev/bitmaps/sp8.bmp -share/fig2dev/bitmaps/sp9.bmp -share/fig2dev/bitmaps/vert_bricks.bmp -share/fig2dev/bitmaps/vert_leftshingle.bmp -share/fig2dev/bitmaps/vert_rightshingle.bmp -share/fig2dev/bitmaps/vert_saw.bmp -share/fig2dev/bitmaps/vertical.bmp share/fig2dev/i18n/cs_CZ.ps share/fig2dev/i18n/hr_HR.ps share/fig2dev/i18n/hu_HU.ps @@ -70,7 +21,8 @@ share/fig2dev/i18n/ko_KR.ps share/fig2dev/i18n/korean.ps share/fig2dev/i18n/pl_PL.ps share/fig2dev/i18n/ro_RO.ps +share/fig2dev/i18n/ru_RU.CP1251.ps share/fig2dev/i18n/ru_RU.KOI8-R.ps share/fig2dev/i18n/sk_SK.ps share/fig2dev/i18n/sl_SI.ps -share/fig2dev/rgb.txt +share/fig2dev/i18n/uk_UA.KOI8-U.ps diff --git a/print/fig2dev/distinfo b/print/fig2dev/distinfo index c615708cb591..d67ca72562e5 100644 --- a/print/fig2dev/distinfo +++ b/print/fig2dev/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.3 2020/03/12 17:40:44 wiz Exp $ +$NetBSD: distinfo,v 1.4 2020/05/12 10:31:35 nia Exp $ -SHA1 (fig2dev-3.2.6a.tar.xz) = e09145435f3306010eb006f9d7e118fccf77cd2b -RMD160 (fig2dev-3.2.6a.tar.xz) = 0498c32afdd4df51a54d513d1de8f9cc00997bf8 -SHA512 (fig2dev-3.2.6a.tar.xz) = 082c4d75c66187dc2bd7f3a50b6e117f03f495030fa89d6f70270e15b8f00647a94365e10797c5b1889b4ed1400d3fa6f4a3821e744c79b4483403a930e7d77f -Size (fig2dev-3.2.6a.tar.xz) = 507820 bytes -SHA1 (patch-fig2dev_dev_readjpg.c) = 705414eb61cdbd257b7a3bc8f500a0580b21acab -SHA1 (patch-fig2dev_fig2dev.c) = 5b52728ee9f9e6888b8e83d2e6ef346a74b35a81 -SHA1 (patch-fig2dev_tests_atlocal.in) = 3136991e18591227b4b3176d0fe88087b4281e78 +SHA1 (fig2dev-3.2.7b.tar.xz) = 8097c178b7fff1023112250938cc87837c0f564e +RMD160 (fig2dev-3.2.7b.tar.xz) = 133011bf9d998464b87fc952a739a58307cfb270 +SHA512 (fig2dev-3.2.7b.tar.xz) = 134023febf935e76bd5e45695e3718f6af823297743045cf5aaf91136047d8f217785cd150667aa893f8424430bf60e36cad907419118f27fee75aafb02cbe41 +Size (fig2dev-3.2.7b.tar.xz) = 512224 bytes +SHA1 (patch-fig2dev_tests_atlocal.in) = a4440e467472ba02b8a67cab0287f5859a5eb631 diff --git a/print/fig2dev/patches/patch-fig2dev_dev_readjpg.c b/print/fig2dev/patches/patch-fig2dev_dev_readjpg.c deleted file mode 100644 index 9ea06b06b83a..000000000000 --- a/print/fig2dev/patches/patch-fig2dev_dev_readjpg.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-fig2dev_dev_readjpg.c,v 1.2 2017/10/04 12:01:43 wiz Exp $ - -NetBSD defines _setmode, but is not Windows. -https://sourceforge.net/p/mcj/tickets/17/ - ---- fig2dev/dev/readjpg.c.orig 2017-01-07 22:04:22.000000000 +0000 -+++ fig2dev/dev/readjpg.c -@@ -39,6 +39,9 @@ - #include "object.h" /* does #include */ - #include "psimage.h" - #include "creationdate.h" -+#ifdef __NetBSD__ -+#undef HAVE__SETMODE -+#endif - #ifdef HAVE__SETMODE /* see fig2dev.c */ - #include - #include diff --git a/print/fig2dev/patches/patch-fig2dev_fig2dev.c b/print/fig2dev/patches/patch-fig2dev_fig2dev.c deleted file mode 100644 index 23c29942967b..000000000000 --- a/print/fig2dev/patches/patch-fig2dev_fig2dev.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-fig2dev_fig2dev.c,v 1.2 2017/10/04 12:01:43 wiz Exp $ - -NetBSD defines _setmode, but is not Windows. -https://sourceforge.net/p/mcj/tickets/17/ - ---- fig2dev/fig2dev.c.orig 2017-01-04 11:04:09.000000000 +0000 -+++ fig2dev/fig2dev.c -@@ -37,6 +37,9 @@ - #include - #include "bool.h" - #include -+#ifdef __NetBSD__ -+#undef HAVE__SETMODE -+#endif - /* setmode() exists on DOS/Windows. It sets file mode to text or binary. - * setmode() is declared in , O_BINARY is declared in . */ - #ifdef HAVE__SETMODE diff --git a/print/fig2dev/patches/patch-fig2dev_tests_atlocal.in b/print/fig2dev/patches/patch-fig2dev_tests_atlocal.in index 3df64f3da6ca..c0cb2ecaf67c 100644 --- a/print/fig2dev/patches/patch-fig2dev_tests_atlocal.in +++ b/print/fig2dev/patches/patch-fig2dev_tests_atlocal.in @@ -1,11 +1,12 @@ -$NetBSD: patch-fig2dev_tests_atlocal.in,v 1.1 2020/03/12 17:40:44 wiz Exp $ +$NetBSD: patch-fig2dev_tests_atlocal.in,v 1.2 2020/05/12 10:31:35 nia Exp $ Fix unportable test(1) operator. ---- fig2dev/tests/atlocal.in.orig 2016-02-14 20:54:26.000000000 +0000 +--- fig2dev/tests/atlocal.in.orig 2018-02-17 22:11:57.000000000 +0000 +++ fig2dev/tests/atlocal.in -@@ -1,6 +1,6 @@ - # @configure_input@ +@@ -18,7 +18,7 @@ + # atlocal.in + # Author: Thomas Loimer, 2017, 2018 -if test x"@abs_top_builddir@" == x"@abs_top_srcdir@"; then +if test x"@abs_top_builddir@" = x"@abs_top_srcdir@"; then