Upgrade to 2003.01.21. Appears to only add some more file export/print

options.  Additional patches were necessary since the fltk port seems
to have been upgraded and thus also broken this port (which would
been already broken due to the checksum failure).

7 files changed, 49 insertions, 40 deletions

diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index e38200d82719..29cfc0d9ded5 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	seaview
-PORTVERSION=	2002.10.18
+PORTVERSION=	2003.01.21
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
 DISTNAME=	${PORTNAME}
@@ -24,6 +24,9 @@ EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 MAKEFILE=	makefile
 
+CFLAGS+=	-D HAVE_DIRENT_H \
+		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/seaview/seaview.help
+
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
 	@ ${INSTALL_SCRIPT} ${WRKSRC}/seaview_align.sh ${PREFIX}/bin
diff --git a/biology/seaview/distinfo b/biology/seaview/distinfo
index 866bdaf801e9..bfdc18bf6618 100644
--- a/biology/seaview/distinfo
+++ b/biology/seaview/distinfo
@@ -1 +1 @@
-MD5 (seaview.tar) = 1f9b5157966b98f2724428d3fb1f6b17
+MD5 (seaview.tar) = 78609cf9b43c26898a84a7308cc75e85
diff --git a/biology/seaview/files/patch-aa b/biology/seaview/files/patch-aa
index fdca7da38e5f..b75dfb81157e 100644
--- a/biology/seaview/files/patch-aa
+++ b/biology/seaview/files/patch-aa
@@ -1,14 +1,15 @@
---- makefile.orig	Wed Sep 25 23:58:15 2002
-+++ makefile	Mon Nov 18 11:26:42 2002
-@@ -1,13 +1,15 @@
+
+$FreeBSD$
+
+--- makefile.orig	Thu Nov 21 10:48:08 2002
++++ makefile	Thu May 22 01:12:43 2003
+@@ -1,16 +1,16 @@
 -FLTK = ../fltk-1.1.0
-+OPT = -O2
+-
+ OBJECTS = seaview.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o old_file_chooser.o
  
--OBJECTS = seaview.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o old_file_chooser.o
-+OBJECTS = seaview.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o
- 
--CFLAGS  = -c $(OPT) -I$(FLTK)
-+CFLAGS  = -c $(OPT) -I$(PREFIX)/include
+-CFLAGS  = -c $(OPT) -I$(FLTK) $(DEBUG)
++CFLAGS+= -I $(PREFIX)/include -L $(PREFIX)/lib
  
 -CXX = CC
 +CXX = g++
@@ -16,8 +17,12 @@
 +all: seaview
  
  seaview : $(OBJECTS) 
--	$(CXX) -o $@ $(OBJECTS) -L$(FLTK)/lib -lfltk -lX11 -lm
-+	$(CXX) -o $@ $(OBJECTS) -L$(PREFIX)/lib -lfltk -lX11 -lMesaGL -lXext -lm
+-	$(CXX) $(DEBUG) -o $@ $(OBJECTS) -L$(FLTK)/lib -lfltk -lX11 -lm
++	$(CXX) $(CFLAGS) -o $@ $(OBJECTS) -lfltk -lX11 -lMesaGL -lXext -lm
  
  
  .SUFFIXES:	.cxx .h .o
+ 
+ .cxx.o :
+-	$(CXX) $(CFLAGS) $<
++	$(CXX) -c $(CFLAGS) $<
diff --git a/biology/seaview/files/patch-chooser_plus.cxx b/biology/seaview/files/patch-chooser_plus.cxx
deleted file mode 100644
index fe62a4edf2d6..000000000000
--- a/biology/seaview/files/patch-chooser_plus.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- chooser_plus.cxx.orig	Mon Nov 18 11:14:10 2002
-+++ chooser_plus.cxx	Mon Nov 18 11:17:52 2002
-@@ -442,7 +442,7 @@
- 					   strcmp(pat,f->browser.pattern))) {
-     // if pattern is different, remove name but leave old directory:
-     const char* p = f->input.value();
--    const char* q = fl_filename_name(p);
-+    const char* q = filename_name(p);
-     f->input.value(p, q-p);
-   }
-   f->browser.pattern = pat;
-@@ -500,7 +500,7 @@
- 					   strcmp(pat,f->browser.pattern))) {
-     // if pattern is different, remove name but leave old directory:
-     const char* p = f->input.value();
--    const char* q = fl_filename_name(p);
-+    const char* q = filename_name(p);
-     f->input.value(p, q-p);
-   }
-   f->browser.pattern = pat;
diff --git a/biology/seaview/files/patch-old_file_chooser.cxx b/biology/seaview/files/patch-old_file_chooser.cxx
new file mode 100644
index 000000000000..1ea674915abd
--- /dev/null
+++ b/biology/seaview/files/patch-old_file_chooser.cxx
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- old_file_chooser.cxx.orig	Thu May 22 01:14:52 2003
++++ old_file_chooser.cxx	Thu May 22 01:14:57 2003
+@@ -23,7 +23,7 @@
+ // Please report all bugs and problems to "fltk-bugs@fltk.org".
+ //
+ 
+-#include <config.h>
++//#include <config.h>
+ 
+ #include <FL/Fl.H>
+ #include <FL/Fl_Window.H>
diff --git a/biology/seaview/files/patch-seaview.cxx b/biology/seaview/files/patch-seaview.cxx
new file mode 100644
index 000000000000..29588b08349c
--- /dev/null
+++ b/biology/seaview/files/patch-seaview.cxx
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- seaview.cxx.orig	Thu May 22 01:45:14 2003
++++ seaview.cxx	Thu May 22 01:37:25 2003
+@@ -164,6 +164,8 @@
+ 	"seaview.hlp", 
+ #elif defined(__APPLE__)
+ 	NULL,
++#elif defined(DEFAULT_HELPFILE)
++	__XSTRING(DEFAULT_HELPFILE),
+ #else
+ 	"seaview.help", 
+ #endif
diff --git a/biology/seaview/pkg-descr b/biology/seaview/pkg-descr
index 9d5bb24b3531..8aa925a73d6a 100644
--- a/biology/seaview/pkg-descr
+++ b/biology/seaview/pkg-descr
@@ -6,13 +6,6 @@ out their relative postions in phylogenic tree.
 Once SeaView is installed, you can open the on-line help window through
 the 'Help' button to learn how to use SeaView.
 
-*****************************************************************************
-*   The help file (seaview.help) is located in /usr/X11R6/lib/X11/seaview/ .
-*   Add an entry in your .Xresources or .Xdefaults file with:
-*
-*   seaview*helpfile:	/usr/X11R6/lib/X11/seaview/seaview.help
-*****************************************************************************
-
 Example mase files can be found at:
 
 	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/