Updat to upstream version 0.4.8

PR:		197752
Submitted by:	kalten@gmx.at
Approved by:	maintainer (implicit)

4 files changed, 80 insertions, 20 deletions

diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index d2e7c42c06fa..f4e3aeee325e 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xournal
-PORTVERSION=	0.4.7
-PORTREVISION=	4
+PORTVERSION=	0.4.8
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -25,6 +24,44 @@ OPTIONS_DEFINE=		GHOSTSCRIPT DOCS
 GHOSTSCRIPT_DESC=	Install ghostscript (PS/PDF as bitmap bg)
 OPTIONS_DEFAULT=	GHOSTSCRIPT
 
+PORTDOCS_MAIN=	AUTHORS \
+		ChangeLog \
+		COPYING \
+		README
+PORTDOCS=	${PORTDOCS_MAIN} \
+		html-doc/screenshot.png \
+		html-doc/manual.html \
+		html-doc/pixmaps/lightgreen.png \
+		html-doc/pixmaps/medium.png \
+		html-doc/pixmaps/ruler.png \
+		html-doc/pixmaps/green.png \
+		html-doc/pixmaps/magenta.png \
+		html-doc/pixmaps/default-pen.png \
+		html-doc/pixmaps/lasso.png \
+		html-doc/pixmaps/highlighter.png \
+		html-doc/pixmaps/red.png \
+		html-doc/pixmaps/hand.png \
+		html-doc/pixmaps/fullscreen.png \
+		html-doc/pixmaps/white.png \
+		html-doc/pixmaps/xoj.svg \
+		html-doc/pixmaps/pencil.png \
+		html-doc/pixmaps/rect-select.png \
+		html-doc/pixmaps/stretch.png \
+		html-doc/pixmaps/blue.png \
+		html-doc/pixmaps/lightblue.png \
+		html-doc/pixmaps/orange.png \
+		html-doc/pixmaps/yellow.png \
+		html-doc/pixmaps/gray.png \
+		html-doc/pixmaps/xournal.svg \
+		html-doc/pixmaps/xournal.png \
+		html-doc/pixmaps/thin.png \
+		html-doc/pixmaps/thick.png \
+		html-doc/pixmaps/eraser.png \
+		html-doc/pixmaps/recycled.png \
+		html-doc/pixmaps/shapes.png \
+		html-doc/pixmaps/black.png \
+		html-doc/pixmaps/text-tool.png
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
@@ -34,11 +71,14 @@ USE_GHOSTSCRIPT_RUN=	yes
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \
-		-e 's|/usr/local/share|"$$(datadir)"|' \
-		-e 's|ln -s $$(DESTDIR)$$(pkgdatadir)/pixmaps|ln -s $$(pkgdatadir)/pixmaps|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install-doc-local)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS_MAIN:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html-doc
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} html-doc/ ${STAGEDIR}${DOCSDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xournal/distinfo b/graphics/xournal/distinfo
index 6bedbd13e602..d60a9afea406 100644
--- a/graphics/xournal/distinfo
+++ b/graphics/xournal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xournal-0.4.7.tar.gz) = d1ceb9c3a0b0172f7c2389bfe188a13cdc9f9f4c3ddc30095d635edf1367ac89
-SIZE (xournal-0.4.7.tar.gz) = 553391
+SHA256 (xournal-0.4.8.tar.gz) = 233887a38136452dcb4652c35d08366fc7355f57ed46753db83e3e0f3193ef30
+SIZE (xournal-0.4.8.tar.gz) = 641240
diff --git a/graphics/xournal/files/patch-Makefile.in b/graphics/xournal/files/patch-Makefile.in
index b6d09ac58616..69fd92721e57 100644
--- a/graphics/xournal/files/patch-Makefile.in
+++ b/graphics/xournal/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2011-01-31 16:28:59.925702117 +0100
-+++ Makefile.in	2011-01-31 16:36:50.591377695 +0100
-@@ -709,19 +709,21 @@
+--- Makefile.in.orig	2014-06-29 08:53:20.000000000 +0200
++++ Makefile.in	2015-02-23 22:51:49.000000000 +0100
+@@ -796,31 +796,29 @@
  	    fi \
  	  done \
  	fi; \
@@ -28,4 +28,27 @@
 +	fi
  
  desktop-install:
- 	if test "$(datadir)" = "/usr/share"; then \
+-	if test "$(datadir)" = "/usr/share"; then \
+-	  desktopdir=/usr/share; \
+-	else \
+-	  desktopdir=/usr/local/share; \
+-	fi; \
++	desktopdir=$(pkgdatadir); \
+ 	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
+ 	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
+ 	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
+ 	$(mkinstalldirs) $(DESTDIR)$$desktopdir/applications; \
+-	$(mkinstalldirs) $(DESTDIR)/usr/share/mimelnk/application; \
++	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mimelnk/application; \
+ 	$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
+ 	$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
+ 	if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
+@@ -828,7 +826,7 @@
+ 	fi; \
+ 	$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
+ 	$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
+-	$(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)/usr/share/mimelnk/application; \
++	$(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)$$desktopdir/mimelnk/application; \
+ 	if test -z "$(DESTDIR)"; then \
+ 	  echo "Updating desktop, mime, and icon databases."; \
+ 	  update-desktop-database; \
diff --git a/graphics/xournal/pkg-plist b/graphics/xournal/pkg-plist
index bef27acfe99e..85fc1b6d2e8e 100644
--- a/graphics/xournal/pkg-plist
+++ b/graphics/xournal/pkg-plist
@@ -1,13 +1,10 @@
 bin/xournal
-share/applications/xournal.desktop
-share/icons/hicolor/scalable/apps/xournal.svg
-share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
-share/icons/hicolor/scalable/mimetypes/xoj.svg
-share/mime/packages/xournal.xml
-share/mimelnk/application/x-xoj.desktop
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/pixmaps
-%%PORTDOCS%%%%DOCSDIR%%/screenshot.png
+share/xournal/applications/xournal.desktop
+share/xournal/icons/hicolor/scalable/apps/xournal.svg
+share/xournal/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
+share/xournal/icons/hicolor/scalable/mimetypes/xoj.svg
+share/xournal/mime/packages/xournal.xml
+share/xournal/mimelnk/application/x-xoj.desktop
 share/xournal/pixmaps/black.png
 share/xournal/pixmaps/blue.png
 share/xournal/pixmaps/default-pen.png