3 files changed, 38 insertions, 15 deletions

diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index 4829c2f33c59..562afc3ac94b 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seaview
-PORTVERSION=	4.5.2
-PORTREVISION=	1
+PORTVERSION=	4.5.3.4
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://doua.prabi.fr/software/seaview_data/ \
@@ -13,9 +12,11 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Multiple DNA/protein sequence alignment editor
 
-BROKEN=		Fails to link, tries to use internal fltk symbols
+LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
+		libpdf.so:${PORTSDIR}/print/pdflib \
+		libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -35,15 +36,8 @@ PLIST_FILES=	bin/seaview man/man1/seaview.1.gz %%DATADIR%%/seaview.html \
 DESKTOP_ENTRIES="SeaView" "" "${PREFIX}/share/pixmaps/seaview.xpm" "seaview" \
 		"Biology;Science;" true
 
-OPTIONS_DEFINE=		PDFLIB
-OPTIONS_DEFAULT=	PDFLIB
-PDFLIB_DESC=		PDFlib support
-PDFLIB_LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
-PDFLIB_MAKE_ENV=	LPDF='-L${LOCALBASE}/lib -lpdf'
-PDFLIB_MAKE_ENV_OFF=	PDF_PS_FLAGS='-DNO_PDF'
-
 post-patch:
-	@${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e \
 		's|^\(PDF_PS_FLAGS\) |#\1 | ; \
 		 s|^\(FLTK\) |#\1 | ; \
 		 s|^\(USE_XFT\) |#\1 | ; \
@@ -58,7 +52,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC} && ${INSTALL_MAN} seaview.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
-	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} seaview.html \
 		${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${INSTALL_DATA} seaview.xpm \
diff --git a/biology/seaview/distinfo b/biology/seaview/distinfo
index 2f189e5811f0..f19a0ba10b68 100644
--- a/biology/seaview/distinfo
+++ b/biology/seaview/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seaview_4.5.2.tar.gz) = 47fca9dd1910ca38a3a2fb869d55a4b3429c30b75193b7780233b27803e17938
-SIZE (seaview_4.5.2.tar.gz) = 411077
+SHA256 (seaview_4.5.3.4.tar.gz) = ba1a139eae5e210b058b11c290f343455fed236a8ae297bf0a69283acc90e182
+SIZE (seaview_4.5.3.4.tar.gz) = 416507
diff --git a/biology/seaview/files/patch-Makefile b/biology/seaview/files/patch-Makefile
new file mode 100644
index 000000000000..24805485d1bf
--- /dev/null
+++ b/biology/seaview/files/patch-Makefile
@@ -0,0 +1,29 @@
+--- Makefile.orig	2014-09-11 16:03:57.000000000 +0200
++++ Makefile	2015-03-15 14:15:03.000000000 +0100
+@@ -11,19 +11,19 @@
+ #FLTK = $(HOME)/fltk-1.3.2
+ 
+ CFLTK = fltk-config
+-IFLTK = $(shell if [ '$(FLTK)' != '' ]; then echo '-I$(FLTK)'; fi)
++IFLTK = -I/usr/local/include
+ CONFIG = $(shell if [ '$(FLTK)' != '' ]; then echo '$(FLTK)/$(CFLTK)'; else echo '$(CFLTK)'; fi)
+-PDF_PS_FLAGS = $(shell if [ '$(PDF_INC)' != '' ]; then echo '-I$(PDF_INC)'; else echo '-DNO_PDF'; fi)
+-LPDF = $(shell if [ '$(PDF_LIB)' != '' ]; then echo '-L$(PDF_LIB) -lpdf'; fi)
++#PDF_PS_FLAGS = $(shell if [ '$(PDF_INC)' != '' ]; then echo '-I$(PDF_INC)'; else echo '-DNO_PDF'; fi)
++LPDF = -L/usr/local/lib -lpdf
+ 
+-EXTRALIBS = $(shell $(CONFIG) --use-images --ldflags) -ldl -lpthread -lz
++EXTRALIBS = $(shell $(CONFIG) --use-images --ldflags) -pthread -lz
+ 
+-CC = gcc
+-CXX = g++
++#CC = gcc
++#CXX = g++
+ CSRC = csrc
+ 
+ #DEBUG = -g
+-OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
++#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O3'; else echo '-O0'; fi)
+ 
+ SVFLAGS = $(CPPFLAGS) $(CFLAGS) -Dunix $(OPT) -I. $(IFLTK) -I$(CSRC) $(DEBUG) $(HELPFILE) $(PHYMLNAME) $(PDF_PS_FLAGS)
+