Update to 0.4.7 to address PR 46667 (build failure after poppler update)

by Jim Bernard, based on patch by Matthew Mondor.

Version 0.4.7 (July 4, 2012):

    insert image tool (based on patches by Victor Saase and Simon Guest)
    renamed "Journal" menu to "Page"
    paste images and text directly from and to other applications
    lasso tool (based on patch by Ian Woo Kim)

Version 0.4.6 (May 22, 2012):

    win32 portability code (contributed by Dirk Gerrits)
    fix bug in PDF export code on 64-bit systems (patch by Robert Buchholz)
    fix hand tool bug when exiting canvas (#2905711)
    Italian translation (Marco Poletti), German translation (Stefan Lembach)
    Spanish translation (Alvaro), Brazil Portuguese translation (Marco Souza)
    fix save bug with text boxes containing > 4095 characters
    Czech translation (David Kolibac), Dutch translation (Timo Kluck)
    fix crash upon unplugging input devices
    change close dialog box default to "save" (patch by Kit Barnes)
    option to force PDF background rendering via cairo (slower but nicer)
    wrapper for missing GdkPixbuf rendering function in newest poppler
    disable GTK+ XInput bugfix by default (#3429416)
    fix linker flags (#3208984); evdev coordinate fix (#3244118) (Timo Kluck)
    specify license version: GPL v2 or later
    fix 1.#J coordinates from win32 xoj files

3 files changed, 16 insertions, 11 deletions

diff --git a/editors/xournal/Makefile b/editors/xournal/Makefile
index 583a3b5405b..de0630b341b 100644
--- a/editors/xournal/Makefile
+++ b/editors/xournal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2012/06/23 19:19:05 dholland Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/07 20:33:09 wiz Exp $
 
-DISTNAME=	xournal-0.4.5
-PKGREVISION=	7
+DISTNAME=	xournal-0.4.7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xournal/}
 
diff --git a/editors/xournal/PLIST b/editors/xournal/PLIST
index 582cdde1336..d09478d908a 100644
--- a/editors/xournal/PLIST
+++ b/editors/xournal/PLIST
@@ -1,7 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/01 10:46:31 asau Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/07/07 20:33:09 wiz Exp $
 bin/xournal
 share/locale/ca/LC_MESSAGES/xournal.mo
+share/locale/cs/LC_MESSAGES/xournal.mo
+share/locale/de/LC_MESSAGES/xournal.mo
+share/locale/es/LC_MESSAGES/xournal.mo
 share/locale/fr/LC_MESSAGES/xournal.mo
+share/locale/it/LC_MESSAGES/xournal.mo
+share/locale/nl/LC_MESSAGES/xournal.mo
+share/locale/pt_BR/LC_MESSAGES/xournal.mo
+share/xournal/html-doc/manual.html
+share/xournal/html-doc/pixmaps
+share/xournal/html-doc/screenshot.png
 share/xournal/pixmaps/black.png
 share/xournal/pixmaps/blue.png
 share/xournal/pixmaps/default-pen.png
@@ -32,6 +41,3 @@ share/xournal/pixmaps/xoj.svg
 share/xournal/pixmaps/xournal.png
 share/xournal/pixmaps/xournal.svg
 share/xournal/pixmaps/yellow.png
-share/xournal/html-doc/manual.html
-share/xournal/html-doc/screenshot.png
-share/xournal/html-doc/pixmaps
diff --git a/editors/xournal/distinfo b/editors/xournal/distinfo
index f6471613522..53d0fe25386 100644
--- a/editors/xournal/distinfo
+++ b/editors/xournal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/12/01 10:46:31 asau Exp $
+$NetBSD: distinfo,v 1.2 2012/07/07 20:33:09 wiz Exp $
 
-SHA1 (xournal-0.4.5.tar.gz) = 390cb275774469ed1b04b7268dd625bd456c895e
-RMD160 (xournal-0.4.5.tar.gz) = a4228e6874482bd381c59cd8e3db1100361c1d40
-Size (xournal-0.4.5.tar.gz) = 425062 bytes
+SHA1 (xournal-0.4.7.tar.gz) = d2556bf21bef2df99bef0a6d1cb251d5e0f12d3f
+RMD160 (xournal-0.4.7.tar.gz) = 7735e37ba07c57fb89231a2a27cf6357490af699
+Size (xournal-0.4.7.tar.gz) = 553391 bytes