[Midnightbsd-cvs] mports [23895] trunk/x11/xloadimage: update

[laffer1 at midnightbsd.org]

Revision: 23895
          http://svnweb.midnightbsd.org/mports/?rev=23895
Author:   laffer1
Date:     2018-08-26 16:11:18 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/x11/xloadimage/Makefile
    trunk/x11/xloadimage/files/patch-Makefile.in

Added Paths:
-----------
    trunk/x11/xloadimage/files/patch-build-info

Modified: trunk/x11/xloadimage/Makefile
===================================================================
--- trunk/x11/xloadimage/Makefile	2018-08-26 20:09:54 UTC (rev 23894)
+++ trunk/x11/xloadimage/Makefile	2018-08-26 20:11:18 UTC (rev 23895)
@@ -1,13 +1,12 @@
 # $MidnightBSD$
 
 PORTNAME=	xloadimage
-PORTVERSION=	4.1.21
-PORTREVISION=	2
+PORTVERSION=	4.1.24
 CATEGORIES=	x11 graphics
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+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=	ports at MidnightBSD.org
 COMMENT=	X11 Image Loading Utility
@@ -14,18 +13,21 @@
 
 LICENSE=	mit
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 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}
 REVISION=	${PORTVERSION:E}
 
+USES=		jpeg
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
@@ -32,6 +34,9 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+pre-patch:
+	@${RM} ${IGNORE_PATCHES:S,^,${WRKDIR}/debian/patches/,}
+
 post-patch:
 	@${CHMOD} a+rx ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|TIFFHeader|TIFFHeaderClassic|g' \
@@ -43,18 +48,16 @@
 		${WRKSRC}/xloadimage.man
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xloadimage ${PREFIX}/bin
-	@cd ${PREFIX}/bin && \
+	${INSTALL_PROGRAM} ${WRKSRC}/xloadimage ${STAGEDIR}${PREFIX}/bin
+	@(cd ${STAGEDIR}${PREFIX}/bin && \
 		${LN} -sf xloadimage xsetbg && \
-		${LN} -sf xloadimage xview
-	${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${MAN1PREFIX}/man/man1/xloadimage.1
-	${INSTALL_MAN} ${WRKSRC}/uufilter.man ${MAN1PREFIX}/man/man1/uufilter.1
-	${INSTALL_DATA} ${WRKSRC}/xloadimagerc ${PREFIX}/etc/xloadimagerc.sample
-	@[ -f ${PREFIX}/etc/xloadimagerc ] || ${CP} -f ${PREFIX}/etc/xloadimagerc.sample \
-                ${PREFIX}/etc/xloadimagerc
-	@(cd ${MAN1PREFIX}/man/man1 && \
+		${LN} -sf xloadimage xview )
+	${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/uufilter.man ${STAGEDIR}${MAN1PREFIX}/man/man1/uufilter.1
+	${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${STAGEDIR}${MAN1PREFIX}/man/man1/xloadimage.1
+	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && \
 		${LN} -sf xloadimage.1 xsetbg.1 && \
 		${LN} -sf xloadimage.1 xview.1 )
+	${INSTALL_DATA} ${WRKSRC}/xloadimagerc ${STAGEDIR}${PREFIX}/etc/xloadimagerc.sample
 
 .include <bsd.port.mk>

Modified: trunk/x11/xloadimage/files/patch-Makefile.in
===================================================================
--- trunk/x11/xloadimage/files/patch-Makefile.in	2018-08-26 20:09:54 UTC (rev 23894)
+++ trunk/x11/xloadimage/files/patch-Makefile.in	2018-08-26 20:11:18 UTC (rev 23895)
@@ -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@

Added: trunk/x11/xloadimage/files/patch-build-info
===================================================================
--- trunk/x11/xloadimage/files/patch-build-info	                        (rev 0)
+++ trunk/x11/xloadimage/files/patch-build-info	2018-08-26 20:11:18 UTC (rev 23895)
@@ -0,0 +1,35 @@
+Index: build-info
+@@ -3,32 +3,16 @@
+ 
+ # try to find out the build date
+ 
+-if [ -x /bin/date ]; then
+-  date='char *BuildDate= "'`/bin/date`'";'
+-else
+   date='char *BuildDate= (char *)0;'
+-fi
+ 
+ # try to find out who's doing the build.  there are two common places
+ # for 'id', /bin/id and /usr/bin/id.
+ 
+-if [ -x /bin/id ]; then
+-  user='char *BuildUser= "'`/bin/id`'";'
+-else
+-  if [ -x /usr/bin/id ]; then
+-    user='char *BuildUser= "'`/usr/bin/id`'";'
+-  else
+     user='char *BuildUser= (char *)0;'
+-  fi
+-fi
+ 
+ # try to find out the system information
+ 
+-if [ -x /bin/uname ]; then
+-  uname='char *BuildSystem= "'`/bin/uname -a`'";'
+-else
+-  uname='char *BuildSystem= "<unknown system>";'
+-fi
++  uname='char *BuildSystem= "FreeBSD";'
+ 
+ echo '/* THIS FILE IS AUTOMATICALLY GENERATED */' > build.c
+ echo $uname >> build.c


Property changes on: trunk/x11/xloadimage/files/patch-build-info
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property