From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 24 10:10:15 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 710B516A417 for ; Fri, 24 Nov 2006 10:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id D892A43D49 for ; Fri, 24 Nov 2006 10:09:31 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAOAACkr038102 for ; Fri, 24 Nov 2006 10:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAOAACcc038101; Fri, 24 Nov 2006 10:10:12 GMT (envelope-from gnats) Resent-Date: Fri, 24 Nov 2006 10:10:12 GMT Resent-Message-Id: <200611241010.kAOAACcc038101@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "John E. Hein" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9E96916A412 for ; Fri, 24 Nov 2006 10:02:32 +0000 (UTC) (envelope-from jhein@timing.com) Received: from Daffy.timing.com (w.timing.com [206.168.13.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6CB243D4C for ; Fri, 24 Nov 2006 10:01:51 +0000 (GMT) (envelope-from jhein@timing.com) Received: from Speedy.timing.com (speedy.timing.com [206.168.13.185]) by Daffy.timing.com (8.13.1/8.13.1) with ESMTP id kAOA2VuB082661; Fri, 24 Nov 2006 03:02:31 -0700 (MST) (envelope-from jhein@timing.com) Received: from Speedy.timing.com (localhost [127.0.0.1]) by Speedy.timing.com (8.13.6/8.13.6) with ESMTP id kAOA2Ubk052696; Fri, 24 Nov 2006 03:02:30 -0700 (MST) (envelope-from jhein@Speedy.timing.com) Received: (from jhein@localhost) by Speedy.timing.com (8.13.6/8.13.6/Submit) id kAOA2UB0052695; Fri, 24 Nov 2006 03:02:30 -0700 (MST) (envelope-from jhein) Message-Id: <200611241002.kAOA2UB0052695@Speedy.timing.com> Date: Fri, 24 Nov 2006 03:02:30 -0700 (MST) From: "John E. Hein" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105809: update opentaxsolver to 3.08 and fix /usr/X11R6 path X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "John E. Hein" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Nov 2006 10:10:15 -0000 >Number: 105809 >Category: ports >Synopsis: update opentaxsolver to 3.08 and fix /usr/X11R6 path >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Nov 24 10:10:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: John E. Hein >Release: FreeBSD 5.5-RELEASE-p8 i386 >Organization: >Environment: >Description: Update opentaxsolver to 3.08 Add patch to fix hard-coded path to /usr/X11R6 (noticed by kris-mail). >How-To-Repeat: Apply patch below. Do a test build. Commit. >Fix: cd ports ; patch -p << EOF Index: finance/opentaxsolver/Makefile =================================================================== RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/Makefile,v retrieving revision 1.1 diff -u -p -r1.1 Makefile --- finance/opentaxsolver/Makefile 28 Aug 2006 21:05:20 -0000 1.1 +++ finance/opentaxsolver/Makefile 24 Nov 2006 09:45:09 -0000 @@ -6,11 +6,11 @@ # PORTNAME= ${UPPORTNAME:L} -PORTVERSION= 3.07 +PORTVERSION= 3.08 CATEGORIES= finance MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= opentaxsolver -DISTNAME= ${UPPORTNAME}2005_3.07 +DISTNAME= ${UPPORTNAME}2005_${PORTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= jhein@timing.com @@ -18,10 +18,13 @@ COMMENT= US tax prep software USE_XLIB= yes UPPORTNAME= OpenTaxSolver +XLIB_PREFIX?= ${X11BASE} post-patch: @${REINPLACE_CMD} -e 's/%%PREFIX%%/${PREFIX:C,/,\/,g}/' \ ${WRKSRC}/src/GUI/ots_gui.c + @${REINPLACE_CMD} -e 's/%%XLIB_PREFIX%%/${XLIB_PREFIX:C,/,\/,g}/' \ + ${WRKSRC}/src/GUI/Makefile.linux do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ @@ -29,25 +32,30 @@ do-build: BUILDPROGLISTCMD= ${FIND} bin -type f BUILDEXAMPLELISTCMD= ${FIND} examples_and_templates -type f +BUILDEXAMPLEDIRLISTCMD= ${FIND} examples_and_templates -type d NEWPLIST= ${WRKDIR}/plist.new do-install: @(cd ${WRKSRC} && \ for prog in $$(${BUILDPROGLISTCMD}); do \ - ${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin/. ; \ + ${INSTALL_PROGRAM} $${prog} ${PREFIX}/bin/. ; \ done && \ ${MKDIR} ${PREFIX}/share/ots && \ ${INSTALL_DATA} src/GUI/otslogo.ppm ${PREFIX}/share/ots/. && \ for example in $$(${BUILDEXAMPLELISTCMD}); do \ - ${MKDIR} ${PREFIX}/share/ots/$$(dirname $${example}) && \ - ${INSTALL_DATA} $${example} \ - ${PREFIX}/share/ots/$$(dirname $${example})/. ; \ + ${MKDIR} ${PREFIX}/share/ots/$$(dirname $${example}) && \ + ${INSTALL_DATA} $${example} \ + ${PREFIX}/share/ots/$$(dirname $${example})/. ; \ done) new-plist: @(cd ${WRKSRC} && \ - ${BUILDPROGLISTCMD} > ${NEWPLIST} && \ + ${BUILDPROGLISTCMD} | ${SORT} > ${NEWPLIST} && \ ${ECHO_CMD} share/ots/otslogo.ppm >> ${NEWPLIST} && \ - ${BUILDEXAMPLELISTCMD} | ${SED} 's,^,share/ots/,' >> ${NEWPLIST}) + ${BUILDEXAMPLELISTCMD} | ${SED} 's,^,share/ots/,' | ${SORT} \ + >> ${NEWPLIST} && \ + for f in $$(${BUILDEXAMPLEDIRLISTCMD} | ${SED} 's,^,share/ots/,' && \ + ${ECHO_CMD} share/ots); do ${ECHO_CMD} @dirrm $$f; done | \ + ${SORT} -r >> ${NEWPLIST}) .include Index: finance/opentaxsolver/distinfo =================================================================== RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/distinfo,v retrieving revision 1.1 diff -u -p -r1.1 distinfo --- finance/opentaxsolver/distinfo 28 Aug 2006 21:05:20 -0000 1.1 +++ finance/opentaxsolver/distinfo 31 Aug 2006 21:39:27 -0000 @@ -1,3 +1,3 @@ -MD5 (OpenTaxSolver2005_3.07.tgz) = 7601b50059b55588104591de9e7a8cac -SHA256 (OpenTaxSolver2005_3.07.tgz) = acf281b2c62405808f453a4c3c926c950501a2700a621aad80ff35b7d0b5d823 -SIZE (OpenTaxSolver2005_3.07.tgz) = 224382 +MD5 (OpenTaxSolver2005_3.08.tgz) = 7467cc72d85b2a88366046cf7c52719c +SHA256 (OpenTaxSolver2005_3.08.tgz) = 01d691b367b82f818c0baa227a65189a04a68a02c7b8f6163b955e65901b1a03 +SIZE (OpenTaxSolver2005_3.08.tgz) = 224468 Index: finance/opentaxsolver/pkg-plist =================================================================== RCS file: /base/FreeBSD-CVS/ports/finance/opentaxsolver/pkg-plist,v retrieving revision 1.1 diff -u -p -r1.1 pkg-plist --- finance/opentaxsolver/pkg-plist 28 Aug 2006 21:05:20 -0000 1.1 +++ finance/opentaxsolver/pkg-plist 31 Aug 2006 22:04:02 -0000 @@ -1,53 +1,53 @@ bin/ots_gui -bin/taxsolve_US_1040_2005 -bin/taxsolve_US_1040_Sched_C_2005 bin/taxsolve_CA_540_2005 bin/taxsolve_MA_1_2005 bin/taxsolve_NJ_1040_2005 +bin/taxsolve_NY_IT201_2005 +bin/taxsolve_OH_IT1040_2005 bin/taxsolve_PA_40_2005 +bin/taxsolve_US_1040_2005 +bin/taxsolve_US_1040_Sched_C_2005 bin/taxsolve_VA_760_2005 -bin/taxsolve_OH_IT1040_2005 -bin/taxsolve_NY_IT201_2005 share/ots/otslogo.ppm +share/ots/examples_and_templates/CA_540/CA_540_2005_example.dat share/ots/examples_and_templates/CA_540/CA_540_2005_template.dat share/ots/examples_and_templates/CA_540/README_CA_540.txt -share/ots/examples_and_templates/CA_540/CA_540_2005_example.dat -share/ots/examples_and_templates/VA_760/VA_760_example.dat -share/ots/examples_and_templates/VA_760/README_VA_760.txt -share/ots/examples_and_templates/VA_760/VA_760_template.dat share/ots/examples_and_templates/MA_1/MA_1_2005_example.dat -share/ots/examples_and_templates/MA_1/README_MA_1.txt share/ots/examples_and_templates/MA_1/MA_1_2005_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/OH_1040/README_OH_IT1040.txt -share/ots/examples_and_templates/OH_1040/OH_IT1040_2005_template.dat -share/ots/examples_and_templates/OH_1040/OH_IT1040_2005_example.dat -share/ots/examples_and_templates/US_1040/US_1040_template.dat -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/NC_400/README_NC_400.txt +share/ots/examples_and_templates/MA_1/README_MA_1.txt share/ots/examples_and_templates/NC_400/NC_400_2005_example.dat share/ots/examples_and_templates/NC_400/NC_400_2005_template.dat -share/ots/examples_and_templates/NJ_1040/NJ_1040_2005_template.dat +share/ots/examples_and_templates/NC_400/README_NC_400.txt share/ots/examples_and_templates/NJ_1040/NJ_1040_2005_example.dat +share/ots/examples_and_templates/NJ_1040/NJ_1040_2005_template.dat share/ots/examples_and_templates/NJ_1040/README_NJ_1040.txt -share/ots/examples_and_templates/PA_40/README_PA_40.txt -share/ots/examples_and_templates/PA_40/PA_40_2005_template.dat -share/ots/examples_and_templates/PA_40/PA_40_2005_example.dat share/ots/examples_and_templates/NY_IT201/NY_IT201_2004_example.dat -share/ots/examples_and_templates/NY_IT201/README_NY_IT201.txt share/ots/examples_and_templates/NY_IT201/NY_IT201_2004_template.dat -@dirrm share/ots/examples_and_templates/CA_540 +share/ots/examples_and_templates/NY_IT201/README_NY_IT201.txt +share/ots/examples_and_templates/OH_1040/OH_IT1040_2005_example.dat +share/ots/examples_and_templates/OH_1040/OH_IT1040_2005_template.dat +share/ots/examples_and_templates/OH_1040/README_OH_IT1040.txt +share/ots/examples_and_templates/PA_40/PA_40_2005_example.dat +share/ots/examples_and_templates/PA_40/PA_40_2005_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/VA_760/README_VA_760.txt +share/ots/examples_and_templates/VA_760/VA_760_example.dat +share/ots/examples_and_templates/VA_760/VA_760_template.dat @dirrm share/ots/examples_and_templates/VA_760 -@dirrm share/ots/examples_and_templates/MA_1 @dirrm share/ots/examples_and_templates/US_1040_Sched_C -@dirrm share/ots/examples_and_templates/OH_1040 @dirrm share/ots/examples_and_templates/US_1040 -@dirrm share/ots/examples_and_templates/NC_400 -@dirrm share/ots/examples_and_templates/NJ_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 Index: finance/opentaxsolver/files/patch-src-GUI-Makefile.linux =================================================================== RCS file: finance/opentaxsolver/files/patch-src-GUI-Makefile.linux diff -N finance/opentaxsolver/files/patch-src-GUI-Makefile.linux --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ finance/opentaxsolver/files/patch-src-GUI-Makefile.linux 24 Nov 2006 09:11:11 -0000 @@ -0,0 +1,13 @@ +--- src/GUI/Makefile.linux.orig Fri Mar 31 22:16:19 2006 ++++ src/GUI/Makefile.linux Fri Nov 24 02:10:47 2006 +@@ -2,8 +2,8 @@ + + CFLAGS = + COPTIM = -O +-INCLUDE = -I/usr/X11R6/include +-LDPATH = -L/usr/X11R6/lib ++INCLUDE = -I%%XLIB_PREFIX%%/include ++LDPATH = -L%%XLIB_PREFIX%%/lib + LIBS = -lGLU -lGL -lXmu -lXext -lX11 -lm + + EOF >Release-Note: >Audit-Trail: >Unformatted: