- Update to 1.2.4

PR:		ports/109319
Submitted by:	Marcelo Araujo <araujo@bsdmail.org> (maintainer)

4 files changed, 21 insertions, 79 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 24e911759221..b5847d948b35 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ivtools
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 8f0c7be32562..3add6331d3aa 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (ivtools-1.2.3.tgz) = aa35433e5e30f0215d6a563ff2edffbc
-SHA256 (ivtools-1.2.3.tgz) = 2e201fd499646012611f15f220b15a7306bd013c830a9d6230cf9d7e6fa29fb1
-SIZE (ivtools-1.2.3.tgz) = 2137349
+MD5 (ivtools-1.2.4.tgz) = cb5abfc79953e85b6a2c6a97519f844c
+SHA256 (ivtools-1.2.4.tgz) = e72fa4c291fee692e73b6cfca2aa6b7181c334a296af715a9c1318c745f38c04
+SIZE (ivtools-1.2.4.tgz) = 2145688
diff --git a/graphics/ivtools/files/patch-src_ComTerp_comterpserv.c b/graphics/ivtools/files/patch-src_ComTerp_comterpserv.c
deleted file mode 100644
index 197ac094542c..000000000000
--- a/graphics/ivtools/files/patch-src_ComTerp_comterpserv.c
+++ /dev/null
@@ -1,49 +0,0 @@
-
-$FreeBSD$
-
---- src/ComTerp/comterpserv.c.orig
-+++ src/ComTerp/comterpserv.c
-@@ -152,7 +152,7 @@
-     fbuf.attach(fd);
-     istream in (&fbuf);
-     in.gets(&instr);
--#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
-+#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3 || defined(__FreeBSD__)
-     char instr[BUFSIZ];
-     FILE* ifptr = fdopen(fd, "r");
-     fileptr_filebuf fbuf(ifptr, ios_base::in);
-@@ -160,6 +160,7 @@
-     in.get(instr, BUFSIZ, '\n');  // needs to be generalized with <vector.h>
- #else
-     char instr[BUFSIZ];
-+    fileptr_filebuf fbuf(ifptr, ios_base::in);
-     fileptr_filebuf fbuf(fd, ios_base::in, false, static_cast<size_t>(BUFSIZ));
-     istream in (&fbuf);
-     in.get(instr, BUFSIZ, '\n');  // needs to be generalized with <vector.h>
-@@ -202,7 +203,7 @@
- #if __GNUC__<3
-     filebuf fbuf;
-     fbuf.attach(fd);
--#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
-+#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3  || defined(__FreeBSD__)
-     FILE* ofptr = fdopen(fd, "w");
-     fileptr_filebuf fbuf(ofptr, ios_base::out);
- #else
-@@ -320,7 +321,7 @@
- 	        err_print( stderr, "comterp" );
- #if __GNUC__<3
- 	        filebuf obuf(handler() ? handler()->get_handle() : 1);
--#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3
-+#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3  || defined(__FreeBSD__)
-                 FILE* ofptr = fdopen(handler() ? handler()->get_handle() : 1, "w"); 
- 	        fileptr_filebuf obuf(ofptr, ios_base::out);
- #else
-@@ -345,7 +346,7 @@
- 	  err_print( stderr, "comterp" );
- #if __GNUC__<3
- 	  filebuf obuf(handler() ? handler()->get_handle() : 1);
--#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3
-+#elif __GNUC__==3 && __GNUC_MINOR__<1 || __GNUC__>3  || defined(__FreeBSD__)
-           FILE* ofptr = fdopen(handler() ? handler()->get_handle() : 1, "w"); 
- 	  fileptr_filebuf obuf(ofptr, ios_base::out);
- #else
diff --git a/graphics/ivtools/pkg-plist b/graphics/ivtools/pkg-plist
index fcc462b98be0..90ac5ef07edb 100644
--- a/graphics/ivtools/pkg-plist
+++ b/graphics/ivtools/pkg-plist
@@ -1,4 +1,3 @@
-bin/comterp
 bin/ivgetjpg
 bin/ivtiftopnm
 bin/ivtmpnam
@@ -7,49 +6,42 @@ bin/stdcmapppm
 bin/iclass
 bin/ivtext
 bin/idraw
-bin/drawtool
-bin/comdraw
-bin/flipbook
-bin/graphdraw
-bin/drawserv
 lib/ivtools/InterViews
-lib/libIV.so.1.2.3
 lib/libIV.so
+lib/libIV.so.1.2.4
 lib/ivtools/comterp.err
 lib/libAttrGlyph.so
-lib/libAttrGlyph.so.1.2.3
+lib/libAttrGlyph.so.1.2.4
 lib/libAttribute.so
-lib/libAttribute.so.1.2.3
+lib/libAttribute.so.1.2.4
 lib/libComGlyph.so
-lib/libComGlyph.so.1.2.3
-lib/libComTerp.so
-lib/libComTerp.so.1.2.3
+lib/libComGlyph.so.1.2.4
 lib/libComUtil.so
-lib/libComUtil.so.1.2.3
+lib/libComUtil.so.1.2.4
 lib/libIV-common.so
-lib/libIV-common.so.1.2.3
+lib/libIV-common.so.1.2.4
 lib/libIVGlyph.so
-lib/libIVGlyph.so.1.2.3
+lib/libIVGlyph.so.1.2.4
 lib/libTime.so
-lib/libTime.so.1.2.3
+lib/libTime.so.1.2.4
 lib/libTopoFace.so
-lib/libTopoFace.so.1.2.3
+lib/libTopoFace.so.1.2.4
 lib/libUniIdraw.so
-lib/libUniIdraw.so.1.2.3
+lib/libUniIdraw.so.1.2.4
 lib/libUnidraw-common.so
-lib/libUnidraw-common.so.1.2.3
+lib/libUnidraw-common.so.1.2.4
 lib/libUnidraw.so
-lib/libUnidraw.so.1.2.3
-lib/libOverlayUnidraw.so.1.2.3
+lib/libUnidraw.so.1.2.4
 lib/libOverlayUnidraw.so
-lib/libDrawServ.so.1.2.3
+lib/libOverlayUnidraw.so.1.2.4
 lib/libDrawServ.so
-lib/libComUnidraw.so.1.2.3
+lib/libDrawServ.so.1.2.4
 lib/libComUnidraw.so
-lib/libFrameUnidraw.so.1.2.3
+lib/libComUnidraw.so.1.2.4
 lib/libFrameUnidraw.so
-lib/libGraphUnidraw.so.1.2.3
+lib/libFrameUnidraw.so.1.2.4
 lib/libGraphUnidraw.so
+lib/libGraphUnidraw.so.1.2.4
 share/nls/POSIX
 share/nls/en_US.US-ASCII
 @dirrm lib/ivtools