4 files changed, 58 insertions, 43 deletions

diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index 2c1d593fbe34..6898cf8c7949 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xournal
-PORTVERSION=	0.4.8
-PORTREVISION=	6
+PORTVERSION=	0.4.8.2016
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -12,10 +11,13 @@ COMMENT=	Notetaking application that can annotate PDFs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
-USES=		pkgconfig desktop-file-utils shared-mime-info
-USE_GNOME=	libgnomecanvas
+USES=		pkgconfig
+USE_GNOME=	cairo libgnomecanvas
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
 INSTALLS_ICONS=	yes
diff --git a/graphics/xournal/distinfo b/graphics/xournal/distinfo
index d60a9afea406..d0f3e5b8f788 100644
--- a/graphics/xournal/distinfo
+++ b/graphics/xournal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xournal-0.4.8.tar.gz) = 233887a38136452dcb4652c35d08366fc7355f57ed46753db83e3e0f3193ef30
-SIZE (xournal-0.4.8.tar.gz) = 641240
+TIMESTAMP = 1502998454
+SHA256 (xournal-0.4.8.2016.tar.gz) = b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+SIZE (xournal-0.4.8.2016.tar.gz) = 646082
diff --git a/graphics/xournal/files/patch-configure b/graphics/xournal/files/patch-configure
new file mode 100644
index 000000000000..25d8b47efd97
--- /dev/null
+++ b/graphics/xournal/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2017-07-20 18:30:25.000000000 +0000
++++ configure	2017-08-01 14:05:24.637135000 +0000
+@@ -5605,6 +5605,8 @@
+ case "$host" in
+  *-*-linux*)
+    os_linux=yes;;
++ *-*-freebsd*)
++   os_linux=yes;;
+  *)
+    os_linux=no;;
+ esac
diff --git a/graphics/xournal/pkg-plist b/graphics/xournal/pkg-plist
index 85fc1b6d2e8e..c824ea4bd006 100644
--- a/graphics/xournal/pkg-plist
+++ b/graphics/xournal/pkg-plist
@@ -1,37 +1,38 @@
 bin/xournal
-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
-share/xournal/pixmaps/eraser.png
-share/xournal/pixmaps/fullscreen.png
-share/xournal/pixmaps/gray.png
-share/xournal/pixmaps/green.png
-share/xournal/pixmaps/hand.png
-share/xournal/pixmaps/highlighter.png
-share/xournal/pixmaps/lasso.png
-share/xournal/pixmaps/lightblue.png
-share/xournal/pixmaps/lightgreen.png
-share/xournal/pixmaps/magenta.png
-share/xournal/pixmaps/medium.png
-share/xournal/pixmaps/orange.png
-share/xournal/pixmaps/pencil.png
-share/xournal/pixmaps/rect-select.png
-share/xournal/pixmaps/recycled.png
-share/xournal/pixmaps/red.png
-share/xournal/pixmaps/ruler.png
-share/xournal/pixmaps/shapes.png
-share/xournal/pixmaps/stretch.png
-share/xournal/pixmaps/text-tool.png
-share/xournal/pixmaps/thick.png
-share/xournal/pixmaps/thin.png
-share/xournal/pixmaps/white.png
-share/xournal/pixmaps/xoj.svg
-share/xournal/pixmaps/xournal.png
-share/xournal/pixmaps/xournal.svg
-share/xournal/pixmaps/yellow.png
+%%DATADIR%%/applications/xournal.desktop
+%%DATADIR%%/icons/hicolor/scalable/apps/xournal.svg
+%%DATADIR%%/icons/hicolor/scalable/mimetypes/application-x-xoj.svg
+%%DATADIR%%/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
+%%DATADIR%%/icons/hicolor/scalable/mimetypes/xoj.svg
+%%DATADIR%%/mime/packages/xournal.xml
+%%DATADIR%%/mimelnk/application/x-xoj.desktop
+%%DATADIR%%/pixmaps/black.png
+%%DATADIR%%/pixmaps/blue.png
+%%DATADIR%%/pixmaps/default-pen.png
+%%DATADIR%%/pixmaps/eraser.png
+%%DATADIR%%/pixmaps/fullscreen.png
+%%DATADIR%%/pixmaps/gray.png
+%%DATADIR%%/pixmaps/green.png
+%%DATADIR%%/pixmaps/hand.png
+%%DATADIR%%/pixmaps/highlighter.png
+%%DATADIR%%/pixmaps/lasso.png
+%%DATADIR%%/pixmaps/lightblue.png
+%%DATADIR%%/pixmaps/lightgreen.png
+%%DATADIR%%/pixmaps/magenta.png
+%%DATADIR%%/pixmaps/medium.png
+%%DATADIR%%/pixmaps/orange.png
+%%DATADIR%%/pixmaps/pencil.png
+%%DATADIR%%/pixmaps/rect-select.png
+%%DATADIR%%/pixmaps/recycled.png
+%%DATADIR%%/pixmaps/red.png
+%%DATADIR%%/pixmaps/ruler.png
+%%DATADIR%%/pixmaps/shapes.png
+%%DATADIR%%/pixmaps/stretch.png
+%%DATADIR%%/pixmaps/text-tool.png
+%%DATADIR%%/pixmaps/thick.png
+%%DATADIR%%/pixmaps/thin.png
+%%DATADIR%%/pixmaps/white.png
+%%DATADIR%%/pixmaps/xoj.svg
+%%DATADIR%%/pixmaps/xournal.png
+%%DATADIR%%/pixmaps/xournal.svg
+%%DATADIR%%/pixmaps/yellow.png