3 files changed, 51 insertions, 7 deletions

diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 0c570f294c4b..0286dc61ac77 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	${UPPORTNAME:L}
-PORTVERSION=	4.01
-PORTREVISION=	1
+PORTVERSION=	4.07
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	opentaxsolver
@@ -26,6 +25,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' \
 	${WRKSRC}/src/GUI/Makefile.linux
 
+# 4.07 distfile has pre-built (linux) binaries we must whack.
+pre-build:
+	@(cd ${BUILD_WRKSRC}/src && make -f Makefile.unix clean && \
+	cd GUI && make -f Makefile.linux clean)
+
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 	./Build_taxsolve_packages_LINUX.sh)
diff --git a/finance/opentaxsolver/distinfo b/finance/opentaxsolver/distinfo
index c2d398931f31..9a79d7c77d78 100644
--- a/finance/opentaxsolver/distinfo
+++ b/finance/opentaxsolver/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenTaxSolver2006_4.01.tar.gz) = 9ce67ed03a38c54cf1258051835615e0
-SHA256 (OpenTaxSolver2006_4.01.tar.gz) = 7b95a4fff086de5ccb7c1c1c74e4dd897307995c173043da78a311a6629e1220
-SIZE (OpenTaxSolver2006_4.01.tar.gz) = 180586
+MD5 (OpenTaxSolver2006_4.07.tar.gz) = 416ef470552dd795b32b69abeeba09d6
+SHA256 (OpenTaxSolver2006_4.07.tar.gz) = 8d13de19bc2261c27fb6a9a6314cdc5d817e9f03ea0bd0cbba024e1785c1312e
+SIZE (OpenTaxSolver2006_4.07.tar.gz) = 362514
diff --git a/finance/opentaxsolver/pkg-plist b/finance/opentaxsolver/pkg-plist
index f3f98824b857..c8dbff31a11d 100644
--- a/finance/opentaxsolver/pkg-plist
+++ b/finance/opentaxsolver/pkg-plist
@@ -1,14 +1,54 @@
 bin/ots_gui
+bin/taxsolve_CA_540_2006
+bin/taxsolve_MA_1_2006
+bin/taxsolve_NC_D400_2006
+bin/taxsolve_NJ_1040_2006
+bin/taxsolve_NY_IT201_2006
+bin/taxsolve_OH_IT1040_2006
+bin/taxsolve_PA_40_2006
 bin/taxsolve_US_1040_2006
 bin/taxsolve_US_1040_Sched_C_2006
+bin/taxsolve_VA_760_2006
 share/ots/otslogo.ppm
+share/ots/examples_and_templates/CA_540/CA_540_2006_example.dat
+share/ots/examples_and_templates/CA_540/CA_540_2006_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_2006_example.dat
+share/ots/examples_and_templates/MA_1/ma_1_2006_template.dat
+share/ots/examples_and_templates/NC_400/NC_400_2006_example.dat
+share/ots/examples_and_templates/NC_400/NC_400_2006_template.dat
+share/ots/examples_and_templates/NC_400/README_NC_400.txt
+share/ots/examples_and_templates/NJ_1040/NJ_1040_2006_example.dat
+share/ots/examples_and_templates/NJ_1040/NJ_1040_2006_template.dat
+share/ots/examples_and_templates/NJ_1040/README_NJ_1040.txt
+share/ots/examples_and_templates/NY_IT201/NY_IT201_2006_example.dat
+share/ots/examples_and_templates/NY_IT201/NY_IT201_2006_template.dat
+share/ots/examples_and_templates/NY_IT201/README_NY_IT201.txt
+share/ots/examples_and_templates/OH_1040/OH_IT1040_2006_example.dat
+share/ots/examples_and_templates/OH_1040/OH_IT1040_2006_template.dat
+share/ots/examples_and_templates/OH_1040/README_OH_IT1040.txt
+share/ots/examples_and_templates/PA_40/PA_40_2006_example.dat
+share/ots/examples_and_templates/PA_40/PA_40_2006_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/README_US_1040_Sched_C.txt
-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2005_example.dat
-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2005_template.dat
+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2006_example.dat
+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2006_template.dat
+share/ots/examples_and_templates/VA_760/README_VA_760.txt
+share/ots/examples_and_templates/VA_760/VA_760_2006_example.dat
+share/ots/examples_and_templates/VA_760/VA_760_2006_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_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