Update to Debian patch 16.2, dropping root.c patch from files/patch-lp64.

Rearrange Makefile to make portlint happier, split out CPPFLAGS setting.

4 files changed, 27 insertions, 61 deletions

diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 9becc9f2cdf1..b2d71e96a2a1 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -5,33 +5,36 @@
 # $FreeBSD$
 #
 
-VERSION=	4.1
-REVISION=	16
-PORTREVISION=	8
-
 PORTNAME=	xloadimage
-PORTVERSION=	${VERSION}.${REVISION}
+PORTVERSION=	4.1.16
+PORTREVISION=	9
 CATEGORIES=	x11 graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}.${VERSION}
+
 PATCH_SITES=	${MASTER_SITE_DEBIAN_POOL}
-PATCHFILES=	${PORTNAME}_${VERSION}-${REVISION}.diff.gz
-PATCH_DIST_STRIP= -p1
+PATCHFILES=	${PORTNAME}_${VERSION}-${REVISION}${PATCHREV}.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 Image Loading Utility
 
-PATCH_STRIP=	-p1
-EXTRA_PATCHES=	${WRKSRC}/debian/patches/*.dpatch
-
-USE_XORG=	x11
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+EXTRA_PATCHES=	${WRKSRC}/debian/patches/*.dpatch
+
+PATCH_STRIP=	-p1
+VERSION=	${PORTVERSION:R}
+REVISION=	${PORTVERSION:E}
+PATCHREV=	.2
+
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib
+
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		xloadimage.1 uufilter.1
 MLINKS=		xloadimage.1 xsetbg.1 \
diff --git a/x11/xloadimage/distinfo b/x11/xloadimage/distinfo
index eaa74e14e4b0..705159039597 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.diff.gz) = eb09ab4e61d6142de30b5db1cad5cfaf4c469846aa535606ed21fb4b40fd556f
-SIZE (xloadimage_4.1-16.diff.gz) = 69676
+SHA256 (xloadimage_4.1-16.2.diff.gz) = 36c318d36bab9401d96bf4f3c103306d9e4ab2ef3f42378ffc1c2784026d6db0
+SIZE (xloadimage_4.1-16.2.diff.gz) = 73679
diff --git a/x11/xloadimage/files/patch-lp64 b/x11/xloadimage/files/patch-lp64
index 1391c5fab823..cd1a09892c9c 100644
--- a/x11/xloadimage/files/patch-lp64
+++ b/x11/xloadimage/files/patch-lp64
@@ -72,28 +72,3 @@
  		      (*((byte *)(PTR) + 1) << 8) | \
  		      (*((byte *)(PTR) + 2) << 16) | \
  		      (*((byte *)(PTR) + 3) << 24))))))
-
-
---- root.c.orig	2006-10-20 16:05:45.000000000 -0400
-+++ root.c	2006-10-20 16:18:09.000000000 -0400
-@@ -68,16 +68,16 @@
-   Pixmap *pm;			
-   Atom	actual_type;		/* NOTUSED */
-   int	format;
--  int	nitems;
--  int	bytes_after;
-+  unsigned long	nitems;
-+  unsigned 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)) {
diff --git a/x11/xloadimage/pkg-descr b/x11/xloadimage/pkg-descr
index f56df7e87c92..79eb30cdaa7a 100644
--- a/x11/xloadimage/pkg-descr
+++ b/x11/xloadimage/pkg-descr
@@ -1,25 +1,13 @@
 This utility will view several types of images under X11, or load
 images onto the root window.  The current version supports:
-     Native Image File Format (NIFF)
-     Sun Rasterfile
-     GIF Image
-     JFIF-style JPEG Image
-     Portabel Network Graphics (PNG)
-     TIFF image
-     FBM Image
-     CMU WM Raster
-     Portable Bit Map (PBM, PGM, PPM)
-     Faces Project
-     Utah RLE Image
-     X Window Dump
-     Sun Visualization File Format
-     McIDAS areafile
-     VICAR Image
-     PC Paintbrush Image
-     GEM Bit Image
-     MacPaint Image
-     X Pixmap
-     X Bitmap
+
+   Native Image File Format (NIFF), Sun Rasterfile, GIF Image,
+   JFIF-style JPEG Image, Portabel Network Graphics (PNG), TIFF image,
+   FBM Image, CMU WM Raster, Portable Bit Map (PBM, PGM, PPM), Faces
+   Project, Utah RLE Image, X Window Dump, Sun Visualization File
+   Format, McIDAS areafile, VICAR Image, PC Paintbrush Image, GEM Bit
+   Image, MacPaint Image, X Pixmap, X Bitmap.
+
 A variety of options are available to modify images prior to viewing.
 These options include clipping, dithering, depth reduction, zoom,
-brightening or darkening, and image merging. 
+brightening or darkening, and image merging.