Index: head/graphics/xournal/Makefile
===================================================================
--- head/graphics/xournal/Makefile	(revision 449382)
+++ head/graphics/xournal/Makefile	(revision 449383)
@@ -1,82 +1,78 @@
 # Created by: Jan Henrik Sylvester <me@janh.de>
 # $FreeBSD$
 
 PORTNAME=	xournal
 PORTVERSION=	0.4.8.2016
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	me@janh.de
 COMMENT=	Notetaking application that can annotate PDFs
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		pkgconfig
+USES=		pkgconfig desktop-file-utils shared-mime-info
 USE_GNOME=	cairo libgnomecanvas
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install desktop-install
 
 OPTIONS_DEFINE=		GHOSTSCRIPT DOCS
 GHOSTSCRIPT_DESC=	Install ghostscript (PS/PDF as bitmap bg)
 OPTIONS_DEFAULT=	GHOSTSCRIPT
 
 GHOSTSCRIPT_USES=	ghostscript:run
+MAKE_ENV+=		DATADIR=${DATADIR}
 
 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
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|$$(DESTDIR)/usr/share/|$$(DESTDIR)$$$$desktopdir/|g' \
-		${WRKSRC}/Makefile.in
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS_MAIN:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html-doc
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} html-doc/ ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/graphics/xournal/files/patch-Makefile.in
===================================================================
--- head/graphics/xournal/files/patch-Makefile.in	(revision 449382)
+++ head/graphics/xournal/files/patch-Makefile.in	(revision 449383)
@@ -1,54 +1,63 @@
---- 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 @@
+--- Makefile.in.orig	2017-07-20 18:30:27 UTC
++++ Makefile.in
+@@ -809,38 +809,36 @@ uninstall-am:
+ install-data-local:
+ 	@$(NORMAL_INSTALL)
+ 	if test -d $(srcdir)/pixmaps; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
++	  $(mkinstalldirs) $(DESTDIR)$(DATADIR)/pixmaps; \
+ 	  for pixmap in $(srcdir)/pixmaps/*; do \
+ 	    if test -f $$pixmap; then \
+-	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
++	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(DATADIR)/pixmaps; \
  	    fi \
  	  done \
  	fi; \
 +	echo "*** Desktop files, icons, MIME types not installed. Run 'make desktop-install'"; \
 +	echo "*** (or 'make home-desktop-install' for installation in a home directory)."
 +
 +install-doc-local:
  	if test -d $(srcdir)/html-doc; then \
 -	  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/html-doc; \
 +	  $(mkinstalldirs) $(DESTDIR)$(docdir); \
  	  for docfile in $(srcdir)/html-doc/*; do \
  	    if test -f $$docfile; then \
 -	      $(INSTALL_DATA) $$docfile $(DESTDIR)$(pkgdatadir)/html-doc; \
 +	      $(INSTALL_DATA) $$docfile $(DESTDIR)$(docdir); \
  	    fi \
  	  done; \
 -	  if test ! -e $(DESTDIR)$(pkgdatadir)/html-doc/pixmaps; then \
 -	    ln -s ../pixmaps $(DESTDIR)$(pkgdatadir)/html-doc/pixmaps; \
 +	  if test ! -e $(DESTDIR)$(docdir)/pixmaps; then \
 +	    ln -s $(DESTDIR)$(pkgdatadir)/pixmaps $(DESTDIR)$(docdir)/pixmaps; \
  	  fi \
 -	fi; \
 -	echo "*** Desktop files, icons, MIME types not installed. Run 'make desktop-install'"; \
 -	echo "*** (or 'make home-desktop-install' for installation in a home directory)."
 +	fi
  
  desktop-install:
 -	if test "$(datadir)" = "/usr/share"; then \
 -	  desktopdir=/usr/share; \
 -	else \
 -	  desktopdir=/usr/local/share; \
 -	fi; \
-+	desktopdir=$(pkgdatadir); \
++	desktopdir=$(DATADIR); \
  	$(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 @@
+@@ -851,7 +849,7 @@ desktop-install:
  	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; \
Index: head/graphics/xournal/files/patch-configure
===================================================================
--- head/graphics/xournal/files/patch-configure	(revision 449382)
+++ head/graphics/xournal/files/patch-configure	(revision 449383)
@@ -1,11 +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 @@
+--- configure.orig	2017-07-20 18:30:25 UTC
++++ configure
+@@ -5605,6 +5605,8 @@ fi
  case "$host" in
   *-*-linux*)
     os_linux=yes;;
 + *-*-freebsd*)
 +   os_linux=yes;;
   *)
     os_linux=no;;
  esac
Index: head/graphics/xournal/files/patch-src_Makefile.in
===================================================================
--- head/graphics/xournal/files/patch-src_Makefile.in	(nonexistent)
+++ head/graphics/xournal/files/patch-src_Makefile.in	(revision 449383)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2017-08-20 23:55:48 UTC
++++ src/Makefile.in
+@@ -342,7 +342,7 @@ top_srcdir = @top_srcdir@
+ @WIN32_FALSE@SUBDIRS = ttsubset
+ @WIN32_TRUE@SUBDIRS = ttsubset win32
+ INCLUDES = \
+-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
++	-DPACKAGE_DATA_DIR=\""$(DATADIR)/pixmaps"\" \
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	@PACKAGE_CFLAGS@
+ 

Property changes on: head/graphics/xournal/files/patch-src_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/xournal/files/patch-src_main.c
===================================================================
--- head/graphics/xournal/files/patch-src_main.c	(nonexistent)
+++ head/graphics/xournal/files/patch-src_main.c	(revision 449383)
@@ -0,0 +1,11 @@
+--- src/main.c.orig	2015-10-25 04:26:29 UTC
++++ src/main.c
+@@ -360,7 +360,7 @@ main (int argc, char *argv[])
+   g_free(path);
+   g_free(path1);
+   g_free(path2);
+-  add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
++  add_pixmap_directory (PACKAGE_DATA_DIR);
+ 
+   /*
+    * The following code was added by Glade to create one of each component

Property changes on: head/graphics/xournal/files/patch-src_main.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property