Date: Mon, 18 Aug 2003 08:30:06 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/55686: Update port: finance/qhacc to 2.9.1 Message-ID: <20030818083006.1d260e32.tkato@prontomail.com> Resent-Message-ID: <200308172340.h7HNeGmf022927@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55686
>Category: ports
>Synopsis: Update port: finance/qhacc to 2.9.1
>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: Sun Aug 17 16:40:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.9.1
New file:
files/xmlplugin.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/finance/qhacc/Makefile finance/qhacc/Makefile
--- /usr/ports/finance/qhacc/Makefile Mon Aug 18 02:19:46 2003
+++ finance/qhacc/Makefile Mon Aug 18 07:26:00 2003
@@ -6,8 +6,7 @@
#
PORTNAME= qhacc
-PORTVERSION= 2.9
-PORTREVISION= 2
+PORTVERSION= 2.9.1
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,23 +18,24 @@
USE_QT_VER= 3
USE_X_PREFIX= yes
+USE_GNOME= gnometarget libxml
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_GNOME= libxml2
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --enable-mysql=no \
+CONFIGURE_ARGS= --enable-xml=yes \
--with-qt-moc=${QT_PREFIX}/bin \
--with-qt-libs=${QT_PREFIX}/lib
INSTALLS_SHLIB= yes
STRIP= # none
+post-extract:
+ @${CP} -f ${FILESDIR}/xmlplugin.h ${WRKSRC}/plugins/xml
+
post-patch:
@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/lib/|g ; \
- s|#! /bin/sh|#!${LOCALBASE}/bin/bash|g' \
- ${WRKSRC}/src/qhacc.orig
+ @${REINPLACE_CMD} -e 's|#! /bin/sh|#!${LOCALBASE}/bin/bash|g ; \
+ s|/usr/local/q|${PREFIX}/lib/q|g' ${WRKSRC}/src/qhacc.orig
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|-O2 -Wall -g||g ; \
s|contrib docs qm|contrib|g ; \
diff -urN /usr/ports/finance/qhacc/distinfo finance/qhacc/distinfo
--- /usr/ports/finance/qhacc/distinfo Wed Aug 13 10:05:13 2003
+++ finance/qhacc/distinfo Mon Aug 18 01:39:06 2003
@@ -1 +1 @@
-MD5 (qhacc-2.9.tar.gz) = 5df88c785d1f30cd60592eabeda4467c
+MD5 (qhacc-2.9.1.tar.gz) = 67ddb65c89424bf684b1dca998d0a212
diff -urN /usr/ports/finance/qhacc/files/patch-ltmain.sh finance/qhacc/files/patch-ltmain.sh
--- /usr/ports/finance/qhacc/files/patch-ltmain.sh Wed Aug 13 03:04:27 2003
+++ finance/qhacc/files/patch-ltmain.sh Mon Aug 18 02:14:31 2003
@@ -1,5 +1,23 @@
--- ltmain.sh.orig Thu Mar 13 01:25:30 2003
-+++ ltmain.sh Tue Aug 12 01:49:52 2003
++++ ltmain.sh Mon Aug 18 02:14:24 2003
+@@ -1043,7 +1043,7 @@
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+@@ -2441,7 +2441,7 @@
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
+ *)
@@ -4210,10 +4210,12 @@
fi
diff -urN /usr/ports/finance/qhacc/files/xmlplugin.h finance/qhacc/files/xmlplugin.h
--- /usr/ports/finance/qhacc/files/xmlplugin.h Thu Jan 1 09:00:00 1970
+++ finance/qhacc/files/xmlplugin.h Mon Aug 18 02:03:13 2003
@@ -0,0 +1,52 @@
+/************************* * * * * * * * * * * * * ***************************
+ Copyright (c) 1999-2003 Ryan Bobko
+ ryan@ostrich-emulators.com
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+************************** * * * * * * * * * * * * **************************/
+
+#ifndef XMLIMPORTER_H
+#define XMLIMPORTER_H
+
+#include "localfileplugin.h"
+
+#include <stdlib.h>
+#include <tree.h>
+#include <xmlmemory.h>
+#include <parser.h>
+
+class XMLDBPlugin : public LocalFileDBPlugin {
+ public:
+ XMLDBPlugin();
+ virtual ~XMLDBPlugin();
+
+ virtual bool load( QHacc * eng, const QString& home, QString& error );
+ virtual bool save( const QString&, bool, QString& );
+
+ virtual QString description() const;
+ static QString sdescription();
+
+ virtual QString understands() const; // what QHACC_HOME keywords do I know?
+ static QString sunderstands(); // what QHACC_HOME keywords do I know?
+
+ protected:
+ void writeTable( QHaccResultSet& data, const char ** lbls, uint lblcnt,
+ xmlDocPtr tree, xmlNsPtr ns, const QString& label ) const;
+ void readTable( QHaccResultSet& data, const char ** lbls,
+ uint lblcnt, xmlNodePtr cur, xmlDocPtr doc,
+ const QString& label ) const;
+};
+
+#endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030818083006.1d260e32.tkato>