Update to 2.0.0

6 files changed, 36 insertions, 189 deletions

diff --git a/devel/rhtvision/Makefile b/devel/rhtvision/Makefile
index e6efa2434a40..91b8032adc0d 100644
--- a/devel/rhtvision/Makefile
+++ b/devel/rhtvision/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rhtvision
-PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tvision
@@ -23,15 +22,12 @@ INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
-PATCHPERL_FILES=config.pl confignt.pl conflib.pl linux/compress \
-		linuxso/makemak.in linuxso/makemak.pl
-
 post-patch:
-.for f in ${PATCHPERL_FILES}
-	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL5},g' ${WRKSRC}/${f}
+.for f in config.pl confignt.pl conflib.pl linux/compress \
+	linuxso/makemak.in linuxso/makemak.pl
+	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL5},g' \
+		-e 's/\(soname.*\)intver/\1extver/g' \
+		${WRKSRC}/${f}
 .endfor
 
-post-install:
-	@cd ${PREFIX}/lib && ${LN} -sf librhtv.so.1.1.4 librhtv.so.1
-
 .include <bsd.port.mk>
diff --git a/devel/rhtvision/distinfo b/devel/rhtvision/distinfo
index 651c597e8511..04da3438ec00 100644
--- a/devel/rhtvision/distinfo
+++ b/devel/rhtvision/distinfo
@@ -1 +1 @@
-MD5 (rhtvision-1.1.4.src.tar.gz) = 26a3040fc6adf966718bbef0be593f56
+MD5 (rhtvision-2.0.0.src.tar.gz) = ece281057c57e0782ef0bd8d79767931
diff --git a/devel/rhtvision/files/patch-classes::fpbase.cc b/devel/rhtvision/files/patch-classes::fpbase.cc
deleted file mode 100644
index 39613e867385..000000000000
--- a/devel/rhtvision/files/patch-classes::fpbase.cc
+++ /dev/null
@@ -1,72 +0,0 @@
---- classes/fpbase.cc.orig	Wed Oct 10 02:05:52 2001
-+++ classes/fpbase.cc	Fri Jun  7 04:35:14 2002
-@@ -22,7 +22,7 @@
- 
- fpbase::fpbase()
- {
-- buf=new filebuf();
-+ buf=new CLY_filebuf();
-  pstream::init(buf);
- }
- 
-@@ -34,7 +34,7 @@
- 
- fpbase::fpbase( const char *name, CLY_OpenModeT omode, int prot )
- {
-- buf=new filebuf();
-+ buf=new CLY_filebuf();
-  open(name,omode,prot);
-  pstream::init(buf);
- }
-@@ -93,4 +93,51 @@
- {
-  return buf;
- }
-+
-+#ifdef CLY_DefineSpecialFileBuf
-+// gcc 3.1 specific
-+CLY_filebuf *CLY_filebuf::open(FILE *f, ios_base::openmode mode)
-+{
-+ CLY_filebuf *ret=NULL;
-+ if (!this->is_open())
-+   {
-+    _M_file.sys_open(f,mode);
-+    if (this->is_open())
-+      {
-+       _M_allocate_internal_buffer();
-+       _M_mode=mode;
-+       
-+       // For time being, set both (in/out) sets  of pointers.
-+       _M_set_indeterminate();
-+       if ((mode & ios_base::ate) &&
-+           this->seekoff(0,ios_base::end,mode)<0)
-+          this->close();
-+       ret=this;
-+      }
-+   }
-+ return ret;
-+}
-+
-+CLY_filebuf *CLY_filebuf::open(int h, ios_base::openmode mode)
-+{
-+ CLY_filebuf *ret=NULL;
-+ if (!this->is_open())
-+   {
-+    _M_file.sys_open(h,mode,false);
-+    if (this->is_open())
-+      {
-+       _M_allocate_internal_buffer();
-+       _M_mode=mode;
-+       
-+       // For time being, set both (in/out) sets  of pointers.
-+       _M_set_indeterminate();
-+       if ((mode & ios_base::ate) &&
-+           this->seekoff(0,ios_base::end,mode)<0)
-+          this->close();
-+       ret=this;
-+      }
-+   }
-+ return ret;
-+}
-+#endif // CLY_DefineSpecialFileBuf
- 
diff --git a/devel/rhtvision/files/patch-include::compatlayer.h b/devel/rhtvision/files/patch-include::compatlayer.h
deleted file mode 100644
index a4ec87e4f16c..000000000000
--- a/devel/rhtvision/files/patch-include::compatlayer.h
+++ /dev/null
@@ -1,57 +0,0 @@
---- include/compatlayer.h.orig	Wed Feb  6 22:35:38 2002
-+++ include/compatlayer.h	Fri Jun  7 04:35:14 2002
-@@ -117,6 +117,7 @@
- #undef DIRSEPARATOR
- #undef DIRSEPARATOR_
- #undef CLY_ISOCpp98
-+#undef CLY_filebuf
- #undef CLY_OpenModeT
- #undef CLY_StreamPosT
- #undef CLY_StreamOffT
-@@ -225,13 +226,21 @@
-     library. GCC implemented it in version 3.0. BC++ implemented some
-     stuff in versions like BC++ 5.5. So that's a real mess. */
-  #if __GNUC__>=3
-+  // gcc 3.1 needs a special filebuf
-+  #if __GNUC_MINOR__<1
-+   #define CLY_filebuf       std::filebuf
-+   #define CLY_NewFBFromFD(f) new CLY_filebuf(fdopen(f,"rb+"),ios::in|ios::out|ios::binary)
-+  #else
-+   #undef  CLY_DefineSpecialFileBuf
-+   #define CLY_DefineSpecialFileBuf 1
-+   #define CLY_NewFBFromFD(f) new CLY_filebuf(f,ios::in|ios::out|ios::binary)
-+  #endif
-   #define CLY_ISOCpp98 1
-   #define CLY_OpenModeT      std::ios::openmode
-   #define CLY_StreamPosT     std::streampos
-   #define CLY_StreamOffT     std::streamoff
-   #define CLY_IOSSeekDir     std::ios::seekdir
-   #define CLY_FBOpenProtDef  0
--  #define CLY_NewFBFromFD(f) new filebuf(fdopen(f,"rb+"),ios::in|ios::out|ios::binary)
-   #define CLY_PubSetBuf(a,b) pubsetbuf(a,b)
-   #define CLY_FBOpen(a,b,c)  open(a,b)
-   #define CLY_IOSBin         std::ios::binary
-@@ -252,6 +261,7 @@
-   #undef  IOSTREAM_HEADER
-   #define IOSTREAM_HEADER <iostream>
-  #else
-+  #define CLY_filebuf        filebuf
-   #define CLY_OpenModeT      int
-   #define CLY_StreamPosT     streampos
-   #define CLY_StreamOffT     streamoff
-@@ -830,6 +840,7 @@
-   #define Uses_CLY_IfStreamGetLine 1
-  #endif
- 
-+ #define CLY_filebuf        filebuf
-  #define CLY_OpenModeT      int
-  #define CLY_StreamPosT     streampos
-  #define CLY_StreamOffT     streamoff
-@@ -1040,6 +1051,7 @@
-  #define IfStreamGetLine(istream,buffer,size) \
-          istream.getline(buffer,size)
- 
-+ #define CLY_filebuf        filebuf
-  #define CLY_OpenModeT      int
-  #define CLY_StreamPosT     streampos
-  #define CLY_StreamOffT     streamoff
diff --git a/devel/rhtvision/files/patch-include::tv::fpbase.h b/devel/rhtvision/files/patch-include::tv::fpbase.h
deleted file mode 100644
index de3ca32db6ed..000000000000
--- a/devel/rhtvision/files/patch-include::tv::fpbase.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- include/tv/fpbase.h.orig	Wed Oct 10 02:06:00 2001
-+++ include/tv/fpbase.h	Fri Jun  7 04:35:14 2002
-@@ -28,6 +33,23 @@
- #if defined( Uses_fpbase ) && !defined( __fpbase )
- #define __fpbase
- 
-+#ifdef CLY_DefineSpecialFileBuf
-+class CLY_filebuf: public std::filebuf
-+{
-+public:
-+ CLY_filebuf() : std::filebuf() {};
-+ CLY_filebuf(FILE *f, std::ios_base::openmode mode)
-+   { open(f,mode); };
-+ CLY_filebuf(int h, std::ios_base::openmode mode)
-+   { open(h,mode); };
-+
-+ CLY_filebuf *open(FILE *f, std::ios_base::openmode);
-+ CLY_filebuf *open(int h, std::ios_base::openmode);
-+ std::filebuf *open(const char *file, std::ios_base::openmode mode)
-+   { return std::filebuf::open(file,mode); };
-+};
-+#endif
-+
- class fpbase : virtual public pstream
- {
- 
-@@ -49,7 +71,7 @@
- 
- private:
- 
--    CLY_std(filebuf) *buf;
-+    CLY_filebuf *buf;
- 
- };
- 
diff --git a/devel/rhtvision/pkg-plist b/devel/rhtvision/pkg-plist
index eea4b55cafb5..cf960b1705d0 100644
--- a/devel/rhtvision/pkg-plist
+++ b/devel/rhtvision/pkg-plist
@@ -1,3 +1,14 @@
+include/rhtvision/cl/dir.h
+include/rhtvision/cl/dirent.h
+include/rhtvision/cl/fnmatch.h
+include/rhtvision/cl/getopt.h
+include/rhtvision/cl/glob.h
+include/rhtvision/cl/needs.h
+include/rhtvision/cl/regex.h
+include/rhtvision/cl/strstream.h
+include/rhtvision/cl/unistd.h
+include/rhtvision/cl/utime.h
+include/rhtvision/cl/utsname.h
 include/rhtvision/compatlayer.h
 include/rhtvision/tv.h
 include/rhtvision/tv/app.h
@@ -16,18 +27,21 @@ include/rhtvision/tv/clriteml.h
 include/rhtvision/tv/clrselct.h
 include/rhtvision/tv/cluster.h
 include/rhtvision/tv/cmdset.h
+include/rhtvision/tv/codepage.h
 include/rhtvision/tv/collectn.h
 include/rhtvision/tv/colorsel.h
+include/rhtvision/tv/configfile.h
 include/rhtvision/tv/configtv.h
 include/rhtvision/tv/desktop.h
 include/rhtvision/tv/dialog.h
 include/rhtvision/tv/dialogs.h
 include/rhtvision/tv/dircoll.h
 include/rhtvision/tv/direntr.h
-include/rhtvision/tv/event.h
 include/rhtvision/tv/dirlibo.h
 include/rhtvision/tv/drawbuf.h
+include/rhtvision/tv/drivers.h
 include/rhtvision/tv/editors.h
+include/rhtvision/tv/event.h
 include/rhtvision/tv/eventqu.h
 include/rhtvision/tv/filecoll.h
 include/rhtvision/tv/filedlg.h
@@ -36,11 +50,14 @@ include/rhtvision/tv/fileview.h
 include/rhtvision/tv/filinfpn.h
 include/rhtvision/tv/filinpln.h
 include/rhtvision/tv/findrepl.h
+include/rhtvision/tv/fontcoll.h
 include/rhtvision/tv/fpbase.h
 include/rhtvision/tv/fpstream.h
 include/rhtvision/tv/frame.h
 include/rhtvision/tv/gkey.h
 include/rhtvision/tv/group.h
+include/rhtvision/tv/help.h
+include/rhtvision/tv/helpbase.h
 include/rhtvision/tv/history.h
 include/rhtvision/tv/histvwer.h
 include/rhtvision/tv/histwind.h
@@ -51,6 +68,10 @@ include/rhtvision/tv/intl.h
 include/rhtvision/tv/iopstrm.h
 include/rhtvision/tv/ipstream.h
 include/rhtvision/tv/label.h
+include/rhtvision/tv/linux/key.h
+include/rhtvision/tv/linux/log.h
+include/rhtvision/tv/linux/mouse.h
+include/rhtvision/tv/linux/screen.h
 include/rhtvision/tv/listbox.h
 include/rhtvision/tv/lstviewr.h
 include/rhtvision/tv/menu.h
@@ -68,6 +89,7 @@ include/rhtvision/tv/object.h
 include/rhtvision/tv/objects.h
 include/rhtvision/tv/ofpstrm.h
 include/rhtvision/tv/opstream.h
+include/rhtvision/tv/osclipboard.h
 include/rhtvision/tv/otstream.h
 include/rhtvision/tv/palette.h
 include/rhtvision/tv/parmtext.h
@@ -119,23 +141,16 @@ include/rhtvision/tv/video.h
 include/rhtvision/tv/view.h
 include/rhtvision/tv/views.h
 include/rhtvision/tv/window.h
+include/rhtvision/tv/x11/key.h
+include/rhtvision/tv/x11/mouse.h
+include/rhtvision/tv/x11/screen.h
 include/rhtvision/tv/yes_mss.h
-include/rhtvision/cl/dir.h
-include/rhtvision/cl/dirent.h
-include/rhtvision/cl/fnmatch.h
-include/rhtvision/cl/getopt.h
-include/rhtvision/cl/glob.h
-include/rhtvision/cl/needs.h
-include/rhtvision/cl/regex.h
-include/rhtvision/cl/strstream.h
-include/rhtvision/cl/unistd.h
-include/rhtvision/cl/utime.h
-include/rhtvision/cl/utsname.h
+@dirrm include/rhtvision/tv/x11
+@dirrm include/rhtvision/tv/linux
 @dirrm include/rhtvision/tv
 @dirrm include/rhtvision/cl
 @dirrm include/rhtvision
 lib/librhtv.a
 lib/librhtv.so
-lib/librhtv.so.1
-lib/librhtv.so.1.1.4
+lib/librhtv.so.2
 lib/libtvfintl.a