5 files changed, 3 insertions, 62 deletions

diff --git a/biology/treeviewx/Makefile b/biology/treeviewx/Makefile
index 1043b6b28d7a..95d363f0dcea 100644
--- a/biology/treeviewx/Makefile
+++ b/biology/treeviewx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	treeviewx
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	biology
 MASTER_SITES=	http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/
 DISTNAME=	tv-${PORTVERSION}
@@ -14,7 +14,7 @@ DISTNAME=	tv-${PORTVERSION}
 MAINTAINER=	tonym@biolateral.com.au
 COMMENT=	A phylogenetic tree viewer
 
-LIB_DEPENDS=	wx_gtk-2.2.2:${PORTSDIR}/x11-toolkits/wxgtk
+LIB_DEPENDS=	wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/biology/treeviewx/distinfo b/biology/treeviewx/distinfo
index 8fb4f9cc6300..42ad051ed926 100644
--- a/biology/treeviewx/distinfo
+++ b/biology/treeviewx/distinfo
@@ -1 +1 @@
-MD5 (tv-0.2.tar.gz) = be5349b36aeef1bbd436e17a3cae3ff7
+MD5 (tv-0.3.tar.gz) = 2e4a597ba248b024c1754e01dcbcbe8d
diff --git a/biology/treeviewx/files/patch-Makefile.am b/biology/treeviewx/files/patch-Makefile.am
deleted file mode 100644
index 2aa04c00a381..000000000000
--- a/biology/treeviewx/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Sat Aug  4 13:17:56 2001
-+++ Makefile.am	Sat Aug  4 13:18:17 2001
-@@ -125,7 +125,7 @@
- 
- 
- all:
--	cd ncl-2.0/src; make libncl.a;   # Paul Lewis Nexus Class Library
-+	cd ncl-2.0/src; $(MAKE) libncl.a;   # Paul Lewis Nexus Class Library
- 	
- 	${MAKE} $(PROGRAM);
- 
diff --git a/biology/treeviewx/files/patch-Makefile.in b/biology/treeviewx/files/patch-Makefile.in
deleted file mode 100644
index f50463b48285..000000000000
--- a/biology/treeviewx/files/patch-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.in.orig	Fri Sep 14 02:03:50 2001
-+++ Makefile.in	Thu Dec 27 11:43:50 2001
-@@ -263,7 +263,7 @@
- 	$(CC) -c $(CFLAGS) -I$(NCLDIR) -I$(TREELIBDIR) -I$(GPORTDIR)  -DUSE_WXWINDOWS  -o $@ $<
- 
- all:
--	cd ncl-2.0/src; make libncl.a;   # Paul Lewis Nexus Class Library
-+	cd ncl-2.0/src; $(MAKE) libncl.a;   # Paul Lewis Nexus Class Library
- 
- 	${MAKE} $(PROGRAM);
- 
-@@ -283,6 +283,15 @@
- tdoc.o: tdoc.cpp tdoc.h tview.h \
-  $(TREELIBDIR)/profile.h $(TREELIBDIR)/Parse.h $(TREELIBDIR)/gtree.h $(TREELIBDIR)/TreeLib.h \
-  $(TREELIBDIR)/tokeniser.h $(TREELIBDIR)/treereader.h
-+
-+install : $(PROGRAM)
-+	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	@list='$(PROGRAM)'; for p in $$list; do \
-+		if test -f $$p; then \
-+			echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-+		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)' `; \
-+		else :; fi; \
-+	done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/biology/treeviewx/files/patch-ncl-2.0::src::Makefile b/biology/treeviewx/files/patch-ncl-2.0::src::Makefile
deleted file mode 100644
index 56583bc32602..000000000000
--- a/biology/treeviewx/files/patch-ncl-2.0::src::Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$FreeBSD$
-
---- ncl-2.0/src/Makefile.orig	Thu Mar 28 11:17:10 2002
-+++ ncl-2.0/src/Makefile	Thu Mar 28 11:17:44 2002
-@@ -2,11 +2,11 @@
- SRC_DIR		= ./
- 
- # compiler switches 
--CC              = gcc
--CXX             = g++
--CXXFLAGS        = -O4
--LOADLIBES       = -lm
--CLINKER         = g++
-+CC              ?= gcc
-+CXX             ?= g++
-+CXXFLAGS        ?= -O4
-+LOADLIBES       ?= -lm
-+CLINKER         ?= g++
- 
- # target macros
- EXECS		= ncltest basiccmdline makedoc