diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-11-17 13:36:41 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-11-17 13:36:41 +0000 |
commit | f1b2dca9e3eaf936dd8bcb38ba4468018f26c7bb (patch) | |
tree | e26d81092af231aab1ad3547d1658a7f0e9296d3 /biology/seaview | |
parent | b43ffebb1a6dbe31dfda4629a62909a287dedfd5 (diff) | |
download | ports-f1b2dca9e3eaf936dd8bcb38ba4468018f26c7bb.tar.gz ports-f1b2dca9e3eaf936dd8bcb38ba4468018f26c7bb.zip |
Notes
Diffstat (limited to 'biology/seaview')
-rw-r--r-- | biology/seaview/Makefile | 21 | ||||
-rw-r--r-- | biology/seaview/distinfo | 2 | ||||
-rw-r--r-- | biology/seaview/files/patch-aa | 28 | ||||
-rw-r--r-- | biology/seaview/files/patch-align.cxx | 9 | ||||
-rw-r--r-- | biology/seaview/files/patch-old_file_chooser.cxx | 14 | ||||
-rw-r--r-- | biology/seaview/files/patch-seaview.cxx | 9 |
6 files changed, 17 insertions, 66 deletions
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile index aee1694808d6..6c6d06b0db55 100644 --- a/biology/seaview/Makefile +++ b/biology/seaview/Makefile @@ -6,7 +6,7 @@ # PORTNAME= seaview -PORTVERSION= 2003.01.21 +PORTVERSION= 2003.11.17 CATEGORIES= biology MASTER_SITES= ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/ DISTNAME= ${PORTNAME} @@ -17,25 +17,20 @@ COMMENT= Multiple DNA/protein sequence alignment editor LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk -BROKEN= Bad checksum - -USE_X_PREFIX= YES -NO_WRKSUBDIR= YES +USE_X_PREFIX= yes +NO_WRKSUBDIR= yes EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty -MAKEFILE= makefile +ALL_TARGET= ${PORTNAME} 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 - @ (${MKDIR} ${PREFIX}/lib/X11/seaview) - @ ${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/seaview - -post-install: - @ ${CAT} ${DESCR} + @${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/seaview_align.sh ${PREFIX}/bin + @${MKDIR} ${PREFIX}/lib/X11/seaview + @${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/seaview .include <bsd.port.mk> diff --git a/biology/seaview/distinfo b/biology/seaview/distinfo index bfdc18bf6618..1a1f4505f55f 100644 --- a/biology/seaview/distinfo +++ b/biology/seaview/distinfo @@ -1 +1 @@ -MD5 (seaview.tar) = 78609cf9b43c26898a84a7308cc75e85 +MD5 (seaview.tar) = b89e38485e51a6ad42550e5140b68df0 diff --git a/biology/seaview/files/patch-aa b/biology/seaview/files/patch-aa deleted file mode 100644 index b75dfb81157e..000000000000 --- a/biology/seaview/files/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ - -$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 -- - 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 - --CFLAGS = -c $(OPT) -I$(FLTK) $(DEBUG) -+CFLAGS+= -I $(PREFIX)/include -L $(PREFIX)/lib - --CXX = CC -+CXX = g++ -+ -+all: seaview - - seaview : $(OBJECTS) -- $(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-align.cxx b/biology/seaview/files/patch-align.cxx index 9947269dd135..0db64c232eda 100644 --- a/biology/seaview/files/patch-align.cxx +++ b/biology/seaview/files/patch-align.cxx @@ -1,12 +1,13 @@ ---- align.cxx.orig Tue Oct 8 19:43:40 2002 -+++ align.cxx Mon Nov 18 11:40:08 2002 -@@ -1,5 +1,6 @@ +--- align.cxx.orig Mon Nov 17 14:15:01 2003 ++++ align.cxx Mon Nov 17 14:15:26 2003 +@@ -1,6 +1,7 @@ #include "seaview.h" #include <stdlib.h> -+#include <unistd.h> #include <ctype.h> ++#include <unistd.h> #ifndef WIN32 #include <FL/x.H> + #endif @@ -155,7 +156,7 @@ #endif debut = view->active_region->list->debut; diff --git a/biology/seaview/files/patch-old_file_chooser.cxx b/biology/seaview/files/patch-old_file_chooser.cxx deleted file mode 100644 index 1ea674915abd..000000000000 --- a/biology/seaview/files/patch-old_file_chooser.cxx +++ /dev/null @@ -1,14 +0,0 @@ - -$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 index 29588b08349c..e437fa511b20 100644 --- a/biology/seaview/files/patch-seaview.cxx +++ b/biology/seaview/files/patch-seaview.cxx @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- seaview.cxx.orig Thu May 22 01:45:14 2003 -+++ seaview.cxx Thu May 22 01:37:25 2003 +--- seaview.cxx.orig Mon Nov 17 14:16:39 2003 ++++ seaview.cxx Mon Nov 17 14:17:13 2003 @@ -164,6 +164,8 @@ "seaview.hlp", #elif defined(__APPLE__) NULL, +#elif defined(DEFAULT_HELPFILE) -+ __XSTRING(DEFAULT_HELPFILE), ++ __XSTRING(DEFAULT_HELPFILE), #else "seaview.help", #endif |