Attachment 153411 Details for Bug 197752 – graphics/xournal from r378348 to latest version 0.4.8 {v2}

[patch] graphics/xournal from r378348 to latest version 0.4.8 {v2}

graphics_xournal-update-to-0.4.8__v2.patch (text/plain), 7.29 KB, created by Kalten on 2015-02-24 02:08:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kalten

Created: 2015-02-24 02:08:10 UTC

Size: 7.29 KB

patch

obsolete

>--- Makefile.orig	2015-02-09 21:39:58.000000000 +0100
>+++ Makefile	2015-02-17 00:11:35.000000000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/graphics/xournal/Makefile 378348 2015-02-03 12:28:23Z kwm $
> 
> PORTNAME=	xournal
>-PORTVERSION=	0.4.7
>-PORTREVISION=	4
>+PORTVERSION=	0.4.8
> CATEGORIES=	graphics
> MASTER_SITES=	SF
> 
>@@ -25,6 +24,44 @@
> 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 @@
> 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>
>--- distinfo.orig	2014-10-06 01:45:05.000000000 +0200
>+++ distinfo	2015-02-16 22:43:08.000000000 +0100
>@@ -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
>--- files/patch-Makefile.in.orig	2014-10-06 01:45:05.000000000 +0200
>+++ files/patch-Makefile.in	2015-02-23 23:16:36.000000000 +0100
>@@ -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; \
>--- pkg-plist.orig	2015-02-09 21:39:58.000000000 +0100
>+++ pkg-plist	2015-02-24 00:35:51.000000000 +0100
>@@ -1,40 +1,37 @@
> 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/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/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

Actions: View | Diff

Attachments on bug 197752: 153093 | 153094 | 153127 | 153411 | 153412 | 153413