svn commit: r310294 - in head/graphics/xournal: . files

[Marcus von Appen]

Author: mva
Date: Sat Jan 12 23:09:01 2013
New Revision: 310294
URL: http://svnweb.freebsd.org/changeset/ports/310294

Log:
  - Update to 0.4.7
  - Convert to new options framework
  - Strip Makefile header
  - Drop LIB_DEPENDS ABI versions
  - Move LIB_DEPENDS after LICENSE to pet portlint
  
  PR:		ports/175066
  Submitted by:	Jan Henrik Sylvester <me at janh.de> (maintainer)

Deleted:
  head/graphics/xournal/files/patch-poppler-0.18
Modified:
  head/graphics/xournal/Makefile   (contents, props changed)
  head/graphics/xournal/distinfo   (contents, props changed)
  head/graphics/xournal/pkg-plist   (contents, props changed)

Modified: head/graphics/xournal/Makefile
==============================================================================
--- head/graphics/xournal/Makefile	Sat Jan 12 22:49:07 2013	(r310293)
+++ head/graphics/xournal/Makefile	Sat Jan 12 23:09:01 2013	(r310294)
@@ -1,23 +1,18 @@
-# New ports collection makefile for:	xournal
-# Date created:		21 Jan 2011
-# Whom:			Jan Henrik Sylvester <me at janh.de>
-#
+# Created by: Jan Henrik Sylvester <me at janh.de>
 # $FreeBSD$
-#
 
 PORTNAME=	xournal
-PORTVERSION=	0.4.5
-PORTREVISION=	3
+PORTVERSION=	0.4.7
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	me at janh.de
 COMMENT=	A notetaking application that can annotate PDFs
 
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
-
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+
 MAKE_JOBS_SAFE=	yes
 USE_GNOME=	desktopfileutils libgnomecanvas
 GNU_CONFIGURE=	yes
@@ -25,11 +20,13 @@ CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install desktop-install
 
-OPTIONS=	GHOSTSCRIPT "Install ghostscript (PS/PDF as bitmap bg)" on
+OPTIONS_DEFINE=		GHOSTSCRIPT
+GHOSTSCRIPT_DESC=	Install ghostscript (PS/PDF as bitmap bg)
+OPTIONS_DEFAULT=	GHOSTSCRIPT
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GHOSTSCRIPT)
+.if ${PORT_OPTIONS:MGHOSTSCRIPT}
 USE_GHOSTSCRIPT_RUN=	yes
 .endif
 
@@ -40,8 +37,8 @@ post-patch:
 		${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@(cd ${WRKSRC} && ${MAKE} install-doc-local)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/xournal/distinfo
==============================================================================
--- head/graphics/xournal/distinfo	Sat Jan 12 22:49:07 2013	(r310293)
+++ head/graphics/xournal/distinfo	Sat Jan 12 23:09:01 2013	(r310294)
@@ -1,2 +1,2 @@
-SHA256 (xournal-0.4.5.tar.gz) = a7d7c2cb544451939779276e6e5ee5acc756bd0efb5253de15dc00bfe07755d1
-SIZE (xournal-0.4.5.tar.gz) = 425062
+SHA256 (xournal-0.4.7.tar.gz) = d1ceb9c3a0b0172f7c2389bfe188a13cdc9f9f4c3ddc30095d635edf1367ac89
+SIZE (xournal-0.4.7.tar.gz) = 553391

Modified: head/graphics/xournal/pkg-plist
==============================================================================
--- head/graphics/xournal/pkg-plist	Sat Jan 12 22:49:07 2013	(r310293)
+++ head/graphics/xournal/pkg-plist	Sat Jan 12 23:09:01 2013	(r310294)
@@ -9,38 +9,38 @@ share/mimelnk/application/x-xoj.desktop
 %%PORTDOCS%%%%DOCSDIR%%/pixmaps
 %%PORTDOCS%%%%DOCSDIR%%/screenshot.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-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
- at dirrm share/xournal/pixmaps
- at dirrm share/xournal
+%%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
+ at dirrm %%DATADIR%%/pixmaps
+ at dirrm %%DATADIR%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime