From owner-svn-ports-head@FreeBSD.ORG Mon Jun 17 15:33:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 02DBC8C5; Mon, 17 Jun 2013 15:33:13 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E819D1E24; Mon, 17 Jun 2013 15:33:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HFXCXX035927; Mon, 17 Jun 2013 15:33:12 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5HFXC6s035921; Mon, 17 Jun 2013 15:33:12 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201306171533.r5HFXC6s035921@svn.freebsd.org> From: Martin Wilke Date: Mon, 17 Jun 2013 15:33:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321137 - in head/finance/qhacc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 15:33:13 -0000 Author: miwi Date: Mon Jun 17 15:33:12 2013 New Revision: 321137 URL: http://svnweb.freebsd.org/changeset/ports/321137 Log: - Update to 4.1 PR: 179596 Submitted by: Ports Fury Deleted: head/finance/qhacc/files/ Modified: head/finance/qhacc/Makefile (contents, props changed) head/finance/qhacc/distinfo (contents, props changed) head/finance/qhacc/pkg-plist (contents, props changed) Modified: head/finance/qhacc/Makefile ============================================================================== --- head/finance/qhacc/Makefile Mon Jun 17 15:32:04 2013 (r321136) +++ head/finance/qhacc/Makefile Mon Jun 17 15:33:12 2013 (r321137) @@ -1,107 +1,59 @@ -# New ports collection makefile for: qhacc -# Date created: 28 Dec 1999 -# Whom: Will Andrews -# +# Created by: Will Andrews # $FreeBSD$ -# PORTNAME= qhacc -PORTVERSION= 3.5 -PORTREVISION= 8 +PORTVERSION= 4.1 CATEGORIES= finance MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} +EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Simple QT-based financial manager -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash +LICENSE= GPLv2 # (or later) -DEPRECATED= Depends on QT3; unmaintained -EXPIRATION_DATE= 2013-07-01 +LIB_DEPENDS= qwt6:${PORTSDIR}/x11-toolkits/qwt6 -USE_AUTOTOOLS= libtool -USE_QT_VER= 3 -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \ - --with-qt-libs=${QT_PREFIX}/lib -MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ - AUTOHEADER="${TRUE}" -MAKE_JOBS_UNSAFE= yes -USE_LDCONFIG= yes - -QTCPPFLAGS+= ${PTHREAD_CFLAGS} -QTCFGLIBS+= ${PTHREAD_LIBS} - -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+= --enable-mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if defined(WITH_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+= --enable-psql -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif - -.if defined(WITH_SQLITE) -USE_SQLITE= yes -CONFIGURE_ARGS+= --enable-sqlite \ - --with-sqlite-libs="${LOCALBASE}/lib" \ - --with-sqlite-includes="${LOCALBASE}/include" -PLIST_SUB+= SQLITE="" -.else -PLIST_SUB+= SQLITE="@comment " -.endif +OPTIONS_DEFINE= DOCS -.if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.19:${PORTSDIR}/security/gpgme -CONFIGURE_ARGS+= --enable-gpg -PLIST_SUB+= GPGME="" -.else -PLIST_SUB+= GPGME="@comment " -.endif +USE_QT4= corelib gui sql moc_build qmake_build rcc_build uic_build +USE_GCC= 4.6+ +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes -.if defined(WITH_GENERATOR) -CONFIGURE_ARGS+= --enable-generator -PLIST_SUB+= GENERATOR="" -.else -PLIST_SUB+= GENERATOR="@comment " -.endif +DESKTOP_ENTRIES="QHacc" "" "" "${PORTNAME}" "" "" -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "QHacc has the following tunable option(s):" - @${ECHO_MSG} - @${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" - @${ECHO_MSG} " WITH_GPGME=yes Turns on GnuPG support" - @${ECHO_MSG} " WITH_GENERATOR=yes Turns on random-data generator support" - @${ECHO_MSG} +.include post-patch: @${REINPLACE_CMD} -e \ - 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/qhacc.in - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's| -O2||g ; \ - s| -g||g ; \ - s| -pedantic||g' + '/^INSTALLDIR/s|=.*|=${DATADIR}| ; \ + /^QWTINCS/s|=.*|=${LOCALBASE}/include/qwt6| ; \ + /^QWTLIBS/s|=.*|=${LOCALBASE}/lib -lqwt6| ; \ + /+= debug/s|^|#|' ${WRKSRC}/user.pri + @${REINPLACE_CMD} -e \ + 's|/usr/include|${LOCALBASE}/include| ; \ + s|-lqwt||' ${WRKSRC}/gui/gui.pro + @${REINPLACE_CMD} -e \ + 's|/../qm/|/../share/qhacc/|' ${WRKSRC}/gui/main.cpp + +do-configure: + @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS}) -post-install: +do-install: + (cd ${WRKSRC}/gui/build/release && ${INSTALL_PROGRAM} \ + qhacc ${PREFIX}/bin) + (cd ${WRKSRC}/engine/build/release && ${INSTALL_DATA} \ + libengine.so.1.0.0 ${PREFIX}/lib) + @${LN} -sf libengine.so.1.0.0 ${PREFIX}/lib/libengine.so + @${LN} -sf libengine.so.1.0.0 ${PREFIX}/lib/libengine.so.1 + @${LN} -sf libengine.so.1.0.0 ${PREFIX}/lib/libengine.so.1.0 @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${DATADIR} -.if !defined(NOPORTDOCS) + (cd ${WRKSRC}/qm && ${INSTALL_DATA} *.qm ${DATADIR}) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} -.for file in accounts jobs journals namedtrans preferences splits transactions - ${INSTALL_DATA} ${WRKSRC}/contrib/easysetup/${file} ${EXAMPLESDIR} +.for i in AUTHORS ChangeLog README THANKS TODO UPGRADE + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR}) .endfor .endif Modified: head/finance/qhacc/distinfo ============================================================================== --- head/finance/qhacc/distinfo Mon Jun 17 15:32:04 2013 (r321136) +++ head/finance/qhacc/distinfo Mon Jun 17 15:33:12 2013 (r321137) @@ -1,2 +1,2 @@ -SHA256 (qhacc-3.5.tar.gz) = 200dbab16a07f3c4e639dbd1582e15e6dc7f320766a3d29083a1b5119a1e85e8 -SIZE (qhacc-3.5.tar.gz) = 674309 +SHA256 (qhacc-4.1.tgz) = b00eb62914d2e9da6b2a6996467de0fc92e8cf13ef7c334a6a49c17dde0dca7d +SIZE (qhacc-4.1.tgz) = 131163 Modified: head/finance/qhacc/pkg-plist ============================================================================== --- head/finance/qhacc/pkg-plist Mon Jun 17 15:32:04 2013 (r321136) +++ head/finance/qhacc/pkg-plist Mon Jun 17 15:33:12 2013 (r321137) @@ -1,235 +1,14 @@ bin/qhacc -bin/qhacc-cli -bin/qhacc-config -bin/qhacc-gui -include/localfileplugin.h -include/plugininfo.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 -include/tableops.h -lib/libacct.a -lib/libacct.la -lib/libacct.so -lib/libacct.so.1 -lib/libarcio.a -lib/libarcio.la -lib/libarcio.so -lib/libarcio.so.2 -lib/libaves.a -lib/libaves.la -lib/libaves.so -lib/libaves.so.1 -lib/libbalances.a -lib/libbalances.la -lib/libbalances.so -lib/libbalances.so.1 -lib/libbudget.a -lib/libbudget.la -lib/libbudget.so -lib/libbudget.so.1 -lib/libcliimpio.a -lib/libcliimpio.la -lib/libcliimpio.so -lib/libcliimpio.so.2 -lib/libdbbase.a -lib/libdbbase.la -lib/libdbbase.so -lib/libdbbase.so.8 -lib/libdeltas.a -lib/libdeltas.la -lib/libdeltas.so -lib/libdeltas.so.1 -lib/libdoublebargraph.a -lib/libdoublebargraph.la -lib/libdoublebargraph.so -lib/libdoublebargraph.so.1 -lib/libdoublelinegraph.a -lib/libdoublelinegraph.la -lib/libdoublelinegraph.so -lib/libdoublelinegraph.so.1 -lib/libextprgio.a -lib/libextprgio.la -lib/libextprgio.so -lib/libextprgio.so.2 -lib/libfiledbio.a -lib/libfiledbio.la -lib/libfiledbio.so -lib/libfiledbio.so.8 -%%GENERATOR%%lib/libgenio.a -%%GENERATOR%%lib/libgenio.la -%%GENERATOR%%lib/libgenio.so -%%GENERATOR%%lib/libgenio.so.1 -%%GPGME%%lib/libgpgio.a -%%GPGME%%lib/libgpgio.la -%%GPGME%%lib/libgpgio.so -%%GPGME%%lib/libgpgio.so.2 -lib/libgraphbase.a -lib/libgraphbase.la -lib/libgraphbase.so -lib/libgraphbase.so.1 -lib/libjournal.a -lib/libjournal.la -lib/libjournal.so -lib/libjournal.so.1 -%%SQLITE%%lib/liblfsqliteio.a -%%SQLITE%%lib/liblfsqliteio.la -%%SQLITE%%lib/liblfsqliteio.so -%%SQLITE%%lib/liblfsqliteio.so.3 -%%MYSQL%%lib/libmysqlio.a -%%MYSQL%%lib/libmysqlio.la -%%MYSQL%%lib/libmysqlio.so -%%MYSQL%%lib/libmysqlio.so.2 -lib/libmbudget.a -lib/libmbudget.la -lib/libmbudget.so -lib/libmbudget.so.1 -lib/libmonthlygraph.a -lib/libmonthlygraph.la -lib/libmonthlygraph.so -lib/libmonthlygraph.so.1 -lib/libnativedbio.a -lib/libnativedbio.la -lib/libnativedbio.so -lib/libnativedbio.so.8 -lib/libpayee.a -lib/libpayee.la -lib/libpayee.so -lib/libpayee.so.1 -%%PGSQL%%lib/libpsqlio.a -%%PGSQL%%lib/libpsqlio.la -%%PGSQL%%lib/libpsqlio.so -%%PGSQL%%lib/libpsqlio.so.2 -lib/libpiegraph.a -lib/libpiegraph.la -lib/libpiegraph.so -lib/libpiegraph.so.1 -lib/libprofitloss.a -lib/libprofitloss.la -lib/libprofitloss.so -lib/libprofitloss.so.1 -lib/libqhacc.a -lib/libqhacc.la -lib/libqhacc.so -lib/libqhacc.so.8 -lib/libqhaccext.a -lib/libqhaccext.la -lib/libqhaccext.so -lib/libqhaccext.so.8 -lib/libqhaccutils.a -lib/libqhaccutils.la -lib/libqhaccutils.so -lib/libqhaccutils.so.8 -lib/libqifio.a -lib/libqifio.la -lib/libqifio.so -lib/libqifio.so.2 -lib/libshares.a -lib/libshares.la -lib/libshares.so -lib/libshares.so.1 -lib/libsinglebargraph.a -lib/libsinglebargraph.la -lib/libsinglebargraph.so -lib/libsinglebargraph.so.1 -lib/libsinglelinegraph.a -lib/libsinglelinegraph.la -lib/libsinglelinegraph.so -lib/libsinglelinegraph.so.1 -%%SQLITE%%lib/libsqliteio.a -%%SQLITE%%lib/libsqliteio.la -%%SQLITE%%lib/libsqliteio.so -%%SQLITE%%lib/libsqliteio.so.3 -lib/libtbal.a -lib/libtbal.la -lib/libtbal.so -lib/libtbal.so.1 -lib/libtrans.a -lib/libtrans.la -lib/libtrans.so -lib/libtrans.so.1 -lib/libupgradeio.a -lib/libupgradeio.la -lib/libupgradeio.so -lib/libupgradeio.so.2 -lib/libxmlio.a -lib/libxmlio.la -lib/libxmlio.so -lib/libxmlio.so.2 -lib/plugins/db/libextprgio.so -%%GPGME%%lib/plugins/db/libgpgio.so -%%SQLITE%%lib/plugins/db/liblfsqliteio.so -%%MYSQL%%lib/plugins/db/libmysqlio.so -%%PGSQL%%lib/plugins/db/libpsqlio.so -%%SQLITE%%lib/plugins/db/libsqliteio.so -lib/plugins/db/libupgradeio.so -lib/plugins/db/libxmlio.so -lib/plugins/export/libarcio.so -lib/plugins/export/libextprgio.so -%%GENERATOR%%lib/plugins/export/libgenio.so -%%GPGME%%lib/plugins/export/libgpgio.so -%%SQLITE%%lib/plugins/export/liblfsqliteio.so -%%MYSQL%%lib/plugins/export/libmysqlio.so -%%PGSQL%%lib/plugins/export/libpsqlio.so -%%SQLITE%%lib/plugins/export/libsqliteio.so -lib/plugins/export/libxmlio.so -lib/plugins/graph/libdoublebargraph.so -lib/plugins/graph/libdoublelinegraph.so -lib/plugins/graph/libpiegraph.so -lib/plugins/graph/libsinglebargraph.so -lib/plugins/graph/libsinglelinegraph.so -lib/plugins/import/libarcio.so -lib/plugins/import/libcliimpio.so -lib/plugins/import/libextprgio.so -%%GPGME%%lib/plugins/import/libgpgio.so -%%SQLITE%%lib/plugins/import/liblfsqliteio.so -%%MYSQL%%lib/plugins/import/libmysqlio.so -%%PGSQL%%lib/plugins/import/libpsqlio.so -lib/plugins/import/libqifio.so -%%SQLITE%%lib/plugins/import/libsqliteio.so -lib/plugins/import/libxmlio.so -lib/plugins/report/libacct.so -lib/plugins/report/libaves.so -lib/plugins/report/libbalances.so -lib/plugins/report/libbudget.so -lib/plugins/report/libdeltas.so -lib/plugins/report/libjournal.so -lib/plugins/report/libmbudget.so -lib/plugins/report/libpayee.so -lib/plugins/report/libprofitloss.so -lib/plugins/report/libshares.so -lib/plugins/report/libtbal.so -lib/plugins/report/libtrans.so -%%PORTDOCS%%%%DOCSDIR%%/advanced.html -%%PORTDOCS%%%%DOCSDIR%%/compiling.html -%%PORTDOCS%%%%DOCSDIR%%/faq.html -%%PORTDOCS%%%%DOCSDIR%%/formats.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/intro.html -%%PORTDOCS%%%%DOCSDIR%%/plugins.html -%%PORTDOCS%%%%DOCSDIR%%/primer.html -%%PORTDOCS%%%%DOCSDIR%%/using.html -%%PORTDOCS%%%%EXAMPLESDIR%%/accounts -%%PORTDOCS%%%%EXAMPLESDIR%%/jobs -%%PORTDOCS%%%%EXAMPLESDIR%%/journals -%%PORTDOCS%%%%EXAMPLESDIR%%/namedtrans -%%PORTDOCS%%%%EXAMPLESDIR%%/preferences -%%PORTDOCS%%%%EXAMPLESDIR%%/splits -%%PORTDOCS%%%%EXAMPLESDIR%%/transactions -%%DATADIR%%/qhacc_bg_BG.qm -%%DATADIR%%/qhacc_es_ES.qm +lib/libengine.so +lib/libengine.so.1 +lib/libengine.so.1.0 +lib/libengine.so.1.0.0 +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/UPGRADE +%%DATADIR%%/qhacc.es.qm @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry lib/plugins/report -@dirrmtry lib/plugins/import -@dirrmtry lib/plugins/graph -@dirrmtry lib/plugins/export -@dirrmtry lib/plugins/db