Update to 10.00 for 2012 tax year.

PR:		ports/177717
Submitted by:	John Hein <jhein@symmetricom.com> (maintainer)

5 files changed, 43 insertions, 61 deletions

diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index e0c87fc7331f..d394a9e4bda4 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -1,8 +1,7 @@
-# Created by: John Hein (jhein@timing.com)
 # $FreeBSD$
 
 PORTNAME=	${UPPORTNAME:L}
-PORTVERSION=	9.01
+PORTVERSION=	10.00
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/OTS_${TAXYEAR}/v${PORTVERSION}
 DISTNAME=	${UPPORTNAME}${TAXYEAR}_${PORTVERSION}
@@ -14,7 +13,7 @@ COMMENT=	US tax prep software
 PLIST=		${WRKDIR}/pkg-plist
 SUB_FILES=	pkg-plist
 SUB_LIST=	TAXYEAR=${TAXYEAR}
-TAXYEAR=	2011
+TAXYEAR=	2012
 UPPORTNAME=	OpenTaxSolver
 
 .if !defined(WITHOUT_X11)
diff --git a/finance/opentaxsolver/distinfo b/finance/opentaxsolver/distinfo
index 3ec89b2a07e8..8395aff5e1ae 100644
--- a/finance/opentaxsolver/distinfo
+++ b/finance/opentaxsolver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenTaxSolver2011_9.01.tgz) = acd28964b616559b16af160368cf649883add2aeabd3817dcbcb8385c27c5220
-SIZE (OpenTaxSolver2011_9.01.tgz) = 502241
+SHA256 (OpenTaxSolver2012_10.00.tgz) = 76a016541a3cf8bb73a85178c2763dd9fd86f182951390f4102475059c6a7254
+SIZE (OpenTaxSolver2012_10.00.tgz) = 480920
diff --git a/finance/opentaxsolver/files/patch-8829 b/finance/opentaxsolver/files/patch-8829
new file mode 100644
index 000000000000..db686165c9ed
--- /dev/null
+++ b/finance/opentaxsolver/files/patch-8829
@@ -0,0 +1,37 @@
+$FreeBSD$
+
+Add year designation to 8829 solver for consistency.
+
+--- src/Makefile.unix.orig	2012-11-25 22:34:38.000000000 -0700
++++ src/Makefile.unix	2013-04-08 09:39:31.000000000 -0600
+@@ -28,7 +28,7 @@
+      ../bin/taxsolve_NY_IT201_2012 \
+      ../bin/taxsolve_MA_1_2012 \
+      ../bin/taxsolve_CA_540_2012 \
+-     ../bin/taxsolve_US_8829
++     ../bin/taxsolve_US_8829_2012
+ 
+ 
+ ../bin/taxsolve_US_1040_2012:         taxsolve_US_1040_2012.c          taxsolve_routines.c
+@@ -63,8 +63,8 @@
+ ../bin/taxsolve_MA_1_2012:            taxsolve_MA_1_2012.c             taxsolve_routines.c
+ 	$(CC) $(CFLAGS) $(COPTIM) -o  ../bin/taxsolve_MA_1_2012            taxsolve_MA_1_2012.c             $(SRCS) $(LIBS)
+ 
+-../bin/taxsolve_US_8829:	      taxsolve_US_8829.c               taxsolve_routines.c
+-	$(CC) $(CFLAGS) $(COPTIM) -o  ../bin/taxsolve_US_8829		   taxsolve_US_8829.c              $(SRCS) $(LIBS)
++../bin/taxsolve_US_8829_2012:	      taxsolve_US_8829.c               taxsolve_routines.c
++	$(CC) $(CFLAGS) $(COPTIM) -o  ../bin/taxsolve_US_8829_2012		   taxsolve_US_8829.c              $(SRCS) $(LIBS)
+ 
+ 
+ clean:
+--- src/GUI/ots_gui.c.orig	2013-04-07 19:40:57.000000000 -0600
++++ src/GUI/ots_gui.c	2013-04-08 09:44:22.000000000 -0600
+@@ -1279,7 +1279,7 @@
+ 	 "taxsolve_PA_40_2012",			/* 8 */
+ 	 "taxsolve_VA_760_2012",		/* 9 */
+ 	 "Other",				/* 10 */
+-	 "taxsolve_US_8829"			/* 11 */
++	 "taxsolve_US_8829_2012"			/* 11 */
+ 	};
+ 
+
diff --git a/finance/opentaxsolver/files/pkg-plist.in b/finance/opentaxsolver/files/pkg-plist.in
index da6fdf0354b5..6659328e3071 100644
--- a/finance/opentaxsolver/files/pkg-plist.in
+++ b/finance/opentaxsolver/files/pkg-plist.in
@@ -9,7 +9,7 @@ bin/taxsolve_OH_IT1040_%%TAXYEAR%%
 bin/taxsolve_PA_40_%%TAXYEAR%%
 bin/taxsolve_US_1040_%%TAXYEAR%%
 bin/taxsolve_US_1040_Sched_C_%%TAXYEAR%%
-bin/taxsolve_US_8829
+bin/taxsolve_US_8829_%%TAXYEAR%%
 bin/taxsolve_VA_760_%%TAXYEAR%%
 share/ots/examples_and_templates/CA_540/CA_540_%%TAXYEAR%%_example.txt
 share/ots/examples_and_templates/CA_540/CA_540_%%TAXYEAR%%_template.txt
@@ -34,6 +34,7 @@ share/ots/examples_and_templates/PA_40/PA_40_%%TAXYEAR%%_template.txt
 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.txt
+share/ots/examples_and_templates/US_1040/US_1040_example1.txt
 share/ots/examples_and_templates/US_1040/US_1040_template.txt
 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_%%TAXYEAR%%_example.txt
diff --git a/finance/opentaxsolver/pkg-plist b/finance/opentaxsolver/pkg-plist
deleted file mode 100644
index 930fa99ba7ce..000000000000
--- a/finance/opentaxsolver/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-bin/ots_gui
-bin/taxsolve_CA_540_2010
-bin/taxsolve_MA_1_2010
-bin/taxsolve_NC_D400_2010
-bin/taxsolve_NJ_1040_2010
-bin/taxsolve_NY_IT201_2010
-bin/taxsolve_OH_IT1040_2010
-bin/taxsolve_PA_40_2010
-bin/taxsolve_US_1040_2010
-bin/taxsolve_US_1040_Sched_C_2010
-bin/taxsolve_VA_760_2010
-share/ots/otslogo.ppm
-share/ots/examples_and_templates/CA_540/CA_540_2010_example.dat
-share/ots/examples_and_templates/CA_540/CA_540_2010_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_2010_example.dat
-share/ots/examples_and_templates/MA_1/ma_1_2010_template.dat
-share/ots/examples_and_templates/NC_D400/NC_400_2010_example.dat
-share/ots/examples_and_templates/NC_D400/NC_400_2010_template.dat
-share/ots/examples_and_templates/NC_D400/README_NC_400.txt
-share/ots/examples_and_templates/NJ_1040/NJ_1040_2010_example.dat
-share/ots/examples_and_templates/NJ_1040/NJ_1040_2010_template.dat
-share/ots/examples_and_templates/NJ_1040/README_NJ_1040.txt
-share/ots/examples_and_templates/NY_IT201/NY_IT201_2010_example.dat
-share/ots/examples_and_templates/NY_IT201/NY_IT201_2010_template.dat
-share/ots/examples_and_templates/NY_IT201/README_NY_IT201.txt
-share/ots/examples_and_templates/OH_IT1040/OH_IT1040_2010_example.dat
-share/ots/examples_and_templates/OH_IT1040/OH_IT1040_2010_template.dat
-share/ots/examples_and_templates/OH_IT1040/README_OH_IT1040.txt
-share/ots/examples_and_templates/PA_40/PA_40_2010_example.dat
-share/ots/examples_and_templates/PA_40/PA_40_2010_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_2010_example.dat
-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2010_template.dat
-share/ots/examples_and_templates/VA_760/README_VA_760.txt
-share/ots/examples_and_templates/VA_760/VA_760_2010_example.dat
-share/ots/examples_and_templates/VA_760/VA_760_2010_template.dat
-@dirrm share/ots/examples_and_templates/VA_760
-@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_IT1040
-@dirrm share/ots/examples_and_templates/NY_IT201
-@dirrm share/ots/examples_and_templates/NJ_1040
-@dirrm share/ots/examples_and_templates/NC_D400
-@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