From fernan@pi.iib.unsam.edu.ar  Fri Dec  9 14:01:04 2005
Return-Path: <fernan@pi.iib.unsam.edu.ar>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 66ECE16A41F;
	Fri,  9 Dec 2005 14:01:04 +0000 (GMT)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: from smtp.unsam.edu.ar (smtp.unsam.edu.ar [170.210.48.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5CBFA43D46;
	Fri,  9 Dec 2005 14:00:47 +0000 (GMT)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: from pi.iib.unsam.edu.ar (pi.iib.unsam.edu.ar [192.168.10.11])
	by smtp.unsam.edu.ar (8.12.6/8.12.6) with ESMTP id jB9Dxd1N046220;
	Fri, 9 Dec 2005 10:59:39 -0300 (ART)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: from pi.iib.unsam.edu.ar (localhost [127.0.0.1])
	by pi.iib.unsam.edu.ar (8.13.1/8.13.1) with ESMTP id jB9E07IY036804;
	Fri, 9 Dec 2005 11:00:07 -0300 (ART)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: (from fernan@localhost)
	by pi.iib.unsam.edu.ar (8.13.1/8.13.1/Submit) id jB9E07U1036803;
	Fri, 9 Dec 2005 11:00:07 -0300 (ART)
	(envelope-from fernan)
Message-Id: <200512091400.jB9E07U1036803@pi.iib.unsam.edu.ar>
Date: Fri, 9 Dec 2005 11:00:07 -0300 (ART)
From: Fernan Aguero <fernan@iib.unsam.edu.ar>
Reply-To: Fernan Aguero <fernan@iib.unsam.edu.ar>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tdb@freebsd.org
Subject: update biology/seaview: fix help file, remove uneccessary patches
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90140
>Category:       ports
>Synopsis:       update biology/seaview: fix help file, remove uneccessary patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tdb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 09 14:10:02 GMT 2005
>Closed-Date:    Sat Dec 10 14:12:04 GMT 2005
>Last-Modified:  Sat Dec 10 14:12:04 GMT 2005
>Originator:     Fernan Aguero
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
IIB-UNSAM
>Environment:

FreeBSD pi.iib.unsam.edu.ar 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Wed May 26 12:56:43 ART 2004 fernan@pi.iib.unsam.edu.ar:/usr/obj/usr/src/sys/PI  i386

	
>Description:
	
	
	The author of seaview has incorporated two of our patches into
	the upstream sources. So we remove these from the port.

	Also, the CFLAGS defined by the port are now being added
	to seaview's own CFLAGS. As a result the help file is now
	found by seaview as it should be.
	
>How-To-Repeat:
	
	
>Fix:

	



--- seaview.diff begins here ---
diff -ruN /usr/ports/biology/seaview/Makefile seaview/Makefile
--- /usr/ports/biology/seaview/Makefile	Tue Dec  6 14:44:00 2005
+++ seaview/Makefile	Fri Dec  9 07:46:41 2005
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	seaview
-PORTVERSION=	2005.13.07
+PORTVERSION=	2005.12.07
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
 DISTNAME=	${PORTNAME}
@@ -27,12 +27,12 @@
 ALL_TARGET=	${PORTNAME}
 
 CFLAGS+=	-D HAVE_DIRENT_H \
-		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/seaview/seaview.help
+		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/${PORTNAME}/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
+	@${MKDIR} ${PREFIX}/lib/X11/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/${PORTNAME}
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/biology/seaview/distinfo seaview/distinfo
--- /usr/ports/biology/seaview/distinfo	Tue Dec  6 14:44:00 2005
+++ seaview/distinfo	Wed Dec  7 12:08:24 2005
@@ -1,3 +1,3 @@
-MD5 (seaview-2005.13.07/seaview.tar) = 0971b3485351f6a1f56a7b56ead2359c
-SHA256 (seaview-2005.13.07/seaview.tar) = 7f48c494e5bee5dacef28bab2a52eab8aff6b66ceff8fab47fe77a18de376fc5
-SIZE (seaview-2005.13.07/seaview.tar) = 595968
+MD5 (seaview-2005.12.07/seaview.tar) = 4d1d1406f5d9ae0a0edad7144742143b
+SHA256 (seaview-2005.12.07/seaview.tar) = ced1844ca3fc8181a9c811079dbc8e2ee67242ef49be113f761abad034ba8ba3
+SIZE (seaview-2005.12.07/seaview.tar) = 595968
diff -ruN /usr/ports/biology/seaview/files/patch-Makefile seaview/files/patch-Makefile
--- /usr/ports/biology/seaview/files/patch-Makefile	Tue Dec  6 12:13:17 2005
+++ seaview/files/patch-Makefile	Fri Dec  9 07:41:35 2005
@@ -1,5 +1,5 @@
 --- Makefile.orig	Wed Apr  6 05:54:30 2005
-+++ Makefile	Mon Dec  5 08:31:05 2005
++++ Makefile	Fri Dec  9 07:41:26 2005
 @@ -1,18 +1,15 @@
 -FLTK = ../fltk
 -PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
@@ -7,7 +7,7 @@
  CXX = g++
  
 -CFLAGS  = -Dunix  -U__APPLE__  -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include 
-+CFLAGS  = -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
++CFLAGS+= -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
  
  
  OBJECTS = seaview.o pdf.o custom.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
diff -ruN /usr/ports/biology/seaview/files/patch-align.cxx seaview/files/patch-align.cxx
--- /usr/ports/biology/seaview/files/patch-align.cxx	Sat Nov 22 01:05:03 2003
+++ seaview/files/patch-align.cxx	Wed Dec 31 21:00:00 1969
@@ -1,19 +0,0 @@
---- 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 <ctype.h>
-+#include <unistd.h>
- #ifndef WIN32
- #include <FL/x.H>
- #endif
-@@ -155,7 +156,7 @@
- #endif
- debut = view->active_region->list->debut;
- fin = view->active_region->list->fin;
--tmpnam(base_fname);
-+mkstemp(base_fname);
- /* 
- convertir en minuscules car clustalw n'accepte pas les majuscules ds filenames
- */
diff -ruN /usr/ports/biology/seaview/files/patch-seaview.cxx seaview/files/patch-seaview.cxx
--- /usr/ports/biology/seaview/files/patch-seaview.cxx	Sat Nov 22 01:05:03 2003
+++ seaview/files/patch-seaview.cxx	Wed Dec 31 21:00:00 1969
@@ -1,11 +0,0 @@
---- 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),
- #else
- 	"seaview.help", 
- #endif
--- seaview.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tdb 
Responsible-Changed-By: tdb 
Responsible-Changed-When: Fri Dec 9 14:10:22 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90140 

From: Fernan Aguero <fernan@iib.unsam.edu.ar>
To: Tim Bishop <tdb@FreeBSD.org>
Cc: GNATS Bug Followup <bug-followup@FreeBSD.org>
Subject: Re: ports/90140: update biology/seaview: fix help file, remove
Date: Fri, 9 Dec 2005 11:59:35 -0300

 --n8g4imXOkfNTN/H1
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 +----[ Tim Bishop <tdb@FreeBSD.org> (09.Dec.2005 11:20):
 |
 | On Fri, 2005-12-09 at 11:00 -0300, Fernan Aguero wrote:
 | > -PORTVERSION=	2005.13.07
 | > +PORTVERSION=	2005.12.07
 | 
 | Version numbers can't go backwards:
 | 
 | % pkg_version -t 2005.13.07 2005.12.07
 | >
 | 
 | So either make the new version bigger, or set PORTEPOCH=1 which results
 | in a package name like:
 | 
 | seaview-2005.12.07,1
 | 
 | Tim.
 |
 +----]
 
 Oh, yes, my fault. I tried to fix the PORTVERSION to use the
 more standard YYYY.MM.DD ... I've now set PORTEPOCH in the
 attached patch.
 
 Thanks again,
 
 Fernan
 
 --n8g4imXOkfNTN/H1
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="seaview.diff"
 
 diff -ruN /usr/ports/biology/seaview/Makefile seaview/Makefile
 --- /usr/ports/biology/seaview/Makefile	Tue Dec  6 14:44:00 2005
 +++ seaview/Makefile	Fri Dec  9 08:37:58 2005
 @@ -7,7 +7,8 @@
  #
  
  PORTNAME=	seaview
 -PORTVERSION=	2005.13.07
 +PORTVERSION=	2005.12.07
 +PORTEPOCH=	1
  CATEGORIES=	biology
  MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
  DISTNAME=	${PORTNAME}
 @@ -27,12 +28,12 @@
  ALL_TARGET=	${PORTNAME}
  
  CFLAGS+=	-D HAVE_DIRENT_H \
 -		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/seaview/seaview.help
 +		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/${PORTNAME}/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
 +	@${MKDIR} ${PREFIX}/lib/X11/${PORTNAME}
 +	@${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/${PORTNAME}
  
  .include <bsd.port.mk>
 diff -ruN /usr/ports/biology/seaview/distinfo seaview/distinfo
 --- /usr/ports/biology/seaview/distinfo	Tue Dec  6 14:44:00 2005
 +++ seaview/distinfo	Wed Dec  7 12:08:24 2005
 @@ -1,3 +1,3 @@
 -MD5 (seaview-2005.13.07/seaview.tar) = 0971b3485351f6a1f56a7b56ead2359c
 -SHA256 (seaview-2005.13.07/seaview.tar) = 7f48c494e5bee5dacef28bab2a52eab8aff6b66ceff8fab47fe77a18de376fc5
 -SIZE (seaview-2005.13.07/seaview.tar) = 595968
 +MD5 (seaview-2005.12.07/seaview.tar) = 4d1d1406f5d9ae0a0edad7144742143b
 +SHA256 (seaview-2005.12.07/seaview.tar) = ced1844ca3fc8181a9c811079dbc8e2ee67242ef49be113f761abad034ba8ba3
 +SIZE (seaview-2005.12.07/seaview.tar) = 595968
 diff -ruN /usr/ports/biology/seaview/files/patch-Makefile seaview/files/patch-Makefile
 --- /usr/ports/biology/seaview/files/patch-Makefile	Tue Dec  6 12:13:17 2005
 +++ seaview/files/patch-Makefile	Fri Dec  9 07:41:35 2005
 @@ -1,5 +1,5 @@
  --- Makefile.orig	Wed Apr  6 05:54:30 2005
 -+++ Makefile	Mon Dec  5 08:31:05 2005
 ++++ Makefile	Fri Dec  9 07:41:26 2005
  @@ -1,18 +1,15 @@
  -FLTK = ../fltk
  -PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
 @@ -7,7 +7,7 @@
   CXX = g++
   
  -CFLAGS  = -Dunix  -U__APPLE__  -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include 
 -+CFLAGS  = -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
 ++CFLAGS+= -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
   
   
   OBJECTS = seaview.o pdf.o custom.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
 diff -ruN /usr/ports/biology/seaview/files/patch-align.cxx seaview/files/patch-align.cxx
 --- /usr/ports/biology/seaview/files/patch-align.cxx	Sat Nov 22 01:05:03 2003
 +++ seaview/files/patch-align.cxx	Wed Dec 31 21:00:00 1969
 @@ -1,19 +0,0 @@
 ---- 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 <ctype.h>
 -+#include <unistd.h>
 - #ifndef WIN32
 - #include <FL/x.H>
 - #endif
 -@@ -155,7 +156,7 @@
 - #endif
 - debut = view->active_region->list->debut;
 - fin = view->active_region->list->fin;
 --tmpnam(base_fname);
 -+mkstemp(base_fname);
 - /* 
 - convertir en minuscules car clustalw n'accepte pas les majuscules ds filenames
 - */
 diff -ruN /usr/ports/biology/seaview/files/patch-seaview.cxx seaview/files/patch-seaview.cxx
 --- /usr/ports/biology/seaview/files/patch-seaview.cxx	Sat Nov 22 01:05:03 2003
 +++ seaview/files/patch-seaview.cxx	Wed Dec 31 21:00:00 1969
 @@ -1,11 +0,0 @@
 ---- 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),
 - #else
 - 	"seaview.help", 
 - #endif
 
 --n8g4imXOkfNTN/H1--

From: Fernan Aguero <fernan@iib.unsam.edu.ar>
To: Tim Bishop <tdb@FreeBSD.org>
Cc: GNATS PR Followup <bug-followup@FreeBSD.org>
Subject: Re: ports/90140: update biology/seaview: fix help file, remove
Date: Fri, 9 Dec 2005 14:51:23 -0300

 --dc+cDN39EJAMEtIO
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 +----[ Tim Bishop <tdb@FreeBSD.org> (09.Dec.2005 12:15):
 |
 | > Oh, yes, my fault. I tried to fix the PORTVERSION to use the
 | > more standard YYYY.MM.DD ... I've now set PORTEPOCH in the
 | > attached patch.
 | 
 | I should probably just check you're aware of the implications of using
 | PORTEPOCH:
 | 
 | http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-naming.html#AEN514
 | 
 | Once set it can never be undone. The only other solution though is to
 | use a non-standard version number until 2006 :-)
 
 Yeah, you're right, perhaps it's better to stick with the
 non-standard version number until the next version comes
 out, which most probably will be in 2006.
  
 | I'm happy with whatever you want to do though.
 |
 +----]
 
 Patch is attached,
 
 Fernan
 
 --dc+cDN39EJAMEtIO
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="seaview.diff"
 
 diff -ruN /usr/ports/biology/seaview/Makefile seaview/Makefile
 --- /usr/ports/biology/seaview/Makefile	Tue Dec  6 14:44:00 2005
 +++ seaview/Makefile	Fri Dec  9 10:06:37 2005
 @@ -7,7 +7,7 @@
  #
  
  PORTNAME=	seaview
 -PORTVERSION=	2005.13.07
 +PORTVERSION=	2005.07.12
  CATEGORIES=	biology
  MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
  DISTNAME=	${PORTNAME}
 @@ -27,12 +27,12 @@
  ALL_TARGET=	${PORTNAME}
  
  CFLAGS+=	-D HAVE_DIRENT_H \
 -		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/seaview/seaview.help
 +		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/${PORTNAME}/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
 +	@${MKDIR} ${PREFIX}/lib/X11/${PORTNAME}
 +	@${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/${PORTNAME}
  
  .include <bsd.port.mk>
 diff -ruN /usr/ports/biology/seaview/distinfo seaview/distinfo
 --- /usr/ports/biology/seaview/distinfo	Tue Dec  6 14:44:00 2005
 +++ seaview/distinfo	Fri Dec  9 10:07:49 2005
 @@ -1,3 +1,3 @@
 -MD5 (seaview-2005.13.07/seaview.tar) = 0971b3485351f6a1f56a7b56ead2359c
 -SHA256 (seaview-2005.13.07/seaview.tar) = 7f48c494e5bee5dacef28bab2a52eab8aff6b66ceff8fab47fe77a18de376fc5
 -SIZE (seaview-2005.13.07/seaview.tar) = 595968
 +MD5 (seaview-2005.07.12/seaview.tar) = 4d1d1406f5d9ae0a0edad7144742143b
 +SHA256 (seaview-2005.07.12/seaview.tar) = ced1844ca3fc8181a9c811079dbc8e2ee67242ef49be113f761abad034ba8ba3
 +SIZE (seaview-2005.07.12/seaview.tar) = 595968
 diff -ruN /usr/ports/biology/seaview/files/patch-Makefile seaview/files/patch-Makefile
 --- /usr/ports/biology/seaview/files/patch-Makefile	Tue Dec  6 12:13:17 2005
 +++ seaview/files/patch-Makefile	Fri Dec  9 07:41:35 2005
 @@ -1,5 +1,5 @@
  --- Makefile.orig	Wed Apr  6 05:54:30 2005
 -+++ Makefile	Mon Dec  5 08:31:05 2005
 ++++ Makefile	Fri Dec  9 07:41:26 2005
  @@ -1,18 +1,15 @@
  -FLTK = ../fltk
  -PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
 @@ -7,7 +7,7 @@
   CXX = g++
   
  -CFLAGS  = -Dunix  -U__APPLE__  -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include 
 -+CFLAGS  = -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
 ++CFLAGS+= -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
   
   
   OBJECTS = seaview.o pdf.o custom.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
 diff -ruN /usr/ports/biology/seaview/files/patch-align.cxx seaview/files/patch-align.cxx
 --- /usr/ports/biology/seaview/files/patch-align.cxx	Sat Nov 22 01:05:03 2003
 +++ seaview/files/patch-align.cxx	Wed Dec 31 21:00:00 1969
 @@ -1,19 +0,0 @@
 ---- 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 <ctype.h>
 -+#include <unistd.h>
 - #ifndef WIN32
 - #include <FL/x.H>
 - #endif
 -@@ -155,7 +156,7 @@
 - #endif
 - debut = view->active_region->list->debut;
 - fin = view->active_region->list->fin;
 --tmpnam(base_fname);
 -+mkstemp(base_fname);
 - /* 
 - convertir en minuscules car clustalw n'accepte pas les majuscules ds filenames
 - */
 diff -ruN /usr/ports/biology/seaview/files/patch-seaview.cxx seaview/files/patch-seaview.cxx
 --- /usr/ports/biology/seaview/files/patch-seaview.cxx	Sat Nov 22 01:05:03 2003
 +++ seaview/files/patch-seaview.cxx	Wed Dec 31 21:00:00 1969
 @@ -1,11 +0,0 @@
 ---- 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),
 - #else
 - 	"seaview.help", 
 - #endif
 
 --dc+cDN39EJAMEtIO--

From: Fernan Aguero <fernan@iib.unsam.edu.ar>
To: Tim Bishop <tdb@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/90140: update biology/seaview: fix help file, remove
Date: Fri, 9 Dec 2005 22:20:40 -0300

 --1ccMZA6j1vT5UqiK
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 +----[ Tim Bishop <tdb@FreeBSD.org> (09.Dec.2005 16:34):
 |
 | On Fri, 2005-12-09 at 18:00 +0000, Fernan Aguero wrote:
 | >  -PORTVERSION=	2005.13.07
 | >  +PORTVERSION=	2005.07.12
 | 
 | That new number is still lower:
 | 
 | % pkg_version -t 2005.13.07 2005.07.12
 | >
 | 
 | Use pkg_version like that to test if the new version is greater than the
 | old version. Maybe use 2005.99 or something? Or just do what the
 | commerical industry does and brand it version 2006! (cue fireworks and
 | large advertising campaign :-)
 | 
 | Tim.
 |
 +----]
 
 Yeah, seems like I should do that. Patch attached. Version
 is now 2006.01.01 :|
 
 Thanks for your patience,
 
 Fernan
 
 --1ccMZA6j1vT5UqiK
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="seaview.diff"
 
 diff -ruN /usr/ports/biology/seaview/Makefile seaview/Makefile
 --- /usr/ports/biology/seaview/Makefile	Tue Dec  6 14:44:00 2005
 +++ seaview/Makefile	Fri Dec  9 19:17:07 2005
 @@ -7,7 +7,7 @@
  #
  
  PORTNAME=	seaview
 -PORTVERSION=	2005.13.07
 +PORTVERSION=	2006.01.01
  CATEGORIES=	biology
  MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/
  DISTNAME=	${PORTNAME}
 @@ -27,12 +27,12 @@
  ALL_TARGET=	${PORTNAME}
  
  CFLAGS+=	-D HAVE_DIRENT_H \
 -		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/seaview/seaview.help
 +		-D DEFAULT_HELPFILE=${PREFIX}/lib/X11/${PORTNAME}/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
 +	@${MKDIR} ${PREFIX}/lib/X11/${PORTNAME}
 +	@${INSTALL_DATA} ${WRKSRC}/seaview.help ${PREFIX}/lib/X11/${PORTNAME}
  
  .include <bsd.port.mk>
 diff -ruN /usr/ports/biology/seaview/distinfo seaview/distinfo
 --- /usr/ports/biology/seaview/distinfo	Tue Dec  6 14:44:00 2005
 +++ seaview/distinfo	Fri Dec  9 19:18:14 2005
 @@ -1,3 +1,3 @@
 -MD5 (seaview-2005.13.07/seaview.tar) = 0971b3485351f6a1f56a7b56ead2359c
 -SHA256 (seaview-2005.13.07/seaview.tar) = 7f48c494e5bee5dacef28bab2a52eab8aff6b66ceff8fab47fe77a18de376fc5
 -SIZE (seaview-2005.13.07/seaview.tar) = 595968
 +MD5 (seaview-2006.01.01/seaview.tar) = 4d1d1406f5d9ae0a0edad7144742143b
 +SHA256 (seaview-2006.01.01/seaview.tar) = ced1844ca3fc8181a9c811079dbc8e2ee67242ef49be113f761abad034ba8ba3
 +SIZE (seaview-2006.01.01/seaview.tar) = 595968
 diff -ruN /usr/ports/biology/seaview/files/patch-Makefile seaview/files/patch-Makefile
 --- /usr/ports/biology/seaview/files/patch-Makefile	Tue Dec  6 12:13:17 2005
 +++ seaview/files/patch-Makefile	Fri Dec  9 07:41:35 2005
 @@ -1,5 +1,5 @@
  --- Makefile.orig	Wed Apr  6 05:54:30 2005
 -+++ Makefile	Mon Dec  5 08:31:05 2005
 ++++ Makefile	Fri Dec  9 07:41:26 2005
  @@ -1,18 +1,15 @@
  -FLTK = ../fltk
  -PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
 @@ -7,7 +7,7 @@
   CXX = g++
   
  -CFLAGS  = -Dunix  -U__APPLE__  -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include 
 -+CFLAGS  = -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
 ++CFLAGS+= -Dunix -c $(OPT) -I$(X11BASE)/include -I$(LOCALBASE)/include
   
   
   OBJECTS = seaview.o pdf.o custom.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
 diff -ruN /usr/ports/biology/seaview/files/patch-align.cxx seaview/files/patch-align.cxx
 --- /usr/ports/biology/seaview/files/patch-align.cxx	Sat Nov 22 01:05:03 2003
 +++ seaview/files/patch-align.cxx	Wed Dec 31 21:00:00 1969
 @@ -1,19 +0,0 @@
 ---- 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 <ctype.h>
 -+#include <unistd.h>
 - #ifndef WIN32
 - #include <FL/x.H>
 - #endif
 -@@ -155,7 +156,7 @@
 - #endif
 - debut = view->active_region->list->debut;
 - fin = view->active_region->list->fin;
 --tmpnam(base_fname);
 -+mkstemp(base_fname);
 - /* 
 - convertir en minuscules car clustalw n'accepte pas les majuscules ds filenames
 - */
 diff -ruN /usr/ports/biology/seaview/files/patch-seaview.cxx seaview/files/patch-seaview.cxx
 --- /usr/ports/biology/seaview/files/patch-seaview.cxx	Sat Nov 22 01:05:03 2003
 +++ seaview/files/patch-seaview.cxx	Wed Dec 31 21:00:00 1969
 @@ -1,11 +0,0 @@
 ---- 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),
 - #else
 - 	"seaview.help", 
 - #endif
 
 --1ccMZA6j1vT5UqiK--
State-Changed-From-To: open->closed 
State-Changed-By: tdb 
State-Changed-When: Sat Dec 10 14:11:50 UTC 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90140 
>Unformatted:
