From 71cc207ecef37b934a05be8e57f44f35cf25a84f Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 21 Mar 2013 10:43:34 +0000 Subject: [PATCH] remove unneeded patch that broke build w/ newer ld. spotted by sthen@ --- productivity/qhacc/Makefile | 6 ++-- productivity/qhacc/distinfo | 3 -- .../patches/patch-plugins_reports_Makefile_in | 12 ------- productivity/qhacc/pkg/PFRAG.shared | 32 ----------------- productivity/qhacc/pkg/PLIST | 34 +++++++++++++++++-- 5 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 productivity/qhacc/patches/patch-plugins_reports_Makefile_in delete mode 100644 productivity/qhacc/pkg/PFRAG.shared diff --git a/productivity/qhacc/Makefile b/productivity/qhacc/Makefile index 8c090334993..7753d80fbd6 100644 --- a/productivity/qhacc/Makefile +++ b/productivity/qhacc/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2013/03/21 08:48:52 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2013/03/21 10:43:34 jasper Exp $ COMMENT= qt home accounting program DISTNAME= qhacc-3.4 -REVISION= 3 +REVISION= 4 CATEGORIES= productivity x11 HOMEPAGE= http://qhacc.sourceforge.net/ @@ -27,7 +27,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += GL X11 c m pthread stdc++ xcb WANTLIB += ICE SM Xcursor Xdamage Xext Xfixes Xft Xi Xinerama WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm drm expat fontconfig -WANTLIB += freetype jpeg lcms mng png z +WANTLIB += freetype jpeg lcms mng png z pthread-stubs MODULES= x11/qt3 diff --git a/productivity/qhacc/distinfo b/productivity/qhacc/distinfo index 276c74790ac..70cb8d9a950 100644 --- a/productivity/qhacc/distinfo +++ b/productivity/qhacc/distinfo @@ -1,5 +1,2 @@ -MD5 (qhacc-3.4.tar.gz) = YQVtI1NONuuW/CLwIZihJw== -RMD160 (qhacc-3.4.tar.gz) = MgqNk5dCglxBo287hDI5l6y7YuA= -SHA1 (qhacc-3.4.tar.gz) = +rQ5Xrj0x8AzrfRAMuTmbWq3CFs= SHA256 (qhacc-3.4.tar.gz) = wl+5LjgvaLVWREHwQ6d85SieDtJ0ASwGK2JGpvIq1Ro= SIZE (qhacc-3.4.tar.gz) = 673605 diff --git a/productivity/qhacc/patches/patch-plugins_reports_Makefile_in b/productivity/qhacc/patches/patch-plugins_reports_Makefile_in deleted file mode 100644 index fed2ba95e24..00000000000 --- a/productivity/qhacc/patches/patch-plugins_reports_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-plugins_reports_Makefile_in,v 1.1 2009/06/07 00:08:32 jasper Exp $ ---- plugins/reports/Makefile.in.orig Fri Jun 5 14:57:07 2009 -+++ plugins/reports/Makefile.in Fri Jun 5 14:58:18 2009 -@@ -335,7 +335,7 @@ target_alias = @target_alias@ - @PGPH_TRUE@libtbal_la_SOURCES = tbalreport.cpp - @PGPH_TRUE@libshares_la_SOURCES = sharesreport.cpp - @PGPH_TRUE@RELEASE = 1:0:0 --@PGPH_TRUE@ALLADDS = -l$(QHACCQT) -lqhaccutils -ltemp -+@PGPH_TRUE@ALLADDS = -l$(QHACCQT) -lqhaccutils -Wl,reporter.o - @PGPH_TRUE@libpayee_la_LIBADD = $(ALLADDS) - @PGPH_TRUE@libprofitloss_la_LIBADD = $(ALLADDS) - @PGPH_TRUE@libbalances_la_LIBADD = $(ALLADDS) diff --git a/productivity/qhacc/pkg/PFRAG.shared b/productivity/qhacc/pkg/PFRAG.shared deleted file mode 100644 index 5abc11ad304..00000000000 --- a/productivity/qhacc/pkg/PFRAG.shared +++ /dev/null @@ -1,32 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1 2009/06/07 00:08:32 jasper Exp $ -@lib lib/libacct.so.${LIBacct_VERSION} -@lib lib/libarcio.so.${LIBarcio_VERSION} -@lib lib/libaves.so.${LIBaves_VERSION} -@lib lib/libbalances.so.${LIBbalances_VERSION} -@lib lib/libbudget.so.${LIBbudget_VERSION} -@lib lib/libcliimpio.so.${LIBcliimpio_VERSION} -@lib lib/libdbbase.so.${LIBdbbase_VERSION} -@lib lib/libdeltas.so.${LIBdeltas_VERSION} -@lib lib/libdoublebargraph.so.${LIBdoublebargraph_VERSION} -@lib lib/libdoublelinegraph.so.${LIBdoublelinegraph_VERSION} -@lib lib/libextprgio.so.${LIBextprgio_VERSION} -@lib lib/libfiledbio.so.${LIBfiledbio_VERSION} -@lib lib/libgraphbase.so.${LIBgraphbase_VERSION} -@lib lib/libjournal.so.${LIBjournal_VERSION} -@lib lib/libmbudget.so.${LIBmbudget_VERSION} -@lib lib/libmonthlygraph.so.${LIBmonthlygraph_VERSION} -@lib lib/libnativedbio.so.${LIBnativedbio_VERSION} -@lib lib/libpayee.so.${LIBpayee_VERSION} -@lib lib/libpiegraph.so.${LIBpiegraph_VERSION} -@lib lib/libprofitloss.so.${LIBprofitloss_VERSION} -@lib lib/libqhacc.so.${LIBqhacc_VERSION} -@lib lib/libqhaccext.so.${LIBqhaccext_VERSION} -@lib lib/libqhaccutils.so.${LIBqhaccutils_VERSION} -@lib lib/libqifio.so.${LIBqifio_VERSION} -@lib lib/libshares.so.${LIBshares_VERSION} -@lib lib/libsinglebargraph.so.${LIBsinglebargraph_VERSION} -@lib lib/libsinglelinegraph.so.${LIBsinglelinegraph_VERSION} -@lib lib/libtbal.so.${LIBtbal_VERSION} -@lib lib/libtrans.so.${LIBtrans_VERSION} -@lib lib/libupgradeio.so.${LIBupgradeio_VERSION} -@lib lib/libxmlio.so.${LIBxmlio_VERSION} diff --git a/productivity/qhacc/pkg/PLIST b/productivity/qhacc/pkg/PLIST index 9a82458ec01..63ddb2e7ab9 100644 --- a/productivity/qhacc/pkg/PLIST +++ b/productivity/qhacc/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2009/06/07 00:08:32 jasper Exp $ -%%SHARED%% +@comment $OpenBSD: PLIST,v 1.4 2013/03/21 10:43:34 jasper Exp $ bin/qhacc @bin bin/qhacc-cli bin/qhacc-config @@ -19,66 +18,97 @@ 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