4 files changed, 33 insertions, 61 deletions

diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile
index 1c8624871ab4..768ddfb6b6aa 100644
--- a/graphics/mupdf/Makefile
+++ b/graphics/mupdf/Makefile
@@ -5,46 +5,45 @@
 # $FreeBSD$
 
 PORTNAME=	mupdf
-PORTVERSION=	r940
+PORTVERSION=	0.6
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.mupdf.com/download/
+MASTER_SITES=	http://www.mupdf.com/download/source/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Lightweight PDF viewer and toolkit
 
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
+		jpeg.11:${PORTSDIR}/graphics/jpeg \
+		jbig2dec.0:${PORTSDIR}/graphics/jbig2dec \
+		openjpeg.2:${PORTSDIR}/graphics/openjpeg
 
+USE_GMAKE=	yes
+MAKE_ARGS+=	build=release prefix=${PREFIX} verbose=true
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XORG=	x11 xext
-JAM_ARGS=	-q -sLOCALBASE=${LOCALBASE} \
-		-sPTHREAD_LIBS=${PTHREAD_LIBS} ${_MAKE_JOBS}
+USE_GNOME=	pkgconfig
+USE_GCC=	4.2+
+
 MAKE_JOBS_SAFE=	yes
 
-EXECUTABLES=	cmapdump    pdfdraw     pdfinfo \
-		fontdump    pdfclean    pdfextract  pdfshow
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	CJK "Enable Asian Fontset" On
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_CJK)
-JAM_ARGS+=	-sDEFINES=NOCJK
-.endif
-
-do-build:
-	cd ${WRKSRC} &&	jam ${JAM_ARGS}
-
-do-install:
-	${INSTALL} ${WRKSRC}/build/mupdf ${PREFIX}/bin/mupdf
-.for f in ${EXECUTABLES}
-	${INSTALL} ${WRKSRC}/build/$f ${PREFIX}/bin/mu_$f ;
-.endfor
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's/LAGS :=/LAGS +=/g' ${WRKSRC}/Makerules
+	@${REINPLACE_CMD} 's/Linux/FreeBSD/g' ${WRKSRC}/Makerules
+	@${REINPLACE_CMD} 's/CC = .*/CC = ${CC}/g' ${WRKSRC}/Makerules
+	@${REINPLACE_CMD} 's#\(PDF.*_EXE=.*DIR./\)#\1mu_#g' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>
diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo
index 89658df90d28..3a36b631c651 100644
--- a/graphics/mupdf/distinfo
+++ b/graphics/mupdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (mupdf-r940.tar.gz) = 30463110385d5279b0ba1b5d1907908b
-SHA256 (mupdf-r940.tar.gz) = ed00e461f3ad03ee9d7634abdd183f843e41367b6326809255a4b216f452c9bf
-SIZE (mupdf-r940.tar.gz) = 3611853
+MD5 (mupdf-0.6-source.tar.gz) = d1e1a1df8fb3e4d1c601506797b75036
+SHA256 (mupdf-0.6-source.tar.gz) = 6f87c4f113ee9e0f4bdfd3a316ef44052edc4febc8f7b531c4a3f44ffe149605
+SIZE (mupdf-0.6-source.tar.gz) = 3607245
diff --git a/graphics/mupdf/files/patch-Jamrules b/graphics/mupdf/files/patch-Jamrules
deleted file mode 100644
index 70cf0cf45407..000000000000
--- a/graphics/mupdf/files/patch-Jamrules
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
-+if $(OS) = FREEBSD
- {
--    Echo Building for LINUX ;
-+    Echo Building for FREEBSD ;
- 
-     BUILD_X11APP = true ;
- 
--    CCFLAGS = -Wall -std=gnu99 -I/usr/include/freetype2 ;
--    LINKFLAGS = -L/usr/X11R6/lib ;
-+    CCFLAGS = -Wall -std=gnu99 -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ ;
-+    LINKFLAGS = -L$(LOCALBASE)/lib ;
-     LINKLIBS = -lfreetype -ljpeg -lz -lm ;
--    APPLINKLIBS = -lX11 -lXext -lpthread ;
-+    APPLINKLIBS = -lX11 -lXext $(PTHREAD_LIBS) ;
- 
-     if $(BUILD) = debug   { OPTIM = -g -O0 -fno-inline ; }
-     if $(BUILD) = release { OPTIM = -O3 ; }
diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist
index 1303cc9cc139..b7f468591af5 100644
--- a/graphics/mupdf/pkg-plist
+++ b/graphics/mupdf/pkg-plist
@@ -1,8 +1,12 @@
 bin/mupdf
-bin/mu_pdfshow
+bin/mu_pdfclean
 bin/mu_pdfdraw
-bin/mu_pdfinfo
-bin/mu_cmapdump
 bin/mu_pdfextract
-bin/mu_pdfclean
-bin/mu_fontdump
+bin/mu_pdfinfo
+bin/mu_pdfshow
+include/fitz.h
+include/fitz_base.h
+include/fitz_draw.h
+include/fitz_stream.h
+include/mupdf.h
+lib/libmupdf.a