This requires the graphics/openjpeg update in my previous email.
It has various widespread internal changes, many bugfixes, and
a new memory manager.

If you use MuPDF, please test this. More info at http://mupdf.com/news

Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/mupdf/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile    5 Sep 2011 13:24:39 -0000       1.28
+++ Makefile    29 Mar 2012 15:43:06 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      graphic library, pdf parser, viewer and utilities
 
-V =            0.9
+V =            1.0rc1
 DISTNAME =     mupdf-$V-source
 PKGNAME =      mupdf-$V
 WRKDIST =      ${WRKDIR}/mupdf-$V
@@ -28,7 +28,7 @@ MASTER_SITES =        ${HOMEPAGE}download/ \
 RUN_DEPENDS =  devel/desktop-file-utils
 LIB_DEPENDS =  graphics/jbig2dec \
                graphics/jpeg \
-               graphics/openjpeg
+               graphics/openjpeg>=1.5.0
 
 USE_GMAKE =    Yes
 USE_GROFF =    Yes
@@ -37,7 +37,9 @@ VMEM_WARNING =        Yes
 
 NO_REGRESS =   Yes
 
-MAKE_ENV +=     CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=${CC} CXX=${CXX} \
+# -I flags prepend mupdf's own, to allow building with previous ver installed
+MAKE_ENV +=    CFLAGS="${CFLAGS} -I$(WRKSRC)/fitz -I$(WRKSRC)/pdf 
-I$(WRKSRC)/xps" \
+               LDFLAGS="${LDFLAGS}" CC=${CC} CXX=${CXX} \
                MANDIR="${WRKINST}${PREFIX}/man/man1" build= verbose=1
 
 FAKE_FLAGS =   prefix=${WRKINST}${PREFIX} mandir=${WRKINST}${PREFIX}/man
@@ -46,8 +48,6 @@ pre-configure:
        ${SUBST_CMD} ${WRKSRC}/debian/mupdf.pc
 
 post-install:
-       # don't conflict with xpdf's pdfinfo
-       mv ${PREFIX}/bin/pdfinfo ${PREFIX}/bin/pdfinfo_mupdf
        ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ \
            ${PREFIX}/share/application-registry/ ${PREFIX}/share/pixmaps \
            ${PREFIX}/lib/pkgconfig/
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/mupdf/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo    5 Sep 2011 13:24:39 -0000       1.13
+++ distinfo    29 Mar 2012 15:43:06 -0000
@@ -1,5 +1,5 @@
-MD5 (mupdf-0.9-source.tar.gz) = dmQO4Wp5eif+ScwOqofOOg==
-RMD160 (mupdf-0.9-source.tar.gz) = m6HfIF+flcf/Swo74iR4atWmXZk=
-SHA1 (mupdf-0.9-source.tar.gz) = OjukLRnjIRGZEQ58eCJjJBzeqKA=
-SHA256 (mupdf-0.9-source.tar.gz) = q+2CXLHXPg4o8KfucrXXpFG6QdIbDFWDftKiEvOxay0=
-SIZE (mupdf-0.9-source.tar.gz) = 3917075
+MD5 (mupdf-1.0rc1-source.tar.gz) = wZW95RjKgJxZrOiwFfO/pQ==
+RMD160 (mupdf-1.0rc1-source.tar.gz) = WN3CTci5cq0oJXLBbWZM0ptjseE=
+SHA1 (mupdf-1.0rc1-source.tar.gz) = aFDBVTJMDkMe3UkafwS/wrOWLH4=
+SHA256 (mupdf-1.0rc1-source.tar.gz) = 
Fnb230BO3D+5ZdSK2IXifdBfvsprpi2scRi6umLArzk=
+SIZE (mupdf-1.0rc1-source.tar.gz) = 4262574
Index: patches/patch-Makerules
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-Makerules,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makerules
--- patches/patch-Makerules     13 Jul 2011 21:48:48 -0000      1.4
+++ patches/patch-Makerules     29 Mar 2012 15:43:06 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makerules,v 1.4 2011/07/13 21:48:48 sthen Exp $
---- Makerules.orig     Fri Apr 29 20:06:09 2011
-+++ Makerules  Wed Jul 13 21:37:52 2011
+--- Makerules.orig     Thu Mar 29 11:46:53 2012
++++ Makerules  Thu Mar 29 14:18:57 2012
 @@ -5,6 +5,7 @@ OS := $(OS:MINGW%=MINGW)
  
  CFLAGS += -Wall
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makerules,v 1.4 2011/07/
  ifeq "$(build)" "debug"
  CFLAGS += -pipe -g
  else ifeq "$(build)" "profile"
-@@ -17,6 +18,7 @@ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -mar
+@@ -19,6 +20,7 @@ CFLAGS += -pipe -g -DMEMENTO
  else
  $(error unknown build setting: '$(build)')
  endif
@@ -17,7 +17,7 @@ $OpenBSD: patch-Makerules,v 1.4 2011/07/
  
  ifeq "$(OS)" "Linux"
  SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
-@@ -27,6 +29,13 @@ ifeq "$(OS)" "FreeBSD"
+@@ -29,6 +31,13 @@ ifeq "$(OS)" "FreeBSD"
  SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
  LDFLAGS += -L/usr/local/lib
  X11_LIBS := -lX11 -lXext
Index: patches/patch-debian_mupdf_pc
===================================================================
RCS file: /cvs/ports/textproc/mupdf/patches/patch-debian_mupdf_pc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-debian_mupdf_pc
--- patches/patch-debian_mupdf_pc       3 Jun 2010 19:38:34 -0000       1.1
+++ patches/patch-debian_mupdf_pc       29 Mar 2012 15:43:06 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-debian_mupdf_pc,v 1.1 2010/06/03 19:38:34 sthen Exp $
---- debian/mupdf.pc.orig       Thu Jun  3 06:56:21 2010
-+++ debian/mupdf.pc    Thu Jun  3 06:56:30 2010
+--- debian/mupdf.pc.orig       Thu Mar 29 11:46:53 2012
++++ debian/mupdf.pc    Thu Mar 29 14:19:12 2012
 @@ -1,4 +1,4 @@
 -prefix=/usr
 +prefix=${PREFIX}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/mupdf/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   13 Jul 2011 21:48:48 -0000      1.5
+++ pkg/PLIST   29 Mar 2012 15:43:06 -0000
@@ -1,23 +1,22 @@
 @comment $OpenBSD: PLIST,v 1.5 2011/07/13 21:48:48 sthen Exp $
+@bin bin/mudraw
 @bin bin/mupdf
-@bin bin/pdfclean
-@bin bin/pdfdraw
-@bin bin/pdfextract
-@bin bin/pdfinfo_mupdf
-@bin bin/pdfshow
-@bin bin/xpsdraw
+@bin bin/mupdfclean
+@bin bin/mupdfextract
+@bin bin/mupdfinfo
+@bin bin/mupdfshow
 include/fitz.h
+include/memento.h
+include/mucbz.h
 include/mupdf.h
 include/muxps.h
 lib/libfitz.a
-lib/libmupdf.a
-lib/libmuxps.a
 lib/pkgconfig/
 lib/pkgconfig/mupdf.pc
+@man man/man1/mudraw.1
 @man man/man1/mupdf.1
-@man man/man1/pdfclean.1
-@man man/man1/pdfdraw.1
-@man man/man1/pdfshow.1
+@man man/man1/mupdfclean.1
+@man man/man1/mupdfshow.1
 share/application-registry/
 share/application-registry/mupdf.applications
 share/applications/mupdf.desktop

Reply via email to