Attachment #153411 for bug #197752




# $FreeBSD: head/graphics/xournal/Makefile 378348 2015-02-03 12:28:23Z kwm $

PORTNAME=	xournal
PORTVERSION=	0.4.8
PORTREVISION=	4
CATEGORIES=	graphics
MASTER_SITES=	SF


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}

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:
.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>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xournal-0.4.7.tar.gz) = d1ceb9c3a0b0172f7c2389bfe188a13cdc9f9f4c3ddc30095d635edf1367ac89	1	SHA256 (xournal-0.4.8.tar.gz) = 233887a38136452dcb4652c35d08366fc7355f57ed46753db83e3e0f3193ef30
2	SIZE (xournal-0.4.7.tar.gz) = 553391	2	SIZE (xournal-0.4.8.tar.gz) = 641240




--- 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; \

+	fi
 
 desktop-install:
-	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; \




bin/xournal
%%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
share/xournal/pixmaps/xournal.png
share/xournal/pixmaps/xournal.svg
share/xournal/pixmaps/yellow.png

Return to bug 197752

Lines 2-9 Link Here

(-)Makefile (-5 / +45 lines)
2	# $FreeBSD: head/graphics/xournal/Makefile 378348 2015-02-03 12:28:23Z kwm $	2	# $FreeBSD: head/graphics/xournal/Makefile 378348 2015-02-03 12:28:23Z kwm $
3		3
4	PORTNAME= xournal	4	PORTNAME= xournal
5	PORTVERSION= 0.4.7	5	PORTVERSION= 0.4.8
6	PORTREVISION= 4
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 25-30 Link Here
25	GHOSTSCRIPT_DESC= Install ghostscript (PS/PDF as bitmap bg)	24	GHOSTSCRIPT_DESC= Install ghostscript (PS/PDF as bitmap bg)
26	OPTIONS_DEFAULT= GHOSTSCRIPT	25	OPTIONS_DEFAULT= GHOSTSCRIPT
27		26
		27	PORTDOCS_MAIN= AUTHORS \
		28	ChangeLog \
		29	COPYING \
		30	README
		31	PORTDOCS= ${PORTDOCS_MAIN} \
		32	html-doc/screenshot.png \
		33	html-doc/manual.html \
		34	html-doc/pixmaps/lightgreen.png \
		35	html-doc/pixmaps/medium.png \
		36	html-doc/pixmaps/ruler.png \
		37	html-doc/pixmaps/green.png \
		38	html-doc/pixmaps/magenta.png \
		39	html-doc/pixmaps/default-pen.png \
		40	html-doc/pixmaps/lasso.png \
		41	html-doc/pixmaps/highlighter.png \
		42	html-doc/pixmaps/red.png \
		43	html-doc/pixmaps/hand.png \
		44	html-doc/pixmaps/fullscreen.png \
		45	html-doc/pixmaps/white.png \
		46	html-doc/pixmaps/xoj.svg \
		47	html-doc/pixmaps/pencil.png \
		48	html-doc/pixmaps/rect-select.png \
		49	html-doc/pixmaps/stretch.png \
		50	html-doc/pixmaps/blue.png \
		51	html-doc/pixmaps/lightblue.png \
		52	html-doc/pixmaps/orange.png \
		53	html-doc/pixmaps/yellow.png \
		54	html-doc/pixmaps/gray.png \
		55	html-doc/pixmaps/xournal.svg \
		56	html-doc/pixmaps/xournal.png \
		57	html-doc/pixmaps/thin.png \
		58	html-doc/pixmaps/thick.png \
		59	html-doc/pixmaps/eraser.png \
		60	html-doc/pixmaps/recycled.png \
		61	html-doc/pixmaps/shapes.png \
		62	html-doc/pixmaps/black.png \
		63	html-doc/pixmaps/text-tool.png
		64
28	.include <bsd.port.options.mk>	65	.include <bsd.port.options.mk>
29		66
30	.if ${PORT_OPTIONS:MGHOSTSCRIPT}	67	.if ${PORT_OPTIONS:MGHOSTSCRIPT}
Lines 34-44 Link Here
34	post-patch:	71	post-patch:
35	@${REINPLACE_CMD} \	72	@${REINPLACE_CMD} \
36	-e 's\|$$(DESTDIR)/usr/share/\|$$(DESTDIR)$$$$desktopdir/\|g' \	73	-e 's\|$$(DESTDIR)/usr/share/\|$$(DESTDIR)$$$$desktopdir/\|g' \
37	-e 's\|/usr/local/share\|"$$(datadir)"\|' \
38	-e 's\|ln -s $$(DESTDIR)$$(pkgdatadir)/pixmaps\|ln -s $$(pkgdatadir)/pixmaps\|' \
39	${WRKSRC}/Makefile.in	74	${WRKSRC}/Makefile.in
40		75
41	post-install:	76	post-install:
42	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install-doc-local)	77	.if ${PORT_OPTIONS:MDOCS}
		78	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		79	${INSTALL_DATA} ${PORTDOCS_MAIN:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
		80	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html-doc
		81	(cd ${WRKSRC} && ${COPYTREE_SHARE} html-doc/ ${STAGEDIR}${DOCSDIR})
		82	.endif
43		83
44	.include <bsd.port.mk>	84	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-4 / +27 lines)
1	--- Makefile.in.orig 2011-01-31 16:28:59.925702117 +0100	1	--- Makefile.in.orig 2014-06-29 08:53:20.000000000 +0200
2	+++ Makefile.in 2011-01-31 16:36:50.591377695 +0100	2	+++ Makefile.in 2015-02-23 22:51:49.000000000 +0100
3	@@ -709,19 +709,21 @@	3	@@ -796,31 +796,29 @@
4	fi \	4	fi \
5	done \	5	done \
6	fi; \	6	fi; \
Lines 28-31 Link Here
28	+ fi	28	+ fi
29		29
30	desktop-install:	30	desktop-install:
31	if test "$(datadir)" = "/usr/share"; then \	31	- if test "$(datadir)" = "/usr/share"; then \
		32	- desktopdir=/usr/share; \
		33	- else \
		34	- desktopdir=/usr/local/share; \
		35	- fi; \
		36	+ desktopdir=$(pkgdatadir); \
		37	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
		38	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
		39	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
		40	$(mkinstalldirs) $(DESTDIR)$$desktopdir/applications; \
		41	- $(mkinstalldirs) $(DESTDIR)/usr/share/mimelnk/application; \
		42	+ $(mkinstalldirs) $(DESTDIR)$$desktopdir/mimelnk/application; \
		43	$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
		44	$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
		45	if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
		46	@@ -828,7 +826,7 @@
		47	fi; \
		48	$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
		49	$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
		50	- $(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)/usr/share/mimelnk/application; \
		51	+ $(INSTALL_DATA) $(srcdir)/x-xoj.desktop $(DESTDIR)$$desktopdir/mimelnk/application; \
		52	if test -z "$(DESTDIR)"; then \
		53	echo "Updating desktop, mime, and icon databases."; \
		54	update-desktop-database; \

Lines 1-40 Link Here

(-)pkg-plist (-39 / +36 lines)
1	bin/xournal	1	bin/xournal
2	share/applications/xournal.desktop	2	%%DATADIR%%/applications/xournal.desktop
3	share/icons/hicolor/scalable/apps/xournal.svg	3	%%DATADIR%%/icons/hicolor/scalable/apps/xournal.svg
4	share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg	4	%%DATADIR%%/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
5	share/icons/hicolor/scalable/mimetypes/xoj.svg	5	%%DATADIR%%/icons/hicolor/scalable/mimetypes/xoj.svg
6	share/mime/packages/xournal.xml	6	%%DATADIR%%/mime/packages/xournal.xml
7	share/mimelnk/application/x-xoj.desktop	7	%%DATADIR%%/mimelnk/application/x-xoj.desktop
8	%%PORTDOCS%%%%DOCSDIR%%/manual.html	8	%%DATADIR%%/pixmaps/black.png
9	%%PORTDOCS%%%%DOCSDIR%%/pixmaps	9	%%DATADIR%%/pixmaps/blue.png
10	%%PORTDOCS%%%%DOCSDIR%%/screenshot.png	10	%%DATADIR%%/pixmaps/default-pen.png
11	share/xournal/pixmaps/black.png	11	%%DATADIR%%/pixmaps/eraser.png
12	share/xournal/pixmaps/blue.png	12	%%DATADIR%%/pixmaps/fullscreen.png
13	share/xournal/pixmaps/default-pen.png	13	%%DATADIR%%/pixmaps/gray.png
14	share/xournal/pixmaps/eraser.png	14	%%DATADIR%%/pixmaps/green.png
15	share/xournal/pixmaps/fullscreen.png	15	%%DATADIR%%/pixmaps/hand.png
16	share/xournal/pixmaps/gray.png	16	%%DATADIR%%/pixmaps/highlighter.png
17	share/xournal/pixmaps/green.png	17	%%DATADIR%%/pixmaps/lasso.png
18	share/xournal/pixmaps/hand.png	18	%%DATADIR%%/pixmaps/lightblue.png
19	share/xournal/pixmaps/highlighter.png	19	%%DATADIR%%/pixmaps/lightgreen.png
20	share/xournal/pixmaps/lasso.png	20	%%DATADIR%%/pixmaps/magenta.png
21	share/xournal/pixmaps/lightblue.png	21	%%DATADIR%%/pixmaps/medium.png
22	share/xournal/pixmaps/lightgreen.png	22	%%DATADIR%%/pixmaps/orange.png
23	share/xournal/pixmaps/magenta.png	23	%%DATADIR%%/pixmaps/pencil.png
24	share/xournal/pixmaps/medium.png	24	%%DATADIR%%/pixmaps/rect-select.png
25	share/xournal/pixmaps/orange.png	25	%%DATADIR%%/pixmaps/recycled.png
26	share/xournal/pixmaps/pencil.png	26	%%DATADIR%%/pixmaps/red.png
27	share/xournal/pixmaps/rect-select.png	27	%%DATADIR%%/pixmaps/ruler.png
28	share/xournal/pixmaps/recycled.png	28	%%DATADIR%%/pixmaps/shapes.png
29	share/xournal/pixmaps/red.png	29	%%DATADIR%%/pixmaps/stretch.png
30	share/xournal/pixmaps/ruler.png	30	%%DATADIR%%/pixmaps/text-tool.png
31	share/xournal/pixmaps/shapes.png	31	%%DATADIR%%/pixmaps/thick.png
32	share/xournal/pixmaps/stretch.png	32	%%DATADIR%%/pixmaps/thin.png
33	share/xournal/pixmaps/text-tool.png	33	%%DATADIR%%/pixmaps/white.png
34	share/xournal/pixmaps/thick.png	34	%%DATADIR%%/pixmaps/xoj.svg
35	share/xournal/pixmaps/thin.png	35	%%DATADIR%%/pixmaps/xournal.png
36	share/xournal/pixmaps/white.png	36	%%DATADIR%%/pixmaps/xournal.svg
37	share/xournal/pixmaps/xoj.svg	37	%%DATADIR%%/pixmaps/yellow.png
38	share/xournal/pixmaps/xournal.png
39	share/xournal/pixmaps/xournal.svg
40	share/xournal/pixmaps/yellow.png