diff options
| -rw-r--r-- | finance/qhacc/Makefile | 16 | ||||
| -rw-r--r-- | finance/qhacc/distinfo | 4 | ||||
| -rw-r--r-- | finance/qhacc/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | finance/qhacc/files/patch-plugins::xml::xmlplugin.h | 13 | ||||
| -rw-r--r-- | finance/qhacc/pkg-plist | 12 |
5 files changed, 21 insertions, 35 deletions
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index 06a5ff03f8b0..33b3d37fa997 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= qhacc -PORTVERSION= 2.9.6 -PORTREVISION= 3 +PORTVERSION= 2.9.7 CATEGORIES= finance MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,11 +18,10 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 USE_QT_VER= 3 USE_X_PREFIX= yes -WANT_GNOME= yes -USE_GNOME= gnometarget USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOCONF_VER= 257 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \ --with-qt-libs=${QT_PREFIX}/lib MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ @@ -43,14 +41,6 @@ USE_MYSQL= yes CXXFLAGS+= -fpermissive .endif -.if ${HAVE_GNOME:Mlibxml}!="" -USE_GNOME+= libxml -CONFIGURE_ARGS+= --enable-xml -PLIST_SUB+= LIBXML="" -.else -PLIST_SUB+= LIBXML="@comment " -.endif - .if defined(WITH_MYSQL) CONFIGURE_ARGS+= --enable-mysql \ --with-mysql-libs="${LOCALBASE}/lib/mysql" \ @@ -83,7 +73,6 @@ pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "QHacc has the following tunable option(s):" @${ECHO_MSG} - @${ECHO_MSG} " WITHOUT_GNOME=libxml Turns off LibXML support" @${ECHO_MSG} " WITH_MYSQL=yes Turns on MySQL support" @${ECHO_MSG} " WITH_PGSQL=yes Turns on PostgreSQL support" @${ECHO_MSG} " WITH_SQLITE=yes Turns on SQLite support" @@ -96,7 +85,6 @@ post-patch: 's| -O2||g ; \ s| -g||g ; \ s| -pedantic||g ; \ - s|contrib docs qm|contrib|g ; \ s|$$(prefix)/plugins|$$(pkglibdir)/plugins|g' post-install: diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo index fc6bb5d416b9..d797eaa6d54d 100644 --- a/finance/qhacc/distinfo +++ b/finance/qhacc/distinfo @@ -1,2 +1,2 @@ -MD5 (qhacc-2.9.6.tar.gz) = 29cdfa57ca4c8ef869056608300de677 -SIZE (qhacc-2.9.6.tar.gz) = 455020 +MD5 (qhacc-2.9.7.tar.gz) = d1a7ed5c39e36612100d3d9ae36a8952 +SIZE (qhacc-2.9.7.tar.gz) = 472495 diff --git a/finance/qhacc/files/patch-Makefile.in b/finance/qhacc/files/patch-Makefile.in new file mode 100644 index 000000000000..cf8781e14ced --- /dev/null +++ b/finance/qhacc/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Jan 31 10:47:17 2004 ++++ Makefile.in Mon Feb 9 01:03:14 2004 +@@ -158,7 +158,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = lib src plugins contrib docs qm ++SUBDIRS = lib src plugins + + EXTRA_DIST = AUTHORS NEWS COPYING README ChangeLog THANKS FILE_FORMAT TODO \ + INSTALL UPGRADE diff --git a/finance/qhacc/files/patch-plugins::xml::xmlplugin.h b/finance/qhacc/files/patch-plugins::xml::xmlplugin.h deleted file mode 100644 index ff8b3505bcd7..000000000000 --- a/finance/qhacc/files/patch-plugins::xml::xmlplugin.h +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/xml/xmlplugin.h.orig Thu Dec 4 22:21:26 2003 -+++ plugins/xml/xmlplugin.h Fri Dec 5 14:16:02 2003 -@@ -24,8 +24,8 @@ - - #include <stdlib.h> - #include <tree.h> --#include <xmlmemory.h> --#include <parser.h> -+#include <libxml/xmlmemory.h> -+#include <libxml/parser.h> - - class XMLDBPlugin : public LocalFileDBPlugin { - public: diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist index d04221bac9a9..305313033f3a 100644 --- a/finance/qhacc/pkg-plist +++ b/finance/qhacc/pkg-plist @@ -56,23 +56,23 @@ lib/libqifio.so.1 lib/libupgradeio.a lib/libupgradeio.so lib/libupgradeio.so.1 -%%LIBXML%%lib/libxmlio.a -%%LIBXML%%lib/libxmlio.so -%%LIBXML%%lib/libxmlio.so.1 +lib/libxmlio.a +lib/libxmlio.so +lib/libxmlio.so.1 lib/qhacc/plugins/db/libextprgio.so %%SQLITE%%lib/qhacc/plugins/db/liblfsqliteio.so %%MYSQL%%lib/qhacc/plugins/db/libmysqlio.so %%PGSQL%%lib/qhacc/plugins/db/libpsqlio.so %%SQLITE%%lib/qhacc/plugins/db/libsqliteio.so lib/qhacc/plugins/db/libupgradeio.so -%%LIBXML%%lib/qhacc/plugins/db/libxmlio.so +lib/qhacc/plugins/db/libxmlio.so lib/qhacc/plugins/export/libarcio.so lib/qhacc/plugins/export/libextprgio.so %%SQLITE%%lib/qhacc/plugins/export/liblfsqliteio.so %%MYSQL%%lib/qhacc/plugins/export/libmysqlio.so %%PGSQL%%lib/qhacc/plugins/export/libpsqlio.so %%SQLITE%%lib/qhacc/plugins/export/libsqliteio.so -%%LIBXML%%lib/qhacc/plugins/export/libxmlio.so +lib/qhacc/plugins/export/libxmlio.so lib/qhacc/plugins/import/libarcio.so lib/qhacc/plugins/import/libcliimpio.so lib/qhacc/plugins/import/libextprgio.so @@ -81,7 +81,7 @@ lib/qhacc/plugins/import/libextprgio.so %%PGSQL%%lib/qhacc/plugins/import/libpsqlio.so lib/qhacc/plugins/import/libqifio.so %%SQLITE%%lib/qhacc/plugins/import/libsqliteio.so -%%LIBXML%%lib/qhacc/plugins/import/libxmlio.so +lib/qhacc/plugins/import/libxmlio.so lib/qhacc/qhacc_es_ES.qm %%PORTDOCS%%%%DOCSDIR%%/advanced.html %%PORTDOCS%%%%DOCSDIR%%/compiling.html |