Update to a newer snapshot.

textproc/mupdf/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2009/08/10 06:34:56 kili Exp $
+# $OpenBSD: Makefile,v 1.9 2009/09/20 10:22:03 sthen Exp $
 
 COMMENT =	graphic library, pdf parser, viewer and utilities
 
-PKGNAME =	mupdf-0.4p3
-DISTNAME =	mupdf-2009-07-07-source
+PKGNAME =	mupdf-0.4p4
+DISTNAME =	mupdf-2009-09-01-source
 
 CATEGORIES =	textproc x11
 
@@ -17,9 +17,10 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =	X11 Xext c freetype m pthread pthread-stubs xcb z
+WANTLIB =	X11 Xext c freetype m pthread z
 
-MASTER_SITES =	http://ccxvii.net/mupdf/download/
+#MASTER_SITES =	http://ccxvii.net/mupdf/download/
+MASTER_SITES =	http://spacehopper.org/mirrors/
 
 BUILD_DEPENDS =	::devel/jam
 

textproc/mupdf/distinfo

@@ -1,5 +1,5 @@
-MD5 (mupdf-2009-07-07-source.tar.gz) = O0mcTzSQkJO6swhJf2LrXA==
-RMD160 (mupdf-2009-07-07-source.tar.gz) = WS3m+M3ozikR9nY2eLyrTIvgK9I=
-SHA1 (mupdf-2009-07-07-source.tar.gz) = iEW8Cm+GUvuWwI0w8oMRe4THv0s=
-SHA256 (mupdf-2009-07-07-source.tar.gz) = 08JStKH5gnAjWETp1FB7NTPxeYEJmlyCUxVRY0o05P4=
-SIZE (mupdf-2009-07-07-source.tar.gz) = 3297517
+MD5 (mupdf-2009-09-01-source.tar.gz) = bMBANlzqtw2XF5pC2pxGwQ==
+RMD160 (mupdf-2009-09-01-source.tar.gz) = L5Juof02zFkz89e61lz+87szSf8=
+SHA1 (mupdf-2009-09-01-source.tar.gz) = Y4AasxwCLGDyN6QQO+HLO2D96to=
+SHA256 (mupdf-2009-09-01-source.tar.gz) = BouulpzgGqxinpWVqS9JyGUb6MK37pCY4JOUQzmhow8=
+SIZE (mupdf-2009-09-01-source.tar.gz) = 3288203

textproc/mupdf/patches/patch-apps_unix_ximage_c

@@ -1,59 +0,0 @@
-$OpenBSD: patch-apps_unix_ximage_c,v 1.1 2009/07/14 19:20:41 sthen Exp $
-
-trap SHM errors and fall back to !SHM, letting mupdf work with
-a remote DISPLAY.
-
---- apps/unix/ximage.c.orig	Tue Jul  7 19:08:22 2009
-+++ apps/unix/ximage.c	Tue Jul 14 18:48:01 2009
-@@ -81,6 +81,7 @@ static struct
- 	ximage_convert_func_t convert_func;
- 
- 	int useshm;
-+	int shmopcode;
- 	XImage *pool[POOLSIZE];
- 	/* MUST exist during the lifetime of the shared ximage according to the
- 	   xc/doc/hardcopy/Xext/mit-shm.PS.gz */
-@@ -295,6 +296,18 @@ next_pool_image(void)
- 	return info.pool[info.lastused ++];
- }
- 
-+static int
-+ximage_error_handler(Display *dpy, XErrorEvent *event)
-+{
-+	if (event->request_code == info.shmopcode) {
-+		info.useshm = 0;
-+		return 0;
-+	}
-+
-+	XSetErrorHandler(NULL);
-+	return (XSetErrorHandler(ximage_error_handler))(dpy, event);
-+}
-+
- int
- ximage_init(Display *display, int screen, Visual *visual)
- {
-@@ -305,6 +318,9 @@ ximage_init(Display *display, int screen, Visual *visu
- 	int nformats;
- 	int ok;
- 	int i;
-+	int major;
-+	int event;
-+	int error;
- 
- 	info.display = display;
- 	info.screen = screen;
-@@ -340,6 +356,14 @@ ximage_init(Display *display, int screen, Visual *visu
- 
- 	/* prepare colormap */
- 	make_colormap();
-+
-+	/* identify opcode for MIT-SHM extension */
-+	if(XQueryExtension(display, "MIT-SHM", &major, &event, &error )
-+	    && XShmQueryExtension(display))
-+		info.shmopcode = major;
-+
-+	/* intercept non-fatal errors */
-+	XSetErrorHandler(ximage_error_handler);
- 
- 	/* prepare pool of XImages */
- 	info.useshm = 1;

textproc/mupdf/patches/patch-mupdf_Jamfile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-mupdf_Jamfile,v 1.1 2009/06/19 13:42:29 sthen Exp $
---- mupdf/Jamfile.orig	Thu Jun 18 23:31:10 2009
-+++ mupdf/Jamfile	Fri Jun 19 14:07:32 2009
+$OpenBSD: patch-mupdf_Jamfile,v 1.2 2009/09/20 10:22:03 sthen Exp $
+--- mupdf/Jamfile.orig	Sun Sep 20 01:27:21 2009
++++ mupdf/Jamfile	Sun Sep 20 01:34:05 2009
 @@ -4,7 +4,7 @@
  
  SubDir TOP mupdf ;
@@ -10,7 +10,7 @@ $OpenBSD: patch-mupdf_Jamfile,v 1.1 2009/06/19 13:42:29 sthen Exp $
  
  Main cmapdump : cmapdump.c ;
  LinkLibraries cmapdump : libfitz ;
-@@ -167,27 +167,27 @@ Library libcmaps : cmap_korean.c ;
+@@ -166,27 +166,27 @@ Library libcmaps : cmap_korean.c ;
  
  SubDir TOP fonts ;
  
@@ -42,7 +42,7 @@ $OpenBSD: patch-mupdf_Jamfile,v 1.1 2009/06/19 13:42:29 sthen Exp $
      NimbusSanL-Bold.cff
      NimbusSanL-BoldItal.cff
      NimbusSanL-Regu.cff
-@@ -195,17 +195,17 @@ GenFile font_sans.c : fontdump
+@@ -194,17 +194,17 @@ GenFile font_sans.c : fontdump
      ;
  
  Library libfonts :