upgrade to 1.2.1

4 files changed, 52 insertions, 45 deletions

diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index af0674c7da04..678423597502 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	ivtools
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.2.1
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,9 +28,6 @@ MAN1=	idraw.1 iclass.1 drawtool.1 comterp.1 comdraw.1 flipbook.1 graphdraw.1
 .if ${ARCH} != "i386"
 BROKEN=		"fails to configure on ${ARCH}"
 .endif
-.if ${ARCH} == i386 && ${OSVERSION} > 500000
-BROKEN=		"fails to configure on ${ARCH} with FreeBSD version ${OSVERSION}"
-.endif
 
 .if ${XFREE86_VERSION} == 3
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
diff --git a/graphics/ivtools/distinfo b/graphics/ivtools/distinfo
index 30e5915f073f..ff4facde0cbb 100644
--- a/graphics/ivtools/distinfo
+++ b/graphics/ivtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (ivtools-1.0.6.tgz) = 83ada832988d88b6fdabaf577eec854c
-SIZE (ivtools-1.0.6.tgz) = 2041713
+MD5 (ivtools-1.2.1.tgz) = 42235814450be55f489843f203383c0c
+SIZE (ivtools-1.2.1.tgz) = 2135750
diff --git a/graphics/ivtools/files/patch-config::rules.def b/graphics/ivtools/files/patch-config::rules.def
index 987cde99fb39..952ef680d79c 100644
--- a/graphics/ivtools/files/patch-config::rules.def
+++ b/graphics/ivtools/files/patch-config::rules.def
@@ -1,15 +1,15 @@
---- config/rules.def.orig	Tue Feb  5 09:12:01 2002
-+++ config/rules.def	Wed Mar 27 12:18:06 2002
-@@ -1056,35 +1056,17 @@
+--- config/rules.def.orig	Thu Jul 15 17:05:32 2004
++++ config/rules.def	Thu Jul 15 17:10:44 2004
+@@ -1055,71 +1055,15 @@
+  */
  
  #ifndef InstallIncludes
- #if InstallRelative
+-#if InstallRelative
 -#define InstallIncludes(dir)						@@\
 -install::								@@\
 -	-@if [ -h $(TOP)/include ]; then exit 0; else \                 @@\
 -        (cd $(TOP) && $(LN) src/include include); fi
-+#define InstallIncludes(dir) /**/
- #else
+-#else
 -#define InstallIncludes(dir)						@@\
 -install::								@@\
 -	MakeDir($(INCDIR)/dir)						@@\
@@ -17,18 +17,17 @@
 -									@@\
 -uninstall::								@@\
 -	(cd $(INCDIR)/dir;$(RM) *.h)
+-#endif
 +#define InstallIncludes(dir) /**/
  #endif
- #endif
  
  #ifndef InstallInclude
- #if InstallRelative
+-#if InstallRelative
 -#define InstallInclude(dir, file)					@@\
 -install::								@@\
 -	-@if [ -h $(TOP)/include ]; then exit 0; else \                 @@\
 -        (cd $(TOP) && $(LN) src/include include); fi
-+#define InstallInclude(dir, file) /**/
- #else
+-#else
 -#define InstallInclude(dir, file)					@@\
 -install::								@@\
 -	MakeDir($(INCDIR)/dir)						@@\
@@ -36,14 +35,24 @@
 -									@@\
 -uninstall::								@@\
 -	$(RM) $(INCDIR)/dir/file
+-#endif
 +#define InstallInclude(dir, file) /**/
  #endif
- #endif
  
-@@ -1093,21 +1075,9 @@
+ #ifndef InstallSymLink
+-#if InstallRelative
  #define InstallSymLink(dir, file) /**/
- #else
- #if !defined(SVR4)
+-#else
+-#if !defined(SVR4)
+-#if defined(DARWIN)
+-#define InstallSymLink(dir, file)					@@\
+-install::								@@\
+-	MakeDir(dir)							@@\
+-	cp -f file dir							@@\
+-									@@\
+-uninstall::								@@\
+-	$(RM) dir/file	
+-#else
 -#define InstallSymLink(dir, file)					@@\
 -install::								@@\
 -	MakeDir(dir)							@@\
@@ -51,8 +60,8 @@
 -									@@\
 -uninstall::								@@\
 -	$(RM) dir/file	
-+#define InstallSymLink(dir, file) /**/
- #else
+-#endif
+-#else
 -#define InstallSymLink(dir, file)					@@\
 -install::								@@\
 -	MakeDir(dir)							@@\
@@ -60,7 +69,8 @@
 -									@@\
 -uninstall::								@@\
 -	$(RM) dir/file	
-+#define InstallSymLink(dir, file) /**/
- #endif
- #endif	
+-#endif
+-#endif	
  #endif
+ 
+ /* 
diff --git a/graphics/ivtools/pkg-plist b/graphics/ivtools/pkg-plist
index 12f5ede8c282..7b636acea6d3 100644
--- a/graphics/ivtools/pkg-plist
+++ b/graphics/ivtools/pkg-plist
@@ -6,8 +6,8 @@ bin/flipbook
 bin/graphdraw
 bin/iclass
 bin/idraw
-bin/ivdl
 bin/ivgetjpg
+bin/ivtext
 bin/ivtiftopnm
 bin/ivtmpnam
 bin/pnmtopgm
@@ -15,39 +15,39 @@ bin/stdcmapppm
 lib/ivtools/InterViews
 lib/ivtools/comterp.err
 lib/libAttrGlyph.so
-lib/libAttrGlyph.so.1.0.6
+lib/libAttrGlyph.so.1.2.1
 lib/libAttribute.so
-lib/libAttribute.so.1.0.6
+lib/libAttribute.so.1.2.1
 lib/libComGlyph.so
-lib/libComGlyph.so.1.0.6
+lib/libComGlyph.so.1.2.1
 lib/libComTerp.so
-lib/libComTerp.so.1.0.6
+lib/libComTerp.so.1.2.1
 lib/libComUnidraw.so
-lib/libComUnidraw.so.1.0.6
+lib/libComUnidraw.so.1.2.1
 lib/libComUtil.so
-lib/libComUtil.so.1.0.6
+lib/libComUtil.so.1.2.1
 lib/libDrawServ.so
-lib/libDrawServ.so.1.0.6
+lib/libDrawServ.so.1.2.1
 lib/libFrameUnidraw.so
-lib/libFrameUnidraw.so.1.0.6
+lib/libFrameUnidraw.so.1.2.1
 lib/libGraphUnidraw.so
-lib/libGraphUnidraw.so.1.0.6
+lib/libGraphUnidraw.so.1.2.1
 lib/libIV-common.so
-lib/libIV-common.so.1.0.6
+lib/libIV-common.so.1.2.1
 lib/libIV.so
-lib/libIV.so.1.0.6
+lib/libIV.so.1.2.1
 lib/libIVGlyph.so
-lib/libIVGlyph.so.1.0.6
+lib/libIVGlyph.so.1.2.1
 lib/libOverlayUnidraw.so
-lib/libOverlayUnidraw.so.1.0.6
+lib/libOverlayUnidraw.so.1.2.1
 lib/libTime.so
-lib/libTime.so.1.0.6
+lib/libTime.so.1.2.1
 lib/libTopoFace.so
-lib/libTopoFace.so.1.0.6
+lib/libTopoFace.so.1.2.1
 lib/libUniIdraw.so
-lib/libUniIdraw.so.1.0.6
+lib/libUniIdraw.so.1.2.1
 lib/libUnidraw-common.so
-lib/libUnidraw-common.so.1.0.6
+lib/libUnidraw-common.so.1.2.1
 lib/libUnidraw.so
-lib/libUnidraw.so.1.0.6
+lib/libUnidraw.so.1.2.1
 @dirrm lib/ivtools