Date: Tue, 12 Aug 2003 23:54:09 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/55497: Update port: finance/qhacc to 2.9 Message-ID: <20030812235409.5966c937.tkato@prontomail.com> Resent-Message-ID: <200308121500.h7CF0UtC028818@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55497
>Category: ports
>Synopsis: Update port: finance/qhacc to 2.9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 12 08:00:30 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.9
New file:
files/patch-ltmain.sh
Remove file:
files/patch-src::main.cpp
files/patch-src::qhacctable.h
pkg-message
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/finance/qhacc/Makefile finance/qhacc/Makefile
--- /usr/ports/finance/qhacc/Makefile Sat Apr 12 22:45:58 2003
+++ finance/qhacc/Makefile Tue Aug 12 22:59:19 2003
@@ -6,7 +6,7 @@
#
PORTNAME= qhacc
-PORTVERSION= 2.6.1
+PORTVERSION= 2.9
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,32 +14,39 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple QT-based financial manager
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2
+
USE_QT_VER= 3
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \
+CONFIGURE_ARGS= --enable-mysql=no \
+ --with-qt-moc=${QT_PREFIX}/bin \
--with-qt-libs=${QT_PREFIX}/lib
+INSTALLS_SHLIB= yes
-post-extract:
- @${RM} -f ${WRKSRC}/src/moc_*.cpp
+STRIP= # none
-pre-patch:
+post-patch:
@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|#! /bin/sh|#!${LOCALBASE}/bin/bash|g ; \
+ s|/usr/local/|${PREFIX}/lib/|g' ${WRKSRC}/src/qhacc.orig
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|^CXXFLAGS =.*$$|CXXFLAGS = \@CXXFLAGS\@|g'
+ 's|-O2 -Wall -g||g ; \
+ s|contrib docs qm|contrib|g ; \
+ s|$$(prefix)/plugins|$$(pkglibdir)/plugins|g'
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
- @${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${DATADIR}
- ${INSTALL_DATA} ${FILESDIR}/config ${DATADIR}/config.sample
+post-install:
+ @${STRIP_CMD} ${PREFIX}/bin/qhacc-*
+.for file in accounts memorized preferences transactions
+ ${INSTALL_DATA} ${WRKSRC}/contrib/easysetup/${file} ${PREFIX}/lib/qhacc
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${PREFIX}/lib/qhacc
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
.endif
- @${SED} -e "s:/usr/X11R6:${PREFIX}:g" ${PKGMESSAGE}
.include <bsd.port.mk>
diff -urN /usr/ports/finance/qhacc/distinfo finance/qhacc/distinfo
--- /usr/ports/finance/qhacc/distinfo Thu Jan 23 21:16:27 2003
+++ finance/qhacc/distinfo Tue Aug 5 11:11:48 2003
@@ -1 +1 @@
-MD5 (qhacc-2.6.1.tar.gz) = 6b61a2c428106bde00d833b27a3c548c
+MD5 (qhacc-2.9.tar.gz) = 5df88c785d1f30cd60592eabeda4467c
diff -urN /usr/ports/finance/qhacc/files/config finance/qhacc/files/config
--- /usr/ports/finance/qhacc/files/config Sun Feb 13 13:09:40 2000
+++ finance/qhacc/files/config Thu Jan 1 09:00:00 1970
@@ -1,6 +0,0 @@
-ALTCOLOR=173 216 230
-LINESPERTRANS=1
-NUMACCTS=0
-NUMSHOWS=0
-SHOWINDEX=-1
-ACCTFILES=
diff -urN /usr/ports/finance/qhacc/files/patch-ltmain.sh finance/qhacc/files/patch-ltmain.sh
--- /usr/ports/finance/qhacc/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970
+++ finance/qhacc/files/patch-ltmain.sh Tue Aug 12 01:50:02 2003
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig Thu Mar 13 01:25:30 2003
++++ ltmain.sh Tue Aug 12 01:49:52 2003
+@@ -4210,10 +4210,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -urN /usr/ports/finance/qhacc/files/patch-src::main.cpp finance/qhacc/files/patch-src::main.cpp
--- /usr/ports/finance/qhacc/files/patch-src::main.cpp Mon Jan 13 19:31:04 2003
+++ finance/qhacc/files/patch-src::main.cpp Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- src/main.cpp.orig Thu Jan 2 02:42:35 2003
-+++ src/main.cpp Wed Jan 8 04:51:12 2003
-@@ -26,7 +26,6 @@
- #include "qhaccwidget.h"
-
- #include <stdlib.h>
--#include <getopt.h>
- #include <locale.h>
-
- #include <qapplication.h>
diff -urN /usr/ports/finance/qhacc/files/patch-src::qhacctable.h finance/qhacc/files/patch-src::qhacctable.h
--- /usr/ports/finance/qhacc/files/patch-src::qhacctable.h Fri Nov 22 05:43:45 2002
+++ finance/qhacc/files/patch-src::qhacctable.h Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- src/qhacctable.h.orig Sun Nov 24 19:22:27 2002
-+++ src/qhacctable.h Sun Nov 24 19:26:03 2002
-@@ -26,9 +26,10 @@
- #include <qstring.h>
- #include <qdatetime.h>
-
--class QFile;
-+#include <fstream>
-+using std::ostream;
-
--class ostream;
-+class QFile;
-
- class QHaccTableIndex;
-
diff -urN /usr/ports/finance/qhacc/pkg-message finance/qhacc/pkg-message
--- /usr/ports/finance/qhacc/pkg-message Sun Sep 17 02:56:00 2000
+++ finance/qhacc/pkg-message Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
-************************************************************
- Before running QHacc, users should prepare as follows:
-
- $ mkdir ~/.qhacc
- $ cp /usr/X11R6/share/qhacc/config.sample ~/.qhacc/config
- $ chmod u+rw ~/.qhacc/config
- $ export QHACC_HOME=~/.qhacc (sh or bash)
- $ setenv QHACC_HOME ~/.qhacc (csh or tcsh)
-
-************************************************************
diff -urN /usr/ports/finance/qhacc/pkg-plist finance/qhacc/pkg-plist
--- /usr/ports/finance/qhacc/pkg-plist Fri Nov 22 04:30:12 2002
+++ finance/qhacc/pkg-plist Tue Aug 12 02:34:27 2003
@@ -1,12 +1,65 @@
bin/qhacc
-%%PORTDOCS%%share/doc/qhacc/compiling.html
-%%PORTDOCS%%share/doc/qhacc/index.html
-%%PORTDOCS%%share/doc/qhacc/intro.html
-%%PORTDOCS%%share/doc/qhacc/faq.html
-%%PORTDOCS%%share/doc/qhacc/formats.html
-%%PORTDOCS%%share/doc/qhacc/using.html
-%%PORTDOCS%%share/doc/qhacc/primer.html
-share/qhacc/config.sample
-share/qhacc/qhacc_es_ES.qm
-@dirrm share/qhacc
-%%PORTDOCS%%@dirrm share/doc/qhacc
+bin/qhacc-cli
+bin/qhacc-gui
+include/localfileplugin.h
+include/plugins.h
+include/qhacc.h
+include/qhaccconstants.h
+include/qhaccext.h
+include/qhaccsegmenter.h
+include/qhacctable.h
+include/qhacctablerows.h
+include/qhaccutils.h
+include/resultset.h
+include/sqldbplugin.h
+lib/libcliimpio.a
+lib/libcliimpio.so
+lib/libcliimpio.so.1
+lib/libcronio.a
+lib/libcronio.so
+lib/libcronio.so.1
+lib/libfiledbio.a
+lib/libfiledbio.so
+lib/libfiledbio.so.2
+lib/libforeigndbio.a
+lib/libforeigndbio.so
+lib/libforeigndbio.so.2
+lib/libnativedbio.a
+lib/libnativedbio.so
+lib/libnativedbio.so.2
+lib/libqhacc.a
+lib/libqhacc.so
+lib/libqhacc.so.2
+lib/libqhaccext.a
+lib/libqhaccext.so
+lib/libqhaccext.so.2
+lib/libqifio.a
+lib/libqifio.so
+lib/libqifio.so.1
+lib/libxmlio.a
+lib/libxmlio.so
+lib/libxmlio.so.1
+lib/qhacc/accounts
+lib/qhacc/memorized
+lib/qhacc/plugins/db/libxmlio.so
+lib/qhacc/plugins/export/libxmlio.so
+lib/qhacc/plugins/import/libcliimpio.so
+lib/qhacc/plugins/import/libcronio.so
+lib/qhacc/plugins/import/libqifio.so
+lib/qhacc/plugins/import/libxmlio.so
+lib/qhacc/preferences
+lib/qhacc/qhacc_es_ES.qm
+lib/qhacc/transactions
+%%PORTDOCS%%%%DOCSDIR%%/compiling.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/formats.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/primer.html
+%%PORTDOCS%%%%DOCSDIR%%/using.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/qhacc/plugins/import
+@dirrm lib/qhacc/plugins/export
+@dirrm lib/qhacc/plugins/db
+@dirrm lib/qhacc/plugins
+@dirrm lib/qhacc
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030812235409.5966c937.tkato>