Thu Mar 2 09:31:52 2023 UTC ()
graphics/ximaging: update to V1.7

## CHANGES:
V1.7 is a bugfix release.
* Resolved scrolling issues with large directories.
* Proper handling of multibyte file names.
* Scrolling with scroll wheel/pad.
* Added optional directory browser pane.
* Focused file names can now be copy-pasted using
  primary X selection.
* Added option to hide dot files/directories.


(vins)
diff -r1.3 -r1.4 pkgsrc/graphics/ximaging/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/ximaging/distinfo
diff -r0 -r1.1 pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.SunOS
diff -r1.1 -r0 pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.Tribblix
cvs diff -r1.3 -r1.4 pkgsrc/graphics/ximaging/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ximaging/Makefile 2023/01/03 17:37:33 1.3
+++ pkgsrc/graphics/ximaging/Makefile 2023/03/02 09:31:52 1.4
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1# $NetBSD: Makefile,v 1.3 2023/01/03 17:37:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.4 2023/03/02 09:31:52 vins Exp $
2 2
3DISTNAME= ximaging-src-1.6 3DISTNAME= ximaging-src-1.7
4PKGNAME= ${DISTNAME:S,-src,,} 4PKGNAME= ${DISTNAME:S,-src,,}
5PKGREVISION= 1 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= https://fastestcode.org/dl/ 6MASTER_SITES= https://fastestcode.org/dl/
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= vins@NetBSD.org 9MAINTAINER= vins@NetBSD.org
11HOMEPAGE= https://fastestcode.org/emwm.html 10HOMEPAGE= https://fastestcode.org/emwm.html
12COMMENT= Image browser and viewer for Unix - X/Motif 11COMMENT= Image browser and viewer for Unix - X/Motif
13LICENSE= mit 12LICENSE= mit
14 13
15MAKE_FLAGS+= CC?=${CC:Q} 14MAKE_FLAGS+= CC?=${CC:Q}
16MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 15MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
17MAKE_FLAGS+= CFLAGS+="-fopenmp -DENABLE_OMP" 16MAKE_FLAGS+= CFLAGS+="-fopenmp -DENABLE_OMP"
18MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 17MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
19MAKE_FLAGS+= LDFLAGS+="-fopenmp -pthread" 18MAKE_FLAGS+= LDFLAGS+="-fopenmp -pthread"
20MAKE_FLAGS+= PNG_LIBS=-lpng16 19MAKE_FLAGS+= PNG_LIBS=-lpng16
21MAKE_FLAGS+= PREFIX=${PREFIX} 20MAKE_FLAGS+= PREFIX=${PREFIX}
22MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} 21MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
23MAKE_FLAGS+= APPLRESDIR=${PREFIX}/lib/X11/app-defaults 22MAKE_FLAGS+= APPLRESDIR=${PREFIX}/lib/X11/app-defaults
24 23
25INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
26INSTALLATION_DIRS+= lib/X11/app-defaults 25INSTALLATION_DIRS+= lib/X11/app-defaults
27 26
28do-install: 27do-install:
29 ${INSTALL_PROGRAM} ${WRKSRC}/src/ximaging ${DESTDIR}${PREFIX}/bin/ 28 ${INSTALL_PROGRAM} ${WRKSRC}/src/ximaging ${DESTDIR}${PREFIX}/bin/
30 ${INSTALL_MAN} ${WRKSRC}/src/ximaging.1 \ 29 ${INSTALL_MAN} ${WRKSRC}/src/ximaging.1 \
31 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ 30 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
32 31
33post-install: 32post-install:
34 ${INSTALL_DATA} ${WRKSRC}/src/XImaging.ad \ 33 ${INSTALL_DATA} ${WRKSRC}/src/XImaging.ad \
35 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XImaging 34 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XImaging
36 35
37.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
38.include "../../mk/motif.buildlink3.mk" 37.include "../../mk/motif.buildlink3.mk"
39.include "../../mk/jpeg.buildlink3.mk" 38.include "../../mk/jpeg.buildlink3.mk"
40.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
41.include "../../graphics/tiff/buildlink3.mk" 40.include "../../graphics/tiff/buildlink3.mk"
42.include "../../x11/libXt/buildlink3.mk" 41.include "../../x11/libXt/buildlink3.mk"
43.include "../../x11/libXinerama/buildlink3.mk" 42.include "../../x11/libXinerama/buildlink3.mk"
44.include "../../x11/libX11/buildlink3.mk" 43.include "../../x11/libX11/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/graphics/ximaging/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ximaging/distinfo 2022/12/06 13:04:59 1.1
+++ pkgsrc/graphics/ximaging/distinfo 2023/03/02 09:31:52 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2022/12/06 13:04:59 vins Exp $ 1$NetBSD: distinfo,v 1.2 2023/03/02 09:31:52 vins Exp $
2 2
3BLAKE2s (ximaging-src-1.6.tar.xz) = 8733d6719dc05ccacf28b84da77e2fdf17a539a7d1f3b917a35dd22ccffa923c 3BLAKE2s (ximaging-src-1.7.tar.xz) = 664b8d8cd5e8813fdb660956dd2fbb5b2d2b7f4eb1b848bd7454aa03a2b7e680
4SHA512 (ximaging-src-1.6.tar.xz) = a9625bc5262641ec38e5d0248154caf78c724e6050820af1efa2cade15fea871e852338dcf0274d8407200ced74dd9800599773e932724c87ca2f06e78c03277 4SHA512 (ximaging-src-1.7.tar.xz) = ef66da647c8d6594f4213b2c4ba844e1015dd82594249949d4a4a6aa8465bd78496a59c9b7e0b88e1d4c300036fdf21f651ac17efdb7dde6e71e81c8a3a2a07c
5Size (ximaging-src-1.6.tar.xz) = 99064 bytes 5Size (ximaging-src-1.7.tar.xz) = 99740 bytes
6SHA1 (patch-mf_Makefile.Linux) = 0b7fcd2f55f111258f099f5667611d2253e51169 6SHA1 (patch-mf_Makefile.Linux) = 0b7fcd2f55f111258f099f5667611d2253e51169
7SHA1 (patch-mf_Makefile.Tribblix) = 23abe40fea1f0131bd972d40c36d41047ad02398 7SHA1 (patch-mf_Makefile.SunOS) = ce7e3d7022035e67c4b200cec086e0da12329392
File Added: pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.SunOS
$NetBSD: patch-mf_Makefile.SunOS,v 1.1 2023/03/02 09:31:52 vins Exp $

Portability fix for bmake.
Do not assume Motif to be packaged without Xft.

--- mf/Makefile.SunOS.orig	2022-07-31 15:43:05.000000000 +0000
+++ mf/Makefile.SunOS
@@ -14,12 +14,6 @@ CFLAGS = -O2 -Wall $(INCDIRS)
 LDFLAGS = -pthread
 IPC_OBJS = xipc.o
 
-include common.mf
+.include "common.mf"
 
-install:
-	install -m 775 -f $(PREFIX)/bin ximaging
-	install -m 664 -f $(MANDIR)/man1 ximaging.1
-	# While Tribblix packages Motif with no Xft
-	sed '/renderTable/d' XImaging.ad > XImaging
-	install -m 664 -f $(APPLRESDIR) XImaging
-	rm XImaging
+install: common_install
File Deleted: pkgsrc/graphics/ximaging/patches/Attic/patch-mf_Makefile.Tribblix