4 files changed, 30 insertions, 52 deletions

diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 1af35527b651..ae6365ab28b5 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	${UPPORTNAME:L}
-PORTVERSION=	6.04
+PORTVERSION=	7.00
 CATEGORIES=	finance
-MASTER_SITES=	SF/${PORTNAME}/OTS_2008/v${PORTVERSION}
-DISTNAME=	${UPPORTNAME}2008_${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/OTS_2009/v${PORTVERSION}
+DISTNAME=	${UPPORTNAME}2009_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jhein@timing.com
+MAINTAINER=	jhein@symmetricom.com
 COMMENT=	US tax prep software
 
 USE_GL=		yes
diff --git a/finance/opentaxsolver/distinfo b/finance/opentaxsolver/distinfo
index bd0d830664eb..0699b1415749 100644
--- a/finance/opentaxsolver/distinfo
+++ b/finance/opentaxsolver/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenTaxSolver2008_6.04.tgz) = 73c3e31263bf7b971fd9dcc5f5d59988
-SHA256 (OpenTaxSolver2008_6.04.tgz) = e2614a7b2a940af51595f5a7ae1b3f5d9659b0d06e31df23ce9bca44412f4ee2
-SIZE (OpenTaxSolver2008_6.04.tgz) = 423183
+MD5 (OpenTaxSolver2009_7.00.tgz) = 4609c4d030c3daaa502b36bc11559d63
+SHA256 (OpenTaxSolver2009_7.00.tgz) = ecda7974e7de8c1a1fc0eeb119196287767a3e9bbfe0531a44870e66cdc9d94c
+SIZE (OpenTaxSolver2009_7.00.tgz) = 349182
diff --git a/finance/opentaxsolver/files/patch-src-Makefile.unix b/finance/opentaxsolver/files/patch-src-Makefile.unix
new file mode 100644
index 000000000000..9cfa2f28069a
--- /dev/null
+++ b/finance/opentaxsolver/files/patch-src-Makefile.unix
@@ -0,0 +1,18 @@
+--- src/Makefile.unix.orig	2010-01-05 22:20:59.000000000 -0700
++++ src/Makefile.unix	2010-01-25 12:12:00.000000000 -0700
+@@ -20,6 +20,7 @@
+ 
+ all: ../bin/taxsolve_US_1040_2009 \
+      ../bin/taxsolve_US_1040_Sched_C_2009 \
++     ../bin/taxsolve_CA_540_2009 
+ #     ../bin/taxsolve_NC_D400_2009 \
+ #     ../bin/taxsolve_NJ_1040_2009 \
+ #     ../bin/taxsolve_PA_40_2009 \
+@@ -28,7 +29,6 @@
+ #     ../bin/taxsolve_NY_IT201_2009 \
+ #     ../bin/taxsolve_MA_1_2009 \
+ #     ../bin/taxsolve_US_8829 \
+-     ../bin/taxsolve_CA_540_2009 
+ 
+ 
+ ../bin/taxsolve_US_1040_2009:         taxsolve_US_1040_2009.c          $(OBJS)
diff --git a/finance/opentaxsolver/pkg-plist b/finance/opentaxsolver/pkg-plist
index 182e24825451..1853fb2b992e 100644
--- a/finance/opentaxsolver/pkg-plist
+++ b/finance/opentaxsolver/pkg-plist
@@ -1,56 +1,16 @@
 bin/ots_gui
-bin/taxsolve_CA_540_2008
-bin/taxsolve_MA_1_2008
-bin/taxsolve_NC_D400_2008
-bin/taxsolve_NJ_1040_2008
-bin/taxsolve_NY_IT201_2008
-bin/taxsolve_OH_IT1040_2008
-bin/taxsolve_PA_40_2008
-bin/taxsolve_US_8829
-bin/taxsolve_US_1040_2008
-bin/taxsolve_US_1040_Sched_C_2008
-bin/taxsolve_VA_760_2008
+bin/taxsolve_CA_540_2009
+bin/taxsolve_US_1040_2009
+bin/taxsolve_US_1040_Sched_C_2009
 share/ots/otslogo.ppm
-share/ots/examples_and_templates/CA_540/CA_540_2008_example.dat
-share/ots/examples_and_templates/CA_540/CA_540_2008_template.dat
-share/ots/examples_and_templates/CA_540/README_CA_540.txt
-share/ots/examples_and_templates/MA_1/README_MA_1.txt
-share/ots/examples_and_templates/MA_1/ma_1_2008_example.dat
-share/ots/examples_and_templates/MA_1/ma_1_2008_template.dat
-share/ots/examples_and_templates/NC_400/NC_400_2008_example.dat
-share/ots/examples_and_templates/NC_400/NC_400_2008_template.dat
-share/ots/examples_and_templates/NC_400/README_NC_400.txt
-share/ots/examples_and_templates/NJ_1040/NJ_1040_2008_example.dat
-share/ots/examples_and_templates/NJ_1040/NJ_1040_2008_template.dat
-share/ots/examples_and_templates/NJ_1040/README_NJ_1040.txt
-share/ots/examples_and_templates/NY_IT201/NY_IT201_2008_example.dat
-share/ots/examples_and_templates/NY_IT201/NY_IT201_2008_template.dat
-share/ots/examples_and_templates/NY_IT201/README_NY_IT201.txt
-share/ots/examples_and_templates/OH_1040/OH_IT1040_2008_example.dat
-share/ots/examples_and_templates/OH_1040/OH_IT1040_2008_template.dat
-share/ots/examples_and_templates/OH_1040/README_OH_IT1040.txt
-share/ots/examples_and_templates/PA_40/PA_40_2008_example.dat
-share/ots/examples_and_templates/PA_40/PA_40_2008_template.dat
-share/ots/examples_and_templates/PA_40/README_PA_40.txt
 share/ots/examples_and_templates/US_1040/README_US_1040.txt
 share/ots/examples_and_templates/US_1040/US_1040_example.dat
 share/ots/examples_and_templates/US_1040/US_1040_template.dat
 share/ots/examples_and_templates/US_1040_Sched_C/8829_template.dat
 share/ots/examples_and_templates/US_1040_Sched_C/README_US_1040_Sched_C.txt
-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2008_example.dat
-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2008_template.dat
-share/ots/examples_and_templates/VA_760/README_VA_760.txt
-share/ots/examples_and_templates/VA_760/VA_760_2008_example.dat
-share/ots/examples_and_templates/VA_760/VA_760_2008_template.dat
-@dirrm share/ots/examples_and_templates/VA_760
+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2009_example.dat
+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2009_template.dat
 @dirrm share/ots/examples_and_templates/US_1040_Sched_C
 @dirrm share/ots/examples_and_templates/US_1040
-@dirrm share/ots/examples_and_templates/PA_40
-@dirrm share/ots/examples_and_templates/OH_1040
-@dirrm share/ots/examples_and_templates/NY_IT201
-@dirrm share/ots/examples_and_templates/NJ_1040
-@dirrm share/ots/examples_and_templates/NC_400
-@dirrm share/ots/examples_and_templates/MA_1
-@dirrm share/ots/examples_and_templates/CA_540
 @dirrm share/ots/examples_and_templates
 @dirrm share/ots