1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Update to 1.0.3

- Add new dependencies
- Changed NOPORTS to stay of accord with the default.

PR:		ports/139347
Submitted by:	Oleg Sidorkin <OSidorkin@gmail.com>
Approved by:	maintainer (timeout > 60 days), itetcu (mentor)
Feature safe:	yes
This commit is contained in:
Sylvio Cesar Teixeira 2010-03-02 00:07:06 +00:00
parent f70d809275
commit 9df13cbc23
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=250480
20 changed files with 2008 additions and 434 deletions

View File

@ -6,16 +6,16 @@
#
PORTNAME= kmymoney2
PORTVERSION= 0.8.9
PORTREVISION= 4
PORTVERSION= 1.0.3
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/KMyMoney/${PORTVERSION}
MAINTAINER= alecn2002@yandex.ru
COMMENT= KDE-based personal finance assistant
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
LIB_DEPENDS= osp.5:${PORTSDIR}/textproc/opensp
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS+= ofx.4:${PORTSDIR}/finance/libofx
@ -39,18 +39,20 @@ DOCSDIR= ${PREFIX}/share/doc/HTML/en/${PORTNAME}
.include <bsd.port.pre.mk>
.if defined(NOPORTDOCS)
CONFIGURE_ARGS= --enable-ofxplugin --enable-ofxbanking
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in \
${FILESDIR}/extra-patch-doc__en__Makefile.in
.else
.if !defined(NOPORTDOCS)
CONFIGURE_ARGS= --enable-ofxplugin --enable-ofxbanking --enable-pdf-docs
# Add more build-time dependencies to generate the PDF docs
BUILD_DEPENDS+= jade:${PORTSDIR}/textproc/jade \
pdfjadetex:${PORTSDIR}/print/jadetex \
html2ps:${PORTSDIR}/print/html2ps-letter \
dsssl-docbook-modular>=0:${PORTSDIR}/textproc/dsssl-docbook-modular
dsssl-docbook-modular>=0:${PORTSDIR}/textproc/dsssl-docbook-modular \
cppunit-config:${PORTSDIR}/devel/cppunit \
recode:${PORTSDIR}/converters/recode
.else
CONFIGURE_ARGS= --enable-ofxplugin --enable-ofxbanking
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in \
${FILESDIR}/extra-patch-doc__en__Makefile.in
.endif
post-patch:

View File

@ -1,3 +1,3 @@
MD5 (kmymoney2-0.8.9.tar.bz2) = 1f0c412f88b9344c18562fbca3c10717
SHA256 (kmymoney2-0.8.9.tar.bz2) = d23717d273e366ba84d7ef3138d71b1b7d758e6c626e83439df7fc1a567c3965
SIZE (kmymoney2-0.8.9.tar.bz2) = 6161688
MD5 (kmymoney2-1.0.3.tar.bz2) = f131bdf4d2c9f2f5778126fe2ade7c1e
SHA256 (kmymoney2-1.0.3.tar.bz2) = d2d15448626e8446ec8156af8da18f0618f82171e1928951baf912e349d7dc97
SIZE (kmymoney2-1.0.3.tar.bz2) = 12245425

View File

@ -1,11 +1,11 @@
--- ./Makefile.in.orig 2008-11-10 13:28:25.000000000 -0500
+++ ./Makefile.in 2008-11-10 13:28:33.000000000 -0500
@@ -347,7 +347,7 @@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
--- Makefile.in.orig 2010-02-23 22:14:08.000000000 -0300
+++ Makefile.in 2010-02-12 12:02:37.000000000 -0200
@@ -342,7 +342,7 @@
xdg_menudir = @xdg_menudir@
-SUBDIRS = libkgpgfile kmymoney2 po doc developer-doc
+SUBDIRS = libkgpgfile kmymoney2 po doc
# The following line adds the required admin files
EXTRA_DIST = kmymoney2.kdevprj AUTHORS COPYING ChangeLog INSTALL \
# just make sure, we don't ship the sqlite subdirectory with the tarball
-SOURCEDIRS = libkgpgfile libkdchart kmymoney2 po doc developer-doc
+SOURCEDIRS = libkgpgfile libkdchart kmymoney2 po doc
SUBDIRS = @SQLITE3@ $(SOURCEDIRS)
DIST_SUBDIRS = $(SOURCEDIRS) contrib

View File

@ -1,18 +1,18 @@
--- ./doc/en/Makefile.in.orig 2008-11-11 12:54:15.000000000 -0500
+++ ./doc/en/Makefile.in 2008-11-11 13:03:11.000000000 -0500
@@ -340,9 +340,9 @@
qifimport-qifprofiledate.png qifimport-qifprofileeditor.png \
report_configuration-reporttab.png \
report_configuration-rowscolumns.png reports_view-all.png
--- doc/en/Makefile.in.orig 2010-02-12 12:02:37.000000000 -0200
+++ doc/en/Makefile.in 2010-02-23 22:20:32.000000000 -0300
@@ -338,9 +338,9 @@
select_database.png budgets_view.png forecast_view.png \
newfile-2.png newfile-3.png newfile-4.png newfile-5.png \
newfile-6.png
-EXTRA_DIST = kmymoney2.1 $(DOCBOOK_FILES)
+EXTRA_DIST = kmymoney2.1
MOSTLYCLEANFILES = index.cache.bz2 kmymoney2.1.gz index.xml *.aux *.tex *.log **.out *.pdf errorlog *.ps *.html online-manual.tar.bz2
-BUILT_SOURCES = index.cache.bz2 kmymoney2.1.gz $(PDF_TARGET)
+BUILT_SOURCES = kmymoney2.1.gz
CHARSET =
KDE_LANG = en
KDE_DOCS = kmymoney2 - $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-user.pdf
@@ -495,7 +495,7 @@
@@ -492,7 +492,7 @@
#>- install-data-am:
#>+ 1
@ -21,7 +21,7 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -638,7 +638,7 @@
@@ -652,7 +652,7 @@
# Also install the man pages on this system
.PHONY: install-docs uninstall-docs

View File

@ -0,0 +1,10 @@
--- developer-doc/phb/Makefile.am.orig 2010-02-17 20:01:44.000000000 -0200
+++ developer-doc/phb/Makefile.am 2010-02-17 21:42:28.000000000 -0200
@@ -106,7 +106,6 @@
kmymoney-phb.pdf: $(DOCBOOK_FILES)
$(MAKE) get-files
$(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
- recode utf8..latin1 index.html
html2ps -o kmymoney-phb.ps -n index.html
ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
rm index.html kmymoney-phb.ps

View File

@ -1,29 +1,18 @@
--- ./developer-doc/phb/Makefile.in.orig 2008-11-07 15:38:59.000000000 -0500
+++ ./developer-doc/phb/Makefile.in 2008-11-07 15:42:05.000000000 -0500
@@ -314,7 +314,7 @@
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-phb.pdf
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-phb.pdf
STYLESHEET = kde-nochunk.xsl
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl
#>- all: all-am
#>+ 1
all: docs-am all-am
@@ -532,13 +532,13 @@
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@kmymoney-phb.pdf: phb.docbook.tex
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating PDF document"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex phb.docbook.tex > errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex phb.docbook.tex > errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating bookmarks"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex phb.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex phb.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating page numbers for table of contents"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex phb.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex phb.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ mv phb.docbook.pdf kmymoney-phb.pdf
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ rm phb.docbook.aux phb.docbook.log phb.docbook.out errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ rm -f phb.docbook.aux phb.docbook.log phb.docbook.out errorlog
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@kmymoney-phb.pdf: phb.html
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ html2ps -D -t phb.html | ps2pdf14 - phb.pdf
--- developer-doc/phb/Makefile.in.orig 2010-02-17 20:02:33.000000000 -0200
+++ developer-doc/phb/Makefile.in 2010-02-17 21:43:06.000000000 -0200
@@ -238,7 +238,6 @@
exec_prefix = @exec_prefix@
found_html2ps = @found_html2ps@
found_ps2pdf = @found_ps2pdf@
-found_recode = @found_recode@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -583,7 +582,6 @@
@GENERATE_PDF_TRUE@kmymoney-phb.pdf: $(DOCBOOK_FILES)
@GENERATE_PDF_TRUE@ $(MAKE) get-files
@GENERATE_PDF_TRUE@ $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
-@GENERATE_PDF_TRUE@ recode utf8..latin1 index.html
@GENERATE_PDF_TRUE@ html2ps -o kmymoney-phb.ps -n index.html
@GENERATE_PDF_TRUE@ ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
@GENERATE_PDF_TRUE@ rm index.html kmymoney-phb.ps

View File

@ -0,0 +1,20 @@
--- doc/en/Makefile.am.orig 2010-02-17 20:04:44.000000000 -0200
+++ doc/en/Makefile.am 2010-02-17 21:47:06.000000000 -0200
@@ -87,9 +87,6 @@
for file in $(DOCBOOK_FILES); do \
cp $(srcdir)/$$file .; \
chmod +w $$file; \
- if test -n $(CHARSET); then \
- recode utf-8..$(CHARSET) $$file; \
- fi \
done; \
for file in $(SCREENSHOT_FILES); do \
cp $(srcdir)/$$file .; \
@@ -111,7 +108,6 @@
kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
$(MAKE) get-files
$(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html;
- recode utf8..latin1 index.html
html2ps -o kmymoney-user.ps -n index.html
ps2pdf kmymoney-user.ps kmymoney-user.pdf
rm index.html kmymoney-user.ps

View File

@ -1,66 +1,28 @@
--- ./doc/en/Makefile.in.orig 2008-03-24 10:50:03.000000000 -0400
+++ ./doc/en/Makefile.in 2008-11-07 15:27:27.000000000 -0500
@@ -347,7 +347,7 @@
KDE_DOCS = kmymoney2 - $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-user.pdf
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-user.pdf
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl
#>- all: $(BUILT_SOURCES)
#>+ 1
all: docs-am $(BUILT_SOURCES)
@@ -571,11 +571,11 @@
cd online-manual; \
splitup-kde-chunk-online; \
cd ..; \
- make get-files; \
+ ${MAKE} get-files; \
for file in $(SCREENSHOT_FILES); do \
cp $$file online-manual; \
done; \
- make clear-files; \
+ ${MAKE} clear-files; \
cp $(kde_libs_htmldir)/en/common/* common; \
tar -cjf online-manual.tar.bz2 common online-manual; \
rm -rf index.xml online-manual common; \
@@ -607,31 +607,31 @@
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ fi
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@index.docbook.tex: $(DOCBOOK_FILES) $(SCREENSHOTFILES)
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make get-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} get-files
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ -jade -t tex -d $(DOCBOOK_DSL) -D `dirname $(KDE_XSL_STYLESHEET)` -D $(kde_libs_htmldir)/en/common index.docbook
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make clear-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} clear-files
#index.docbook.tex: index.cache.bz2
# -jade -t tex -d $(DOCBOOK_DSL) -D `dirname $(KDE_XSL_STYLESHEET)` -D $(kde_libs_htmldir)/en/common index.docbook
#
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@kmymoney-user.pdf: index.docbook.tex
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make get-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} get-files
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating PDF document"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex index.docbook.tex > errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex index.docbook.tex > errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating bookmarks"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex index.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex index.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating page numbers for table of contents"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex index.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex index.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @mv index.docbook.pdf kmymoney-user.pdf
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make clear-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} clear-files
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@kmymoney-user.pdf: index.html
-@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ make get-files
+@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ ${MAKE} get-files
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ html2ps -D -t -o index.ps index.html
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ ps2pdf14 index.ps kmymoney-user.pdf
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ rm index.ps
-@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ make clear-files
+@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ ${MAKE} clear-files
# The automatic KDE install installs some files,
# that we don't need, so we remove them immediately.
--- doc/en/Makefile.in.orig 2010-02-17 20:06:19.000000000 -0200
+++ doc/en/Makefile.in 2010-02-17 21:46:14.000000000 -0200
@@ -238,7 +238,6 @@
exec_prefix = @exec_prefix@
found_html2ps = @found_html2ps@
found_ps2pdf = @found_ps2pdf@
-found_recode = @found_recode@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -620,9 +619,6 @@
for file in $(DOCBOOK_FILES); do \
cp $(srcdir)/$$file .; \
chmod +w $$file; \
- if test -n $(CHARSET); then \
- recode utf-8..$(CHARSET) $$file; \
- fi \
done; \
for file in $(SCREENSHOT_FILES); do \
cp $(srcdir)/$$file .; \
@@ -641,7 +637,6 @@
@GENERATE_PDF_TRUE@kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
@GENERATE_PDF_TRUE@ $(MAKE) get-files
@GENERATE_PDF_TRUE@ $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html;
-@GENERATE_PDF_TRUE@ recode utf8..latin1 index.html
@GENERATE_PDF_TRUE@ html2ps -o kmymoney-user.ps -n index.html
@GENERATE_PDF_TRUE@ ps2pdf kmymoney-user.ps kmymoney-user.pdf
@GENERATE_PDF_TRUE@ rm index.html kmymoney-user.ps

View File

@ -1,11 +0,0 @@
--- ./kmymoney2/plugins/Makefile.in.orig 2008-03-24 10:50:04.000000000 -0400
+++ ./kmymoney2/plugins/Makefile.in 2008-10-10 09:39:06.000000000 -0400
@@ -389,7 +389,7 @@
INCLUDES = $(all_includes) -I$(top_srcdir) -I.
# since some of the subdirs are conditional, we need to define DIST_SUBDIRS
-SUBDIRS = interfaces @ofx_importerplugin@ @kbanking_plugin@
+SUBDIRS = . interfaces @ofx_importerplugin@ @kbanking_plugin@
DIST_SUBDIRS = interfaces kbanking ofximport
# The library containing the plugin base class

File diff suppressed because it is too large Load Diff

View File

@ -6,16 +6,16 @@
#
PORTNAME= kmymoney2
PORTVERSION= 0.8.9
PORTREVISION= 4
PORTVERSION= 1.0.3
CATEGORIES= finance
MASTER_SITES= SF/${PORTNAME}/KMyMoney/${PORTVERSION}
MAINTAINER= alecn2002@yandex.ru
COMMENT= KDE-based personal finance assistant
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
LIB_DEPENDS= osp.5:${PORTSDIR}/textproc/opensp
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS+= ofx.4:${PORTSDIR}/finance/libofx
@ -39,18 +39,20 @@ DOCSDIR= ${PREFIX}/share/doc/HTML/en/${PORTNAME}
.include <bsd.port.pre.mk>
.if defined(NOPORTDOCS)
CONFIGURE_ARGS= --enable-ofxplugin --enable-ofxbanking
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in \
${FILESDIR}/extra-patch-doc__en__Makefile.in
.else
.if !defined(NOPORTDOCS)
CONFIGURE_ARGS= --enable-ofxplugin --enable-ofxbanking --enable-pdf-docs
# Add more build-time dependencies to generate the PDF docs
BUILD_DEPENDS+= jade:${PORTSDIR}/textproc/jade \
pdfjadetex:${PORTSDIR}/print/jadetex \
html2ps:${PORTSDIR}/print/html2ps-letter \
dsssl-docbook-modular>=0:${PORTSDIR}/textproc/dsssl-docbook-modular
dsssl-docbook-modular>=0:${PORTSDIR}/textproc/dsssl-docbook-modular \
cppunit-config:${PORTSDIR}/devel/cppunit \
recode:${PORTSDIR}/converters/recode
.else
CONFIGURE_ARGS= --enable-ofxplugin --enable-ofxbanking
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.in \
${FILESDIR}/extra-patch-doc__en__Makefile.in
.endif
post-patch:

View File

@ -1,3 +1,3 @@
MD5 (kmymoney2-0.8.9.tar.bz2) = 1f0c412f88b9344c18562fbca3c10717
SHA256 (kmymoney2-0.8.9.tar.bz2) = d23717d273e366ba84d7ef3138d71b1b7d758e6c626e83439df7fc1a567c3965
SIZE (kmymoney2-0.8.9.tar.bz2) = 6161688
MD5 (kmymoney2-1.0.3.tar.bz2) = f131bdf4d2c9f2f5778126fe2ade7c1e
SHA256 (kmymoney2-1.0.3.tar.bz2) = d2d15448626e8446ec8156af8da18f0618f82171e1928951baf912e349d7dc97
SIZE (kmymoney2-1.0.3.tar.bz2) = 12245425

View File

@ -1,11 +1,11 @@
--- ./Makefile.in.orig 2008-11-10 13:28:25.000000000 -0500
+++ ./Makefile.in 2008-11-10 13:28:33.000000000 -0500
@@ -347,7 +347,7 @@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
--- Makefile.in.orig 2010-02-23 22:14:08.000000000 -0300
+++ Makefile.in 2010-02-12 12:02:37.000000000 -0200
@@ -342,7 +342,7 @@
xdg_menudir = @xdg_menudir@
-SUBDIRS = libkgpgfile kmymoney2 po doc developer-doc
+SUBDIRS = libkgpgfile kmymoney2 po doc
# The following line adds the required admin files
EXTRA_DIST = kmymoney2.kdevprj AUTHORS COPYING ChangeLog INSTALL \
# just make sure, we don't ship the sqlite subdirectory with the tarball
-SOURCEDIRS = libkgpgfile libkdchart kmymoney2 po doc developer-doc
+SOURCEDIRS = libkgpgfile libkdchart kmymoney2 po doc
SUBDIRS = @SQLITE3@ $(SOURCEDIRS)
DIST_SUBDIRS = $(SOURCEDIRS) contrib

View File

@ -1,18 +1,18 @@
--- ./doc/en/Makefile.in.orig 2008-11-11 12:54:15.000000000 -0500
+++ ./doc/en/Makefile.in 2008-11-11 13:03:11.000000000 -0500
@@ -340,9 +340,9 @@
qifimport-qifprofiledate.png qifimport-qifprofileeditor.png \
report_configuration-reporttab.png \
report_configuration-rowscolumns.png reports_view-all.png
--- doc/en/Makefile.in.orig 2010-02-12 12:02:37.000000000 -0200
+++ doc/en/Makefile.in 2010-02-23 22:20:32.000000000 -0300
@@ -338,9 +338,9 @@
select_database.png budgets_view.png forecast_view.png \
newfile-2.png newfile-3.png newfile-4.png newfile-5.png \
newfile-6.png
-EXTRA_DIST = kmymoney2.1 $(DOCBOOK_FILES)
+EXTRA_DIST = kmymoney2.1
MOSTLYCLEANFILES = index.cache.bz2 kmymoney2.1.gz index.xml *.aux *.tex *.log **.out *.pdf errorlog *.ps *.html online-manual.tar.bz2
-BUILT_SOURCES = index.cache.bz2 kmymoney2.1.gz $(PDF_TARGET)
+BUILT_SOURCES = kmymoney2.1.gz
CHARSET =
KDE_LANG = en
KDE_DOCS = kmymoney2 - $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-user.pdf
@@ -495,7 +495,7 @@
@@ -492,7 +492,7 @@
#>- install-data-am:
#>+ 1
@ -21,7 +21,7 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -638,7 +638,7 @@
@@ -652,7 +652,7 @@
# Also install the man pages on this system
.PHONY: install-docs uninstall-docs

View File

@ -0,0 +1,10 @@
--- developer-doc/phb/Makefile.am.orig 2010-02-17 20:01:44.000000000 -0200
+++ developer-doc/phb/Makefile.am 2010-02-17 21:42:28.000000000 -0200
@@ -106,7 +106,6 @@
kmymoney-phb.pdf: $(DOCBOOK_FILES)
$(MAKE) get-files
$(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
- recode utf8..latin1 index.html
html2ps -o kmymoney-phb.ps -n index.html
ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
rm index.html kmymoney-phb.ps

View File

@ -1,29 +1,18 @@
--- ./developer-doc/phb/Makefile.in.orig 2008-11-07 15:38:59.000000000 -0500
+++ ./developer-doc/phb/Makefile.in 2008-11-07 15:42:05.000000000 -0500
@@ -314,7 +314,7 @@
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-phb.pdf
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-phb.pdf
STYLESHEET = kde-nochunk.xsl
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl
#>- all: all-am
#>+ 1
all: docs-am all-am
@@ -532,13 +532,13 @@
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@kmymoney-phb.pdf: phb.docbook.tex
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating PDF document"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex phb.docbook.tex > errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex phb.docbook.tex > errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating bookmarks"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex phb.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex phb.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating page numbers for table of contents"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex phb.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex phb.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ mv phb.docbook.pdf kmymoney-phb.pdf
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ rm phb.docbook.aux phb.docbook.log phb.docbook.out errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ rm -f phb.docbook.aux phb.docbook.log phb.docbook.out errorlog
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@kmymoney-phb.pdf: phb.html
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ html2ps -D -t phb.html | ps2pdf14 - phb.pdf
--- developer-doc/phb/Makefile.in.orig 2010-02-17 20:02:33.000000000 -0200
+++ developer-doc/phb/Makefile.in 2010-02-17 21:43:06.000000000 -0200
@@ -238,7 +238,6 @@
exec_prefix = @exec_prefix@
found_html2ps = @found_html2ps@
found_ps2pdf = @found_ps2pdf@
-found_recode = @found_recode@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -583,7 +582,6 @@
@GENERATE_PDF_TRUE@kmymoney-phb.pdf: $(DOCBOOK_FILES)
@GENERATE_PDF_TRUE@ $(MAKE) get-files
@GENERATE_PDF_TRUE@ $(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
-@GENERATE_PDF_TRUE@ recode utf8..latin1 index.html
@GENERATE_PDF_TRUE@ html2ps -o kmymoney-phb.ps -n index.html
@GENERATE_PDF_TRUE@ ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
@GENERATE_PDF_TRUE@ rm index.html kmymoney-phb.ps

View File

@ -0,0 +1,20 @@
--- doc/en/Makefile.am.orig 2010-02-17 20:04:44.000000000 -0200
+++ doc/en/Makefile.am 2010-02-17 21:47:06.000000000 -0200
@@ -87,9 +87,6 @@
for file in $(DOCBOOK_FILES); do \
cp $(srcdir)/$$file .; \
chmod +w $$file; \
- if test -n $(CHARSET); then \
- recode utf-8..$(CHARSET) $$file; \
- fi \
done; \
for file in $(SCREENSHOT_FILES); do \
cp $(srcdir)/$$file .; \
@@ -111,7 +108,6 @@
kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
$(MAKE) get-files
$(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html;
- recode utf8..latin1 index.html
html2ps -o kmymoney-user.ps -n index.html
ps2pdf kmymoney-user.ps kmymoney-user.pdf
rm index.html kmymoney-user.ps

View File

@ -1,66 +1,28 @@
--- ./doc/en/Makefile.in.orig 2008-03-24 10:50:03.000000000 -0400
+++ ./doc/en/Makefile.in 2008-11-07 15:27:27.000000000 -0500
@@ -347,7 +347,7 @@
KDE_DOCS = kmymoney2 - $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-user.pdf
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@PDF_TARGET = kmymoney-user.pdf
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/share/sgml/docbook/dsssl-stylesheets/print/docbook.dsl
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@DOCBOOK_DSL = /usr/local/share/sgml/docbook/dsssl/modular/print/docbook.dsl
#>- all: $(BUILT_SOURCES)
#>+ 1
all: docs-am $(BUILT_SOURCES)
@@ -571,11 +571,11 @@
cd online-manual; \
splitup-kde-chunk-online; \
cd ..; \
- make get-files; \
+ ${MAKE} get-files; \
for file in $(SCREENSHOT_FILES); do \
cp $$file online-manual; \
done; \
- make clear-files; \
+ ${MAKE} clear-files; \
cp $(kde_libs_htmldir)/en/common/* common; \
tar -cjf online-manual.tar.bz2 common online-manual; \
rm -rf index.xml online-manual common; \
@@ -607,31 +607,31 @@
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ fi
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@index.docbook.tex: $(DOCBOOK_FILES) $(SCREENSHOTFILES)
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make get-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} get-files
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ -jade -t tex -d $(DOCBOOK_DSL) -D `dirname $(KDE_XSL_STYLESHEET)` -D $(kde_libs_htmldir)/en/common index.docbook
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make clear-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} clear-files
#index.docbook.tex: index.cache.bz2
# -jade -t tex -d $(DOCBOOK_DSL) -D `dirname $(KDE_XSL_STYLESHEET)` -D $(kde_libs_htmldir)/en/common index.docbook
#
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@kmymoney-user.pdf: index.docbook.tex
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make get-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} get-files
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating PDF document"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex index.docbook.tex > errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex index.docbook.tex > errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating bookmarks"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex index.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex index.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @echo "Generating page numbers for table of contents"
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @pdfjadetex index.docbook.tex >> errorlog
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @-pdfjadetex index.docbook.tex >> errorlog
@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ @mv index.docbook.pdf kmymoney-user.pdf
-@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ make clear-files
+@HAVE_DSSSLCONVERSIONTOOLS_TRUE@ ${MAKE} clear-files
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@kmymoney-user.pdf: index.html
-@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ make get-files
+@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ ${MAKE} get-files
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ html2ps -D -t -o index.ps index.html
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ ps2pdf14 index.ps kmymoney-user.pdf
@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ rm index.ps
-@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ make clear-files
+@HAVE_DSSSLCONVERSIONTOOLS_FALSE@@HAVE_HTMLCONVERSIONTOOLS_TRUE@ ${MAKE} clear-files
# The automatic KDE install installs some files,
# that we don't need, so we remove them immediately.
--- doc/en/Makefile.in.orig 2010-02-17 20:06:19.000000000 -0200
+++ doc/en/Makefile.in 2010-02-17 21:46:14.000000000 -0200
@@ -238,7 +238,6 @@
exec_prefix = @exec_prefix@
found_html2ps = @found_html2ps@
found_ps2pdf = @found_ps2pdf@
-found_recode = @found_recode@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -620,9 +619,6 @@
for file in $(DOCBOOK_FILES); do \
cp $(srcdir)/$$file .; \
chmod +w $$file; \
- if test -n $(CHARSET); then \
- recode utf-8..$(CHARSET) $$file; \
- fi \
done; \
for file in $(SCREENSHOT_FILES); do \
cp $(srcdir)/$$file .; \
@@ -641,7 +637,6 @@
@GENERATE_PDF_TRUE@kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
@GENERATE_PDF_TRUE@ $(MAKE) get-files
@GENERATE_PDF_TRUE@ $(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/index.docbook -o index.html;
-@GENERATE_PDF_TRUE@ recode utf8..latin1 index.html
@GENERATE_PDF_TRUE@ html2ps -o kmymoney-user.ps -n index.html
@GENERATE_PDF_TRUE@ ps2pdf kmymoney-user.ps kmymoney-user.pdf
@GENERATE_PDF_TRUE@ rm index.html kmymoney-user.ps

View File

@ -1,11 +0,0 @@
--- ./kmymoney2/plugins/Makefile.in.orig 2008-03-24 10:50:04.000000000 -0400
+++ ./kmymoney2/plugins/Makefile.in 2008-10-10 09:39:06.000000000 -0400
@@ -389,7 +389,7 @@
INCLUDES = $(all_includes) -I$(top_srcdir) -I.
# since some of the subdirs are conditional, we need to define DIST_SUBDIRS
-SUBDIRS = interfaces @ofx_importerplugin@ @kbanking_plugin@
+SUBDIRS = . interfaces @ofx_importerplugin@ @kbanking_plugin@
DIST_SUBDIRS = interfaces kbanking ofximport
# The library containing the plugin base class

File diff suppressed because it is too large Load Diff