From b820750b2c5184dd294a9d14cb8452a45cee8261 Mon Sep 17 00:00:00 2001
From: Wen Heping <wen@FreeBSD.org>
Date: Tue, 12 Jan 2010 01:23:27 +0000
Subject: [PATCH] - Update to r921

PR:		ports/142726
Submitted by:	Martin Dieringer <martin.dieringer@gmx.de> (maintainer)
---
 graphics/mupdf/Makefile             |  5 +++--
 graphics/mupdf/distinfo             |  6 +++---
 graphics/mupdf/files/patch-Jamrules | 15 +++++++++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 5312bee77f73..4127a2b1cf32 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	mupdf
-DISTVERSION=	2009-07-07
+PORTVERSION=	r921
+PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ccxvii.net/mupdf/download/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Lightweight PDF viewer and toolkit
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.10:${PORTSDIR}/graphics/jpeg
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XORG=	x11 xext
 JAM_ARGS=	-q -sLOCALBASE=${LOCALBASE} \
 		-sPTHREAD_LIBS=${PTHREAD_LIBS} ${_MAKE_JOBS}
diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo
index d56e5cb1a94e..3a8847ae6792 100644
--- a/graphics/mupdf/distinfo
+++ b/graphics/mupdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (mupdf-2009-07-07-source.tar.gz) = 3b499c4f34909093bab308497f62eb5c
-SHA256 (mupdf-2009-07-07-source.tar.gz) = d3c252b4a1f98270235844e9d4507b3533f17981099a5c82531551634a34e4fe
-SIZE (mupdf-2009-07-07-source.tar.gz) = 3297517
+MD5 (mupdf-r921.tar.gz) = 5ccee1c638af0a5a4fab54badd30513a
+SHA256 (mupdf-r921.tar.gz) = df793a155f67f95feaab4060ed5d8b8eab5296778291aba06063c2524377c73b
+SIZE (mupdf-r921.tar.gz) = 3287941
diff --git a/graphics/mupdf/files/patch-Jamrules b/graphics/mupdf/files/patch-Jamrules
index 825b0539999e..70cf0cf45407 100644
--- a/graphics/mupdf/files/patch-Jamrules
+++ b/graphics/mupdf/files/patch-Jamrules
@@ -1,7 +1,14 @@
---- Jamrules.orig	2009-07-07 20:08:22.000000000 +0200
-+++ Jamrules	2009-08-08 12:32:45.000000000 +0200
-@@ -47,16 +47,16 @@
- if $(HAVE_JASPER)   { DEFINES += HAVE_JASPER ; }
+--- Jamrules.orig       2009-12-09 02:59:17.000000000 +0100
++++ Jamrules    2010-01-11 21:53:06.000000000 +0100
+@@ -39,22 +39,22 @@
+ OSPLAT ?= x64 ; # this one isn't in the jambase :(
+
+ # Place all build products here:
+-ALL_LOCATE_TARGET ?= [ FDirName $(TOP) build $(OS:L)-$(OSPLAT:L)-$(BUILD:L) ] ;
++ALL_LOCATE_TARGET ?= [ FDirName $(TOP) build ] ;
+
+ # Add compile time defines for JBIG2 and JPEG2000 support.
+ if $(HAVE_JBIG2DEC) { DEFINES += HAVE_JBIG2DEC ; }
  if $(HAVE_OPENJPEG) { DEFINES += HAVE_OPENJPEG ; }
  
 -if $(OS) = LINUX