- Update to 1.2.5.

5 files changed, 53 insertions, 74 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 083db260df50..e76b38a6cd52 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ivtools
-PORTVERSION=	1.2.4
-PORTREVISION=	4
+PORTVERSION=	1.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -29,16 +28,4 @@ USE_XORG=	x11 xaw ice xext
 MANCOMPRESSED=	no
 MAN1=	idraw.1 iclass.1 drawtool.1 comterp.1 comdraw.1 flipbook.1 graphdraw.1
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500034
-PLIST_SUB+=	IVDL="@comment "
-.else
-PLIST_SUB+=	IVDL=""
-.endif
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 3add6331d3aa..1ef39dd7e430 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,3 +1,3 @@
-MD5 (ivtools-1.2.4.tgz) = cb5abfc79953e85b6a2c6a97519f844c
-SHA256 (ivtools-1.2.4.tgz) = e72fa4c291fee692e73b6cfca2aa6b7181c334a296af715a9c1318c745f38c04
-SIZE (ivtools-1.2.4.tgz) = 2145688
+MD5 (ivtools-1.2.5.tgz) = 976ca475cec8a4e4601ec2bc8fd713d3
+SHA256 (ivtools-1.2.5.tgz) = 12af28d51e0558f558bd5f8ca56a85a1c55dae226c24f7a7b6a41d00d139cd07
+SIZE (ivtools-1.2.5.tgz) = 2157337
diff --git a/graphics/ivtools/files/patch-config::InterViews::Imakefile b/graphics/ivtools/files/patch-config::InterViews::Imakefile
deleted file mode 100644
index c995111b55ed..000000000000
--- a/graphics/ivtools/files/patch-config::InterViews::Imakefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/InterViews/Imakefile.orig	Mon Jul 16 10:11:11 2001
-+++ config/InterViews/Imakefile	Wed Mar 27 12:18:06 2002
-@@ -6,13 +6,4 @@
- 
- IvmkcmTargets($(PACKAGE))
- 
--#if !InstallRelative
--install::
--	MakeDir($(CONFIGDIR)/InterViews)
--	$(INSTALL) -c $(INSTINCFLAGS) *.cf $(CONFIGDIR)/InterViews
--
--uninstall::
--	(cd $(CONFIGDIR)/InterViews; $(RM) *.cf)
--#endif
--
- 
diff --git a/graphics/ivtools/files/patch-src::ComTerp::comterp.c b/graphics/ivtools/files/patch-src::ComTerp::comterp.c
deleted file mode 100644
index caca0e4ce091..000000000000
--- a/graphics/ivtools/files/patch-src::ComTerp::comterp.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- src/ComTerp/comterp.c.orig
-+++ src/ComTerp/comterp.c
-@@ -74,6 +74,7 @@
- #if __GNUC__>=3
- #include <fstream.h>
- #endif
-+#include <errno.h>
- 
- #define TITLE "ComTerp"
- #define STREAM_MECH
-@@ -896,7 +897,7 @@
-     fbuf.attach(fd);
-   } else
-     fbuf.attach(fileno(stdout));
--#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3
-+#elif (__GNUC__==3 && __GNUC_MINOR__<1) || __GNUC__>3 || defined(__FreeBSD__)
-   fileptr_filebuf fbuf(handler() && handler()->wrfptr() 
- 	       ? handler()->wrfptr() : stdout, 
- 	       ios_base::out);
diff --git a/graphics/ivtools/pkg-plist b/graphics/ivtools/pkg-plist
index b4adc4c01f19..9f1996bd3c8a 100644
--- a/graphics/ivtools/pkg-plist
+++ b/graphics/ivtools/pkg-plist
@@ -7,39 +7,69 @@ bin/iclass
 bin/ivtext
 bin/idraw
 lib/ivtools/InterViews
+lib/ivtools/config/InterViews/iv-DGUX.cf
+lib/ivtools/config/InterViews/iv-Mips.cf
+lib/ivtools/config/InterViews/iv-aix.cf
+lib/ivtools/config/InterViews/iv-alpha.cf
+lib/ivtools/config/InterViews/iv-apollo.cf
+lib/ivtools/config/InterViews/iv-att.cf
+lib/ivtools/config/InterViews/iv-bsd.cf
+lib/ivtools/config/InterViews/iv-convex.cf
+lib/ivtools/config/InterViews/iv-cray.cf
+lib/ivtools/config/InterViews/iv-cygwin.cf
+lib/ivtools/config/InterViews/iv-darwin.cf
+lib/ivtools/config/InterViews/iv-freebsd.cf
+lib/ivtools/config/InterViews/iv-generic.cf
+lib/ivtools/config/InterViews/iv-hp.cf
+lib/ivtools/config/InterViews/iv-ibm.cf
+lib/ivtools/config/InterViews/iv-linux.cf
+lib/ivtools/config/InterViews/iv-luna.cf
+lib/ivtools/config/InterViews/iv-m4330.cf
+lib/ivtools/config/InterViews/iv-macII.cf
+lib/ivtools/config/InterViews/iv-moto.cf
+lib/ivtools/config/InterViews/iv-netbsd.cf
+lib/ivtools/config/InterViews/iv-pegasus.cf
+lib/ivtools/config/InterViews/iv-sgi.cf
+lib/ivtools/config/InterViews/iv-sony.cf
+lib/ivtools/config/InterViews/iv-stellar.cf
+lib/ivtools/config/InterViews/iv-stratus.cf
+lib/ivtools/config/InterViews/iv-sun.cf
+lib/ivtools/config/InterViews/iv-ultrix.cf
+lib/ivtools/config/InterViews/iv-x386.cf
+lib/ivtools/config/InterViews/xparams.cf
 lib/libIV.so
-lib/libIV.so.1.2.4
+lib/libIV.so.1.2.5
 lib/ivtools/comterp.err
 lib/libAttrGlyph.so
-lib/libAttrGlyph.so.1.2.4
-lib/libAttribute.so
-lib/libAttribute.so.1.2.4
+lib/libAttrGlyph.so.1.2.5
 lib/libComGlyph.so
-lib/libComGlyph.so.1.2.4
+lib/libComGlyph.so.1.2.5
 lib/libComUtil.so
-lib/libComUtil.so.1.2.4
+lib/libComUtil.so.1.2.5
 lib/libIV-common.so
-lib/libIV-common.so.1.2.4
+lib/libIV-common.so.1.2.5
 lib/libIVGlyph.so
-lib/libIVGlyph.so.1.2.4
+lib/libIVGlyph.so.1.2.5
 lib/libTime.so
-lib/libTime.so.1.2.4
+lib/libTime.so.1.2.5
 lib/libTopoFace.so
-lib/libTopoFace.so.1.2.4
+lib/libTopoFace.so.1.2.5
 lib/libUniIdraw.so
-lib/libUniIdraw.so.1.2.4
+lib/libUniIdraw.so.1.2.5
 lib/libUnidraw-common.so
-lib/libUnidraw-common.so.1.2.4
+lib/libUnidraw-common.so.1.2.5
 lib/libUnidraw.so
-lib/libUnidraw.so.1.2.4
+lib/libUnidraw.so.1.2.5
 lib/libOverlayUnidraw.so
-lib/libOverlayUnidraw.so.1.2.4
+lib/libOverlayUnidraw.so.1.2.5
 lib/libDrawServ.so
-lib/libDrawServ.so.1.2.4
+lib/libDrawServ.so.1.2.5
 lib/libComUnidraw.so
-lib/libComUnidraw.so.1.2.4
+lib/libComUnidraw.so.1.2.5
 lib/libFrameUnidraw.so
-lib/libFrameUnidraw.so.1.2.4
+lib/libFrameUnidraw.so.1.2.5
 lib/libGraphUnidraw.so
-lib/libGraphUnidraw.so.1.2.4
+lib/libGraphUnidraw.so.1.2.5
+@dirrm lib/ivtools/config/InterViews
+@dirrm lib/ivtools/config
 @dirrm lib/ivtools