update to Debian revision 16.1 (minor bug fixes)

x11/xloadimage/Makefile

@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.39 2010/10/24 21:15:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2010/10/26 16:57:57 naddy Exp $
 
 COMMENT=	graphics file viewer for X11
 
 VERSION=	4.1
-REV=		16	# Debian
+REV=		16.1	# Debian
 
 DISTNAME=	xloadimage.${VERSION}
 PKGNAME=	xloadimage-${VERSION}.${REV}
-REVISION=	2
 CATEGORIES=	x11 graphics
 
-FAKE=		lib
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
 # BSD
@@ -28,12 +26,13 @@ PATCH_DIST_STRIP= -p1
 
 LIB_DEPENDS=	::graphics/png \
 		::graphics/tiff
-WANTLIB=	X11 c jpeg m z png tiff
+WANTLIB=	X11 c jpeg m png tiff z
 
 USE_GROFF =	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${DEPBASE}/include/libpng -I${DEPBASE}/include" \
-		LDFLAGS="-L${DEPBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng \
+		    -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 NO_REGRESS=	Yes
 
 post-distpatch:

x11/xloadimage/distinfo

@@ -1,10 +1,10 @@
 MD5 (xloadimage.4.1.tar.gz) = czGFD8BAVquK5rVyXR+z0g==
-MD5 (xloadimage_4.1-16.diff.gz) = 9cX1IXYWLUPCDuo96mmbIg==
+MD5 (xloadimage_4.1-16.1.diff.gz) = 4n77/OnP0NijGjOqVbce3Q==
 RMD160 (xloadimage.4.1.tar.gz) = AAJxtA9YYBzRBXtOmcMaMNpuEK8=
-RMD160 (xloadimage_4.1-16.diff.gz) = oIVHF+yR4GimPMnNwOAAwUrlkSs=
+RMD160 (xloadimage_4.1-16.1.diff.gz) = S/WRAKdEtvYRJz/knWpGAGBPUZU=
 SHA1 (xloadimage.4.1.tar.gz) = Co7psYVwJ1Bwb2jko04IaHPxdpA=
-SHA1 (xloadimage_4.1-16.diff.gz) = vrh3AwGwvyiRurFEqkz9fHN3Cog=
+SHA1 (xloadimage_4.1-16.1.diff.gz) = C8stGaEz+ZsDcyM7B5sMCAyC2Zk=
 SHA256 (xloadimage.4.1.tar.gz) = QAvH2E3PsyZaehzlGBlnncOtrtojFRS9ibD5MreP9cQ=
-SHA256 (xloadimage_4.1-16.diff.gz) = 6wmrTmHWFC3jC12xytXPr0xGmEaqU1YG7SH7S0D9VW8=
+SHA256 (xloadimage_4.1-16.1.diff.gz) = 9bvHNUROj5LFv6+jzF0P/trzgr9IkSnKrmsPkw1smHM=
 SIZE (xloadimage.4.1.tar.gz) = 596021
-SIZE (xloadimage_4.1-16.diff.gz) = 69676
+SIZE (xloadimage_4.1-16.1.diff.gz) = 71262

x11/xloadimage/patches/patch-root_c

@@ -1,24 +0,0 @@
-$OpenBSD: patch-root_c,v 1.1 2008/07/21 17:58:44 naddy Exp $
---- root.c.orig	Mon Jul 21 19:47:22 2008
-+++ root.c	Mon Jul 21 19:48:18 2008
-@@ -68,16 +68,16 @@ freePrevious(dpy, w)
-   Pixmap *pm;			
-   Atom	actual_type;		/* NOTUSED */
-   int	format;
--  int	nitems;
--  int	bytes_after;
-+  long	nitems;
-+  long	bytes_after;
- 
-   /* intern the property name */
-   Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
- 
-   /* look for existing resource allocation */
-   if ((XGetWindowProperty(dpy, w, atom, 0, 1, 1/*delete*/,
--			  AnyPropertyType, &actual_type, &format, (unsigned long *)&nitems,
--			  (unsigned long *)&bytes_after, (unsigned char **)&pm) == Success) &&
-+			  AnyPropertyType, &actual_type, &format, &nitems,
-+			  &bytes_after, (unsigned char **)&pm) == Success) &&
-       nitems == 1) {
-     if ((actual_type == XA_PIXMAP) && (format == 32) &&
- 	(nitems == 1) && (bytes_after == 0)) {

x11/xloadimage/patches/patch-uufilter_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-uufilter_c,v 1.1 2010/10/26 16:57:57 naddy Exp $
+--- uufilter.c.orig	Tue Oct 26 18:48:44 2010
++++ uufilter.c	Tue Oct 26 18:48:59 2010
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ int main(argc, argv)

x11/xloadimage/pkg/PLIST

@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/08/08 15:51:07 naddy Exp $
-bin/uufilter
-bin/xloadimage
+@comment $OpenBSD: PLIST,v 1.9 2010/10/26 16:57:57 naddy Exp $
+@bin bin/uufilter
+@bin bin/xloadimage
 bin/xsetbg
 bin/xview
 @man man/man1/uufilter.1