diff --git a/productivity/Makefile b/productivity/Makefile index 375e981bcff..76b463118fd 100644 --- a/productivity/Makefile +++ b/productivity/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2019/08/10 21:27:47 bcallah Exp $ +# $OpenBSD: Makefile,v 1.87 2020/02/04 06:26:27 rsadowski Exp $ SUBDIR = SUBDIR += akonadi @@ -34,7 +34,6 @@ SUBDIR += p5-Business-Tax-VAT-Validation SUBDIR += projectlibre SUBDIR += py-carddav - SUBDIR += qhacc SUBDIR += radicale SUBDIR += radicale2 SUBDIR += rednotebook diff --git a/productivity/qhacc/Makefile b/productivity/qhacc/Makefile deleted file mode 100644 index 2a165d27a41..00000000000 --- a/productivity/qhacc/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# $OpenBSD: Makefile,v 1.29 2019/07/12 20:48:59 sthen Exp $ - -COMMENT= qt home accounting program - -DISTNAME= qhacc-3.4 -REVISION= 9 -CATEGORIES= productivity x11 - -HOMEPAGE= http://qhacc.sourceforge.net/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qhacc/} - -MAINTAINER= Marc Espie - -SO_VERSION= 0.0 -# NOTE: Must bump minor version if any shlib's are removed from the -# components dir to avoid pkg_add -r issues. -.for _lib in acct arcio aves balances budget cliimpio dbbase deltas \ -doublebargraph doublelinegraph extprgio filedbio graphbase journal mbudget \ -monthlygraph nativedbio payee piegraph profitloss qhacc qhaccext qhaccutils \ -qifio shares singlebargraph singlelinegraph tbal trans upgradeio xmlio -SHARED_LIBS+= ${_lib} ${SO_VERSION} -.endfor - -# GPLv2+ -PERMIT_PACKAGE= Yes - -WANTLIB += GL ICE SM X11 X11-xcb Xcursor Xdamage Xext Xfixes -WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm c drm expat -WANTLIB += fontconfig freetype glapi jpeg lcms m mng png pthread -WANTLIB += ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx z -WANTLIB += xcb-dri3 xcb-present xcb-sync xcb-xfixes xshmfence - -COMPILER = base-clang ports-gcc base-gcc - -MODULES= x11/qt3 - -MAKE_ENV= QTDIR=${MODQT_LIBDIR} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} -MAKE_FLAGS= QTLIBDIR=${MODQT_LIBDIR} QTINCDIR=${MODQT_INCDIR} - -CONFIGURE_ENV= QTDIR=${MODQT_LIBDIR} \ - CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \ - LIBQVERSION=${SO_VERSION} - -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${MODQT_CONFIGURE_ARGS} - -DOCDIR= ${PREFIX}/share/doc/qhacc - -post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} - cd ${WRKSRC} && ${INSTALL_DATA} FILE_FORMAT ${DOCDIR} - -.include diff --git a/productivity/qhacc/distinfo b/productivity/qhacc/distinfo deleted file mode 100644 index 70cb8d9a950..00000000000 --- a/productivity/qhacc/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (qhacc-3.4.tar.gz) = wl+5LjgvaLVWREHwQ6d85SieDtJ0ASwGK2JGpvIq1Ro= -SIZE (qhacc-3.4.tar.gz) = 673605 diff --git a/productivity/qhacc/patches/patch-configure b/productivity/qhacc/patches/patch-configure deleted file mode 100644 index 78a0fcb7028..00000000000 --- a/productivity/qhacc/patches/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2012/08/20 07:39:36 jasper Exp $ ---- configure.orig Mon May 30 19:08:34 2005 -+++ configure Tue Jun 2 12:10:32 2009 -@@ -20821,7 +20821,8 @@ else - - if test -f $dir/libqt-mt.so.3 -o -f $dir/libqt.so.3 \ - -o -f $dir/libqt.dll.a -o -f $dir/libqt-mt.dll.a \ -- -o -f $dir/libqt.dylib -o -f $dir/libqt-mt.dylib -+ -o -f $dir/libqt.dylib -o -f $dir/libqt-mt.dylib \ -+ -o -f $dir/libqt-mt.so.* - then - echo "found in $dir" - QTLIBDIR=$dir diff --git a/productivity/qhacc/patches/patch-contrib_Makefile_in b/productivity/qhacc/patches/patch-contrib_Makefile_in deleted file mode 100644 index e8afeee89f9..00000000000 --- a/productivity/qhacc/patches/patch-contrib_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-contrib_Makefile_in,v 1.1 2009/06/07 00:08:32 jasper Exp $ ---- contrib/Makefile.in.orig Tue Jun 2 11:49:21 2009 -+++ contrib/Makefile.in Tue Jun 2 11:49:33 2009 -@@ -215,7 +215,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - SUBDIRS = easysetup - extras_DATA = qhacccvs.sh --extrasdir = $(datadir)/extras -+extrasdir = $(pkgdatadir)/extras - EXTRA_DIST = $(extras_DATA) libofx-from-066.patch Makefile.windows src.pro - all: all-recursive - diff --git a/productivity/qhacc/patches/patch-docs_Makefile_in b/productivity/qhacc/patches/patch-docs_Makefile_in deleted file mode 100644 index 15a43e91aa3..00000000000 --- a/productivity/qhacc/patches/patch-docs_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-docs_Makefile_in,v 1.1 2009/06/07 00:08:32 jasper Exp $ ---- docs/Makefile.in.orig Tue Jun 2 11:30:32 2009 -+++ docs/Makefile.in Tue Jun 2 11:38:58 2009 -@@ -208,7 +208,7 @@ html_DATA = index.html intro.html formats.html using.h - faq.html compiling.html advanced.html plugins.html - - EXTRA_DIST = $(html_DATA) uml.xmi --htmldir = $(datadir)/doc/html -+htmldir = $(datadir)/qhacc/doc/html - all: all-am - - .SUFFIXES: diff --git a/productivity/qhacc/patches/patch-lib_qhacc_cpp b/productivity/qhacc/patches/patch-lib_qhacc_cpp deleted file mode 100644 index fba361765a2..00000000000 --- a/productivity/qhacc/patches/patch-lib_qhacc_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_qhacc_cpp,v 1.1 2009/06/07 00:08:32 jasper Exp $ ---- lib/qhacc.cpp.orig Tue Jun 2 11:39:13 2009 -+++ lib/qhacc.cpp Tue Jun 2 11:39:29 2009 -@@ -55,7 +55,7 @@ - #include "localfileplugin.h" - #include "qhacc.moc" - --#include -+#include - - //const int QHacc::ROLLOVER=( int )std::pow( ( double )10, QC::DECIMALS ); - const int QHacc::ROLLOVER=100; diff --git a/productivity/qhacc/patches/patch-plugins_graphs_grapher_cpp b/productivity/qhacc/patches/patch-plugins_graphs_grapher_cpp deleted file mode 100644 index 316873f1cdf..00000000000 --- a/productivity/qhacc/patches/patch-plugins_graphs_grapher_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-plugins_graphs_grapher_cpp,v 1.1 2017/05/08 11:56:50 espie Exp $ -missing def - -Index: plugins/graphs/grapher.cpp ---- plugins/graphs/grapher.cpp.orig -+++ plugins/graphs/grapher.cpp -@@ -24,6 +24,8 @@ - - #include - #include -+#include -+using std::rand; - - const QString GraphBase::EMPTYSTR=QT_TR_NOOP( "No Transactions" ); - diff --git a/productivity/qhacc/patches/patch-qm_Makefile_in b/productivity/qhacc/patches/patch-qm_Makefile_in deleted file mode 100644 index 56d85905b65..00000000000 --- a/productivity/qhacc/patches/patch-qm_Makefile_in +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-qm_Makefile_in,v 1.1 2009/06/07 00:08:32 jasper Exp $ ---- qm/Makefile.in.orig Tue Jun 2 11:45:59 2009 -+++ qm/Makefile.in Tue Jun 2 11:46:48 2009 -@@ -250,12 +250,12 @@ distclean-libtool: - uninstall-info-am: - install-dataDATA: $(data_DATA) - @$(NORMAL_INSTALL) -- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)" -+ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)" - @list='$(data_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \ -- $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \ -+ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \ -+ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ - done - - uninstall-dataDATA: -@@ -303,7 +303,7 @@ check-am: all-am - check: check-am - all-am: Makefile $(DATA) - installdirs: -- for dir in "$(DESTDIR)$(datadir)"; do \ -+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done - install: install-am diff --git a/productivity/qhacc/patches/patch-src_Makefile_in b/productivity/qhacc/patches/patch-src_Makefile_in deleted file mode 100644 index 960bc0ee0df..00000000000 --- a/productivity/qhacc/patches/patch-src_Makefile_in +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/07 00:08:32 jasper Exp $ ---- src/Makefile.in.orig Mon May 30 19:08:33 2005 -+++ src/Makefile.in Tue Jun 2 11:49:45 2009 -@@ -249,9 +249,9 @@ qhacc_cli_SOURCES = qhacccli.cpp - noinst_HEADERS = qhaccview.h qhaccrecwin.h qhaccdialogs.h qhaccacctchsr.h transeditor.h qhaccwidget.h qhaccgrwin.h qhaccsubsetwin.h qhaccjrnlchsr.h qhacccli.h qhacclineedits.h splitdialog.h copystore.h guiconstants.h qhacclistview.h qhaccacctbox.h qhaccacctboxchsr.h qhaccacctdlg.h qhaccprefdlg.h metadialog.h - EXTRA_DIST = lupdate.info - SUBDIRS = pixmaps --INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(top_srcdir)/lib --qhacc_gui_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(LDFLAGS) -L. --qhacc_cli_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(LDFLAGS) -L. -+INCLUDES = -I$(top_srcdir)/lib $(all_includes) -I$(QTINCDIR) -+qhacc_gui_LDFLAGS = -L$(top_builddir)/lib -L. -L$(QTLIBDIR) $(LDFLAGS) -lX11 -lGL -+qhacc_cli_LDFLAGS = -L$(top_builddir)/lib -L. -L$(QTLIBDIR) $(LDFLAGS) -lX11 -lGL - - #qhacc_gui_LDADD = -l$(QHACCQT) -lqhacc -lqhaccutils -lmpatrol -lbfd -liberty - qhacc_gui_LDADD = -l$(QHACCQT) -lqhacc -lqhaccutils diff --git a/productivity/qhacc/patches/patch-src_qhacc_in b/productivity/qhacc/patches/patch-src_qhacc_in deleted file mode 100644 index 766559ea256..00000000000 --- a/productivity/qhacc/patches/patch-src_qhacc_in +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-src_qhacc_in,v 1.1 2009/06/07 00:08:32 jasper Exp $ ---- src/qhacc.in.orig Tue Jun 2 11:47:27 2009 -+++ src/qhacc.in Tue Jun 2 11:48:03 2009 -@@ -4,7 +4,7 @@ - # # - ############################################################### - --function helpq () { -+helpq () { - echo "Syntax: $0 [options]" - echo " General Options:" - echo " [-f|--home ] set QHACC_HOME" -@@ -39,13 +39,13 @@ PATH=@bindir@:$PATH - # You can change QHACC_ROOT and QHACC_HOME to fit your needs - QHACC_ROOT=${QHACC_ROOT:="@libdir@"} - QHACC_HOME=${QHACC_HOME:="${HOME}/.qhacc"} --QHACC_LANGDIR=${QHACC_LANGDIR:="@datadir@"} -+QHACC_LANGDIR=${QHACC_LANGDIR:="@pkgdatadir@/"} - - export LD_LIBRARY_PATH=$QHACC_ROOT:$LD_LIBRARY_PATH - --typeset USEGUI="YES" --typeset OPTIONS="" --typeset LANGFIRST="YES" -+USEGUI="YES" -+OPTIONS="" -+LANGFIRST="YES" - - while [ $# -gt 0 ] - do diff --git a/productivity/qhacc/pkg/DESCR b/productivity/qhacc/pkg/DESCR deleted file mode 100644 index bfe80131878..00000000000 --- a/productivity/qhacc/pkg/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -QHacc is a reasonably small, reasonably fast, reasonably featured home -accounting program for unix and unix-like systems. - -Some features: - American or European date formats - Memorized transactions - Split transactions - Double- or Single- entry bookkeeping - Several account types - Type-ahead text boxes and easy date selection fields diff --git a/productivity/qhacc/pkg/PLIST b/productivity/qhacc/pkg/PLIST deleted file mode 100644 index 63ddb2e7ab9..00000000000 --- a/productivity/qhacc/pkg/PLIST +++ /dev/null @@ -1,165 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.4 2013/03/21 10:43:34 jasper Exp $ -bin/qhacc -@bin bin/qhacc-cli -bin/qhacc-config -@bin 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 lib/libacct.so.${LIBacct_VERSION} -lib/libarcio.a -lib/libarcio.la -@lib lib/libarcio.so.${LIBarcio_VERSION} -lib/libaves.a -lib/libaves.la -@lib lib/libaves.so.${LIBaves_VERSION} -lib/libbalances.a -lib/libbalances.la -@lib lib/libbalances.so.${LIBbalances_VERSION} -lib/libbudget.a -lib/libbudget.la -@lib lib/libbudget.so.${LIBbudget_VERSION} -lib/libcliimpio.a -lib/libcliimpio.la -@lib lib/libcliimpio.so.${LIBcliimpio_VERSION} -lib/libdbbase.a -lib/libdbbase.la -@lib lib/libdbbase.so.${LIBdbbase_VERSION} -lib/libdeltas.a -lib/libdeltas.la -@lib lib/libdeltas.so.${LIBdeltas_VERSION} -lib/libdoublebargraph.a -lib/libdoublebargraph.la -@lib lib/libdoublebargraph.so.${LIBdoublebargraph_VERSION} -lib/libdoublelinegraph.a -lib/libdoublelinegraph.la -@lib lib/libdoublelinegraph.so.${LIBdoublelinegraph_VERSION} -lib/libextprgio.a -lib/libextprgio.la -@lib lib/libextprgio.so.${LIBextprgio_VERSION} -lib/libfiledbio.a -lib/libfiledbio.la -@lib lib/libfiledbio.so.${LIBfiledbio_VERSION} -lib/libgraphbase.a -lib/libgraphbase.la -@lib lib/libgraphbase.so.${LIBgraphbase_VERSION} -lib/libjournal.a -lib/libjournal.la -@lib lib/libjournal.so.${LIBjournal_VERSION} -lib/libmbudget.a -lib/libmbudget.la -@lib lib/libmbudget.so.${LIBmbudget_VERSION} -lib/libmonthlygraph.a -lib/libmonthlygraph.la -@lib lib/libmonthlygraph.so.${LIBmonthlygraph_VERSION} -lib/libnativedbio.a -lib/libnativedbio.la -@lib lib/libnativedbio.so.${LIBnativedbio_VERSION} -lib/libpayee.a -lib/libpayee.la -@lib lib/libpayee.so.${LIBpayee_VERSION} -lib/libpiegraph.a -lib/libpiegraph.la -@lib lib/libpiegraph.so.${LIBpiegraph_VERSION} -lib/libprofitloss.a -lib/libprofitloss.la -@lib lib/libprofitloss.so.${LIBprofitloss_VERSION} -lib/libqhacc.a -lib/libqhacc.la -@lib lib/libqhacc.so.${LIBqhacc_VERSION} -lib/libqhaccext.a -lib/libqhaccext.la -@lib lib/libqhaccext.so.${LIBqhaccext_VERSION} -lib/libqhaccutils.a -lib/libqhaccutils.la -@lib lib/libqhaccutils.so.${LIBqhaccutils_VERSION} -lib/libqifio.a -lib/libqifio.la -@lib lib/libqifio.so.${LIBqifio_VERSION} -lib/libshares.a -lib/libshares.la -@lib lib/libshares.so.${LIBshares_VERSION} -lib/libsinglebargraph.a -lib/libsinglebargraph.la -@lib lib/libsinglebargraph.so.${LIBsinglebargraph_VERSION} -lib/libsinglelinegraph.a -lib/libsinglelinegraph.la -@lib lib/libsinglelinegraph.so.${LIBsinglelinegraph_VERSION} -lib/libtbal.a -lib/libtbal.la -@lib lib/libtbal.so.${LIBtbal_VERSION} -lib/libtrans.a -lib/libtrans.la -@lib lib/libtrans.so.${LIBtrans_VERSION} -lib/libupgradeio.a -lib/libupgradeio.la -@lib lib/libupgradeio.so.${LIBupgradeio_VERSION} -lib/libxmlio.a -lib/libxmlio.la -@lib lib/libxmlio.so.${LIBxmlio_VERSION} -lib/plugins/ -lib/plugins/db/ -lib/plugins/db/libextprgio.so -lib/plugins/db/libupgradeio.so -lib/plugins/db/libxmlio.so -lib/plugins/export/ -lib/plugins/export/libarcio.so -lib/plugins/export/libextprgio.so -lib/plugins/export/libxmlio.so -lib/plugins/graph/ -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/ -lib/plugins/import/libarcio.so -lib/plugins/import/libcliimpio.so -lib/plugins/import/libextprgio.so -lib/plugins/import/libqifio.so -lib/plugins/import/libxmlio.so -lib/plugins/report/ -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 -share/doc/qhacc/ -share/doc/qhacc/FILE_FORMAT -share/qhacc/ -share/qhacc/doc/ -share/qhacc/doc/html/ -share/qhacc/doc/html/advanced.html -share/qhacc/doc/html/compiling.html -share/qhacc/doc/html/faq.html -share/qhacc/doc/html/formats.html -share/qhacc/doc/html/index.html -share/qhacc/doc/html/intro.html -share/qhacc/doc/html/plugins.html -share/qhacc/doc/html/primer.html -share/qhacc/doc/html/using.html -share/qhacc/extras/ -share/qhacc/extras/qhacccvs.sh -share/qhacc/qhacc_bg_BG.qm -share/qhacc/qhacc_bg_BG.ts -share/qhacc/qhacc_es_ES.qm -share/qhacc/qhacc_es_ES.ts