update to 1.1, from Leonardo Taccari per PR pkg/46823

changes:
The command line tools have been combined into one tool that does all:
 mubusy. Where previously you would have called "mupdfclean blah blah
 blah", now call "mubusy clean blah blah blah" instead.
Support for UserUnits
bugfixes and optimisations

7 files changed, 88 insertions, 54 deletions

diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index ee025b225b8..4b14c7d977a 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2012/06/03 22:03:24 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/08/21 19:50:53 drochner Exp $
 #
 
-DISTNAME=	mupdf-1.0-source
+DISTNAME=	mupdf-1.1-source
 PKGNAME=	${DISTNAME:S/-source//}
 CATEGORIES=	print
 MASTER_SITES=	http://ccxvii.net/mupdf/download/ \
@@ -20,6 +20,7 @@ USE_LIBTOOL=	yes
 
 INSTALLATION_DIRS+=	bin include lib/pkgconfig
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 LDFLAGS=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
 MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 
diff --git a/print/mupdf/PLIST b/print/mupdf/PLIST
index 7e1c68c7fa2..1aff2825b38 100644
--- a/print/mupdf/PLIST
+++ b/print/mupdf/PLIST
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2012/06/03 22:03:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/08/21 19:50:53 drochner Exp $
+bin/mubusy
 bin/mudraw
 bin/mupdf
-bin/mupdfclean
-bin/mupdfextract
-bin/mupdfinfo
-bin/mupdfshow
 include/fitz.h
 include/memento.h
 include/mucbz.h
@@ -12,7 +9,6 @@ include/mupdf.h
 include/muxps.h
 lib/libfitz.la
 lib/pkgconfig/mupdf.pc
+man/man1/mubusy.1
 man/man1/mudraw.1
 man/man1/mupdf.1
-man/man1/mupdfclean.1
-man/man1/mupdfshow.1
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index 5391c038542..07656e8ff31 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2012/06/03 22:03:24 wiz Exp $
+$NetBSD: distinfo,v 1.8 2012/08/21 19:50:53 drochner Exp $
 
-SHA1 (mupdf-1.0-source.tar.gz) = c5c4496836cdd4bdf7b2d2344ec045c9508e49e4
-RMD160 (mupdf-1.0-source.tar.gz) = 7820cf68552d64c52c7d08cdcf5a1965df39bd42
-Size (mupdf-1.0-source.tar.gz) = 4208530 bytes
-SHA1 (patch-ab) = daf909badabc04b9da8d386ecc7d4ac124b39903
-SHA1 (patch-ac) = a832241dc6166091a0a119ac1579348393988b58
-SHA1 (patch-ae) = d4e5dcee67de682e38bf537d5b93948135af5dd7
+SHA1 (mupdf-1.1-source.tar.gz) = e2c2cd555d790ed97bd6507accf29817945dfe81
+RMD160 (mupdf-1.1-source.tar.gz) = 7ebdbd3a1cc64a4de1de920d7b149a3682ba1431
+Size (mupdf-1.1-source.tar.gz) = 4281735 bytes
+SHA1 (patch-ab) = fa8d1acb5ff8cf3562e0f27f0b2a0d27408d2542
+SHA1 (patch-ac) = dbda8ee49ac4cfe43b09329d25a7d7e6b45ef164
+SHA1 (patch-ae) = 792df3bea1f8c13230bfdce5495eaaf99c62cc12
diff --git a/print/mupdf/files/mupdf.pc b/print/mupdf/files/mupdf.pc
index dc52696739c..d545c334974 100644
--- a/print/mupdf/files/mupdf.pc
+++ b/print/mupdf/files/mupdf.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include
 
 Name: mupdf
 Description: library for PDF files
-Version: 0.9
+Version: 1.1
 Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
 Cflags: -I${includedir}
diff --git a/print/mupdf/patches/patch-ab b/print/mupdf/patches/patch-ab
index 153d2c5ab82..a5b3b251f87 100644
--- a/print/mupdf/patches/patch-ab
+++ b/print/mupdf/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2012/06/03 22:03:24 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2012/08/21 19:50:54 drochner Exp $
 
---- Makerules.orig	2012-04-24 16:41:33.000000000 +0000
+Handle the various operating systems in the same way avoiding hardcoding.
+
+--- Makerules.orig	2012-08-16 13:55:20.000000000 +0000
 +++ Makerules
-@@ -20,32 +20,8 @@ else
+@@ -23,32 +23,8 @@ else
  $(error unknown build setting: '$(build)')
  endif
  
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac
index 58fb87e4f59..cbd3c5cfb68 100644
--- a/print/mupdf/patches/patch-ac
+++ b/print/mupdf/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2012/06/03 22:03:24 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2012/08/21 19:50:54 drochner Exp $
 
---- Makefile.orig	2012-04-24 16:41:33.000000000 +0000
+libtool support and install target cleanup.
+
+--- Makefile.orig	2012-08-16 13:55:20.000000000 +0000
 +++ Makefile
-@@ -24,17 +24,9 @@ THIRD_LIBS += $(JPEG_LIB)
+@@ -24,18 +24,10 @@ THIRD_LIBS += $(JPEG_LIB)
  THIRD_LIBS += $(OPENJPEG_LIB)
  THIRD_LIBS += $(ZLIB_LIB)
  
@@ -15,14 +17,16 @@ $NetBSD: patch-ac,v 1.4 2012/06/03 22:03:24 wiz Exp $
 -endif
 -
 -CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
--AR_CMD = $(QUIET_AR) $(AR) cru $@ $^
+-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
 -LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
 +CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
 +AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^
 +LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
- MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
++MKDIR_CMD = mkdir -p $@
  
  # --- Rules ---
+ 
 @@ -47,33 +39,32 @@ MUCBZ_HDR := $(FITZ_HDR) cbz/mucbz.h
  $(OUT) $(GEN) :
  	$(MKDIR_CMD)
@@ -96,42 +100,38 @@ $NetBSD: patch-ac,v 1.4 2012/06/03 22:03:24 wiz Exp $
  
  # --- Tools and Apps ---
  
-@@ -139,13 +130,13 @@ $(MU_APPS) : $(FITZ_LIB) $(THIRD_LIBS)
+@@ -137,12 +128,12 @@ MUDRAW := $(addprefix $(OUT)/, mudraw)
+ $(MUDRAW) : $(FITZ_LIB) $(THIRD_LIBS)
  
- BUSY_SRC := $(notdir $(wildcard apps/mubusy_*.c))
- BUSY_APP := $(addprefix $(OUT)/, mubusy)
--$(BUSY_APP) : $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.o))
-+$(BUSY_APP) : $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.lo))
- $(BUSY_APP) : $(FITZ_LIB) $(THIRD_LIBS)
+ MUBUSY := $(addprefix $(OUT)/, mubusy)
+-$(MUBUSY) : $(addprefix $(OUT)/, mupdfclean.o mupdfextract.o mupdfinfo.o mupdfposter.o mupdfshow.o) $(FITZ_LIB) $(THIRD_LIBS)
++$(MUBUSY) : $(addprefix $(OUT)/, mupdfclean.lo mupdfextract.lo mupdfinfo.lo mupdfposter.lo mupdfshow.lo) $(FITZ_LIB) $(THIRD_LIBS)
  
  ifeq "$(NOX11)" ""
- MUPDF := $(OUT)/mupdf
- $(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS)
--$(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-+$(MUPDF) : $(addprefix $(OUT)/, x11_main.lo x11_image.lo pdfapp.lo)
+ MUVIEW := $(OUT)/mupdf
+ $(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
+-$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
++$(MUVIEW) : $(addprefix $(OUT)/, x11_main.lo x11_image.lo pdfapp.lo)
  	$(LINK_CMD) $(X11_LIBS)
  endif
  
-@@ -165,14 +156,16 @@ prefix ?= /usr/local
- bindir ?= $(prefix)/bin
- libdir ?= $(prefix)/lib
- incdir ?= $(prefix)/include
--mandir ?= $(prefix)/share/man
-+mandir ?= $(prefix)/man
+@@ -165,11 +156,14 @@ incdir ?= $(prefix)/include
+ mandir ?= $(prefix)/share/man
  
- install: $(FITZ_LIB) $(MU_APPS) $(MUPDF)
+ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
 -	install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
 -	install $(FITZ_LIB) $(libdir)
 -	install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir)
--	install $(MU_APPS) $(MUPDF) $(bindir)
+-	install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(bindir)
 -	install $(wildcard apps/man/*.1) $(mandir)/man1
-+	${BSD_INSTALL_DATA_DIR} $(bindir) $(libdir) $(incdir) $(mandir)/man1
-+	libtool --mode=install ${BSD_INSTALL_LIB} $(FITZ_LIB) $(libdir)
++	${BSD_INSTALL_DATA_DIR} $(bindir) $(libdir) $(incdir)
++	${BSD_INSTALL_MAN_DIR} $(mandir)/man1
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(FITZ_LIB) $(libdir)
 +	${BSD_INSTALL_DATA} fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir)
-+	for f in $(MU_APPS) $(MUPDF); do \
-+		libtool --mode=install ${BSD_INSTALL_PROGRAM} $$f $(bindir); \
++	for f in $(MUVIEW) $(MUDRAW) $(MUBUSY); do \
++		${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $$f $(bindir); \
 +	done
-+	${BSD_INSTALL_DATA} $(wildcard apps/man/*.1) $(mandir)/man1
++	${BSD_INSTALL_MAN} $(wildcard apps/man/*.1) $(mandir)/man1
  
  # --- Clean and Default ---
  
diff --git a/print/mupdf/patches/patch-ae b/print/mupdf/patches/patch-ae
index 48f887a922d..c78820a08ac 100644
--- a/print/mupdf/patches/patch-ae
+++ b/print/mupdf/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1 2011/03/08 17:09:25 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2012/08/21 19:50:54 drochner Exp $
 
 avoid namespace conflict on NetBSD
 
---- fitz/crypt_sha2.c.orig	2011-03-08 16:13:19.000000000 +0000
+--- fitz/crypt_sha2.c.orig	2012-08-16 13:55:20.000000000 +0000
 +++ fitz/crypt_sha2.c
-@@ -15,7 +15,7 @@ static inline int isbigendian(void)
+@@ -17,7 +17,7 @@ static inline int isbigendian(void)
  	return *(char*)&one == 0;
  }
  
@@ -13,7 +13,16 @@ avoid namespace conflict on NetBSD
  {
  	if (!isbigendian())
  	{
-@@ -86,7 +86,7 @@ transform(unsigned int state[8], const u
+@@ -29,7 +29,7 @@ static inline unsigned int bswap32(unsig
+ 	return num;
+ }
+ 
+-static inline uint64_t bswap64(uint64_t num)
++static inline uint64_t mup_bswap64(uint64_t num)
+ {
+ 	if (!isbigendian())
+ 	{
+@@ -107,7 +107,7 @@ transform256(unsigned int state[8], cons
  
  	/* ensure big-endian integers */
  	for (j = 0; j < 16; j++)
@@ -22,7 +31,7 @@ avoid namespace conflict on NetBSD
  
  	/* Copy state[] to working vars. */
  	memcpy(T, state, sizeof(T));
-@@ -172,11 +172,11 @@ void fz_sha256final(fz_sha256 *context, 
+@@ -198,12 +198,12 @@ void fz_sha256_final(fz_sha256 *context,
  	context->count[1] = (context->count[1] << 3) + (context->count[0] >> 29);
  	context->count[0] = context->count[0] << 3;
  
@@ -30,10 +39,36 @@ avoid namespace conflict on NetBSD
 -	context->buffer.u32[15] = bswap32(context->count[0]);
 +	context->buffer.u32[14] = mup_bswap32(context->count[1]);
 +	context->buffer.u32[15] = mup_bswap32(context->count[0]);
- 	transform(context->state, context->buffer.u32);
+ 	transform256(context->state, context->buffer.u32);
  
  	for (j = 0; j < 8; j++)
 -		((unsigned int *)digest)[j] = bswap32(context->state[j]);
 +		((unsigned int *)digest)[j] = mup_bswap32(context->state[j]);
  	memset(context, 0, sizeof(fz_sha256));
  }
+ 
+@@ -268,7 +268,7 @@ transform512(uint64_t state[8], const ui
+ 
+ 	/* ensure big-endian integers */
+ 	for (j = 0; j < 16; j++)
+-		data[j] = bswap64(data_xe[j]);
++		data[j] = mup_bswap64(data_xe[j]);
+ 
+ 	/* Copy state[] to working vars. */
+ 	memcpy(T, state, sizeof(T));
+@@ -359,12 +359,12 @@ void fz_sha512_final(fz_sha512 *context,
+ 	context->count[1] = (context->count[1] << 3) + (context->count[0] >> 29);
+ 	context->count[0] = context->count[0] << 3;
+ 
+-	context->buffer.u64[14] = bswap64(context->count[1]);
+-	context->buffer.u64[15] = bswap64(context->count[0]);
++	context->buffer.u64[14] = mup_bswap64(context->count[1]);
++	context->buffer.u64[15] = mup_bswap64(context->count[0]);
+ 	transform512(context->state, context->buffer.u64);
+ 
+ 	for (j = 0; j < 16; j++)
+-		((uint64_t *)digest)[j] = bswap64(context->state[j]);
++		((uint64_t *)digest)[j] = mup_bswap64(context->state[j]);
+ 	memset(context, 0, sizeof(fz_sha512));
+ }
+