svn commit: r451065 - in head/x11/xloadimage: . files

[Alex Kozlov]

Author: ak
Date: Mon Oct  2 04:01:10 2017
New Revision: 451065
URL: https://svnweb.freebsd.org/changeset/ports/451065

Log:
  - Update to debian patchset 24
    * Fix fullscreen scaling
    * Fix shrink zooming upward
    * Manual page various fixes

Modified:
  head/x11/xloadimage/Makefile
  head/x11/xloadimage/distinfo
  head/x11/xloadimage/files/patch-Makefile.in

Modified: head/x11/xloadimage/Makefile
==============================================================================
--- head/x11/xloadimage/Makefile	Mon Oct  2 03:14:10 2017	(r451064)
+++ head/x11/xloadimage/Makefile	Mon Oct  2 04:01:10 2017	(r451065)
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	xloadimage
-PORTVERSION=	4.1.21
-PORTREVISION=	1
+PORTVERSION=	4.1.24
 CATEGORIES=	x11 graphics
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	${PORTNAME}.${VERSION}
 DISTFILES=	${DISTNAME:S/./_/}.orig${EXTRACT_SUFX} \
-		${DISTNAME:S/./_/}-${REVISION}.debian.tar.gz
+		${DISTNAME:S/./_/}-${REVISION}.debian.tar.xz
 
 MAINTAINER=	ak at FreeBSD.org
 COMMENT=	X11 Image Loading Utility
@@ -21,6 +20,9 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 CONFLICTS_INSTALL=	xli-*
 
 EXTRA_PATCHES=	${WRKDIR}/debian/patches/*.patch
+IGNORE_PATCHES=	07_SYSPATHFILE.patch 24_libtiff5.patch \
+		25_hardening-flags.patch 26_uufilter-implicit-declaration.patch \
+		30_libtiff5.patch 31_reproducible-build.patch
 
 PATCH_STRIP=	-p1
 VERSION=	${PORTVERSION:R}
@@ -32,6 +34,9 @@ GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+
+pre-patch:
+	@${RM} ${IGNORE_PATCHES:S,^,${WRKDIR}/debian/patches/,}
 
 post-patch:
 	@${CHMOD} a+rx ${WRKSRC}/configure

Modified: head/x11/xloadimage/distinfo
==============================================================================
--- head/x11/xloadimage/distinfo	Mon Oct  2 03:14:10 2017	(r451064)
+++ head/x11/xloadimage/distinfo	Mon Oct  2 04:01:10 2017	(r451065)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1465187272
+TIMESTAMP = 1506910724
 SHA256 (xloadimage_4.1.orig.tar.gz) = 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
 SIZE (xloadimage_4.1.orig.tar.gz) = 596021
-SHA256 (xloadimage_4.1-21.debian.tar.gz) = 4a15879f501462f1e45f3f8064a67b46362826c44bab5827e5dc051cd5c0a49f
-SIZE (xloadimage_4.1-21.debian.tar.gz) = 76415
+SHA256 (xloadimage_4.1-24.debian.tar.xz) = 3f5332fbca08e6c1d2ecad2f4ddeed5390273b4607921b0e2d8385eb75b1ed85
+SIZE (xloadimage_4.1-24.debian.tar.xz) = 69684

Modified: head/x11/xloadimage/files/patch-Makefile.in
==============================================================================
--- head/x11/xloadimage/files/patch-Makefile.in	Mon Oct  2 03:14:10 2017	(r451064)
+++ head/x11/xloadimage/files/patch-Makefile.in	Mon Oct  2 04:01:10 2017	(r451065)
@@ -6,7 +6,7 @@
  
 +prefix = @prefix@
  CC = @CC@
--DEFS = @DEFS@ -DSYSPATHFILE=\"/etc/X11/Xloadimage\"
+-DEFS = @DEFS@
 -CFLAGS = @CFLAGS@
 +DEFS = @DEFS@ -DSYSPATHFILE=\"@sysconfdir@/xloadimagerc\"
 +CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@