Update to 4.1.17, clean up, fix the integer promotion fix.

4 files changed, 28 insertions, 23 deletions

diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 55b43f9a3909..1fa0e55b2ad8 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -6,33 +6,30 @@
 #
 
 PORTNAME=	xloadimage
-PORTVERSION=	4.1.16
-PORTREVISION=	9
+PORTVERSION=	4.1.17
 CATEGORIES=	x11 graphics
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/:x11 \
+		${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}.${VERSION}
-
-PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL}
-PATCHFILES=	${PORTNAME}_${VERSION}-${REVISION}${PATCHREV}.diff.gz
-PATCH_DIST_STRIP=	-p1
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:x11 \
+		${PORTNAME}_${VERSION}-${REVISION}.debian.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 Image Loading Utility
 
-LICENCE=	MIT
-
-CONFLICTS_INSTALL=	xli-*
-
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
-EXTRA_PATCHES=	${WRKSRC}/debian/patches/*.dpatch
+LICENCE=	MIT
+
+CONFLICTS_INSTALL=	xli-*
+
+EXTRA_PATCHES=	${WRKDIR}/debian/patches/*.dpatch
 
 PATCH_STRIP=	-p1
 VERSION=	${PORTVERSION:R}
 REVISION=	${PORTVERSION:E}
-PATCHREV=	.2
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
@@ -47,8 +44,6 @@ MLINKS=		xloadimage.1 xsetbg.1 \
 
 post-patch:
 	@${CHMOD} a+rx ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
-		${WRKSRC}/png.c
 	@${REINPLACE_CMD} -e 's|TIFFHeader|TIFFHeaderClassic|g' \
 		${WRKSRC}/tiff.c
 	@${REINPLACE_CMD} -e \
diff --git a/x11/xloadimage/distinfo b/x11/xloadimage/distinfo
index 705159039597..beadb31fec15 100644
--- a/x11/xloadimage/distinfo
+++ b/x11/xloadimage/distinfo
@@ -1,4 +1,4 @@
 SHA256 (xloadimage.4.1.tar.gz) = 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
 SIZE (xloadimage.4.1.tar.gz) = 596021
-SHA256 (xloadimage_4.1-16.2.diff.gz) = 36c318d36bab9401d96bf4f3c103306d9e4ab2ef3f42378ffc1c2784026d6db0
-SIZE (xloadimage_4.1-16.2.diff.gz) = 73679
+SHA256 (xloadimage_4.1-17.debian.tar.gz) = ffdc6aca613511e03ceeb000db0b705254b955ed3a04c08fe3c51c8e44360e9e
+SIZE (xloadimage_4.1-17.debian.tar.gz) = 73774
diff --git a/x11/xloadimage/files/patch-lp64 b/x11/xloadimage/files/patch-lp64
index cd1a09892c9c..d7ce834da2bb 100644
--- a/x11/xloadimage/files/patch-lp64
+++ b/x11/xloadimage/files/patch-lp64
@@ -1,5 +1,5 @@
---- cmuwmraster.c.orig	Tue Jul  1 19:08:24 2008
-+++ cmuwmraster.c	Tue Jul  1 19:08:57 2008
+--- ./cmuwmraster.c.orig	Tue Jul  1 19:08:24 2008
++++ ./cmuwmraster.c	Tue Jul  1 19:08:57 2008
 @@ -22,9 +22,9 @@ struct cmuwm_header *headerp;
  {
      printf("%s is a %ldx%ld %ld plane CMU WM raster\n",
@@ -52,14 +52,14 @@
  
      linelen = (width / 8) + (width % 8 ? 1 : 0);
      lineptr = image->data;
---- image.h.orig	Tue Jul  1 21:18:52 2008
-+++ image.h	Tue Jul  1 21:21:24 2008
+--- ./image.h.orig	Tue Jul  1 21:18:52 2008
++++ ./image.h	Tue Jul  1 21:21:24 2008
 @@ -163,7 +163,7 @@ typedef struct {
      ((LEN) == 2 ? ((unsigned long) \
  		   (*(byte *)(PTR) << 8) | \
  		   (*((byte *)(PTR) + 1))) : \
 -     ((unsigned long)((*(byte *)(PTR) << 24) | \
-+     (((unsigned long)(*(byte *)(PTR) << 24) | \
++     ((unsigned long)(unsigned int)((*(byte *)(PTR) << 24) | \
  		      (*((byte *)(PTR) + 1) << 16) | \
  		      (*((byte *)(PTR) + 2) << 8) | \
  		      (*((byte *)(PTR) + 3)))))))
@@ -68,7 +68,7 @@
      ((LEN) == 2 ? ((unsigned long) \
  		   (*(byte *)(PTR)) | (*((byte *)(PTR) + 1) << 8)) : \
 -     ((unsigned long)((*(byte *)(PTR)) | \
-+     (((unsigned long)(*(byte *)(PTR)) | \
++     ((unsigned long)(unsigned int)((*(byte *)(PTR)) | \
  		      (*((byte *)(PTR) + 1) << 8) | \
  		      (*((byte *)(PTR) + 2) << 16) | \
  		      (*((byte *)(PTR) + 3) << 24))))))
diff --git a/x11/xloadimage/files/patch-uufilter.c b/x11/xloadimage/files/patch-uufilter.c
new file mode 100644
index 000000000000..b5dbafa75113
--- /dev/null
+++ b/x11/xloadimage/files/patch-uufilter.c
@@ -0,0 +1,10 @@
+--- ./uufilter.c.orig
++++ ./uufilter.c
+@@ -11,6 +11,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ int main(argc, argv)