4 files changed, 38 insertions, 37 deletions

diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 0286dc61ac77..6ac90996e264 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	${UPPORTNAME:L}
-PORTVERSION=	4.07
+PORTVERSION=	5.04
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	opentaxsolver
-DISTNAME=	${UPPORTNAME}2006_${PORTVERSION}
+DISTNAME=	${UPPORTNAME}2007_${PORTVERSION}
+EXTRACT_SUFX=	0.tgz
 
 MAINTAINER=	jhein@timing.com
 COMMENT=	US tax prep software
diff --git a/finance/opentaxsolver/distinfo b/finance/opentaxsolver/distinfo
index 9a79d7c77d78..4ac2d145e5ed 100644
--- a/finance/opentaxsolver/distinfo
+++ b/finance/opentaxsolver/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenTaxSolver2006_4.07.tar.gz) = 416ef470552dd795b32b69abeeba09d6
-SHA256 (OpenTaxSolver2006_4.07.tar.gz) = 8d13de19bc2261c27fb6a9a6314cdc5d817e9f03ea0bd0cbba024e1785c1312e
-SIZE (OpenTaxSolver2006_4.07.tar.gz) = 362514
+MD5 (OpenTaxSolver2007_5.040.tgz) = aa4c081f9ab282b6fd69d0d79043ea0b
+SHA256 (OpenTaxSolver2007_5.040.tgz) = 2d05124a36edfe54ff5a3fccea02a59039f4d401ba6e44f3389447bea89930f2
+SIZE (OpenTaxSolver2007_5.040.tgz) = 551660
diff --git a/finance/opentaxsolver/files/patch-src-GUI-ots_gui.c b/finance/opentaxsolver/files/patch-src-GUI-ots_gui.c
index f8962ba58068..2ffa0d80f6ef 100644
--- a/finance/opentaxsolver/files/patch-src-GUI-ots_gui.c
+++ b/finance/opentaxsolver/files/patch-src-GUI-ots_gui.c
@@ -1,5 +1,5 @@
---- src/GUI/ots_gui.c.orig	Sun Apr  2 22:56:24 2006
-+++ src/GUI/ots_gui.c	Sat Apr  8 19:46:40 2006
+--- src/GUI/ots_gui.c.orig	2008-02-10 12:57:32.000000000 -0700
++++ src/GUI/ots_gui.c	2008-02-19 18:17:30.000000000 -0700
 @@ -1026,7 +1026,7 @@
    }
   else
@@ -26,6 +26,6 @@
   Otk_SetBorderThickness( main_panel, 0.25 );
 - sprintf(tmpstr,"%s..%csrc%cGUI%cotslogo.ppm", invocation_path, slashchr, slashchr, slashchr );
 + snprintf(tmpstr, sizeof(tmpstr), "%%PREFIX%%/share/ots/otslogo.ppm");
-  subpanel = OtkMakePanel( main_panel, Otk_Raised, Otk_LightGray, 20, 2, 60, 20 );
+  subpanel = OtkMakePanel( main_panel, Otk_Raised, Otk_LightGray, 18.5, 2, 63, 17 );
+  Otk_SetBorderThickness( subpanel, 0.75 );
   testfile = fopen(tmpstr,"r");
-  if (testfile!=0)
diff --git a/finance/opentaxsolver/pkg-plist b/finance/opentaxsolver/pkg-plist
index c8dbff31a11d..5bec2f900cde 100644
--- a/finance/opentaxsolver/pkg-plist
+++ b/finance/opentaxsolver/pkg-plist
@@ -1,45 +1,45 @@
 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
+bin/taxsolve_CA_540_2007
+bin/taxsolve_MA_1_2007
+bin/taxsolve_NC_D400_2007
+bin/taxsolve_NJ_1040_2007
+bin/taxsolve_NY_IT201_2007
+bin/taxsolve_OH_IT1040_2007
+bin/taxsolve_PA_40_2007
+bin/taxsolve_US_1040_2007
+bin/taxsolve_US_1040_Sched_C_2007
+bin/taxsolve_VA_760_2007
 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/CA_540_2007_example.dat
+share/ots/examples_and_templates/CA_540/CA_540_2007_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/MA_1/ma_1_2007_example.dat
+share/ots/examples_and_templates/MA_1/ma_1_2007_template.dat
+share/ots/examples_and_templates/NC_400/NC_400_2007_example.dat
+share/ots/examples_and_templates/NC_400/NC_400_2007_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/NJ_1040_2007_example.dat
+share/ots/examples_and_templates/NJ_1040/NJ_1040_2007_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/NY_IT201_2007_example.dat
+share/ots/examples_and_templates/NY_IT201/NY_IT201_2007_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/OH_IT1040_2007_example.dat
+share/ots/examples_and_templates/OH_1040/OH_IT1040_2007_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/PA_40_2007_example.dat
+share/ots/examples_and_templates/PA_40/PA_40_2007_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_2006_example.dat
-share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2006_template.dat
+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2007_example.dat
+share/ots/examples_and_templates/US_1040_Sched_C/US_1040Sched_C_2007_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
+share/ots/examples_and_templates/VA_760/VA_760_2007_example.dat
+share/ots/examples_and_templates/VA_760/VA_760_2007_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