CVS commit: pkgsrc/graphics/ximaging

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Aug  3 06:29:10 UTC 2025

Modified Files:
        pkgsrc/graphics/ximaging: Makefile distinfo
Added Files:
        pkgsrc/graphics/ximaging/patches: patch-Makefile
            patch-mf_Makefile.pkgsrc patch-src_common.mf
Removed Files:
        pkgsrc/graphics/ximaging/patches: patch-mf_Makefile.Linux
            patch-mf_Makefile.SunOS

Log Message:
graphics/ximaging: update to 1.9

# pkgsrc changes

Use a unified makefile, similarly to other packages from fastcode.org

# upstream changes

This is a maintenance release, improving usability, and fixing bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/ximaging/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/ximaging/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/ximaging/patches/patch-Makefile \
    pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.pkgsrc \
    pkgsrc/graphics/ximaging/patches/patch-src_common.mf
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.Linux \
    pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.SunOS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/ximaging/Makefile
diff -u pkgsrc/graphics/ximaging/Makefile:1.8 pkgsrc/graphics/ximaging/Makefile:1.9
--- pkgsrc/graphics/ximaging/Makefile:1.8       Thu Apr 24 14:14:42 2025
+++ pkgsrc/graphics/ximaging/Makefile   Sun Aug  3 06:29:10 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2025/04/24 14:14:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2025/08/03 06:29:10 vins Exp $
 
-DISTNAME=      ximaging-src-1.8
+DISTNAME=      ximaging-src-1.9
 PKGNAME=       ${DISTNAME:S,-src,,}
-PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  https://fastestcode.org/dl/
 EXTRACT_SUFX=  .tar.xz
@@ -12,40 +11,23 @@ HOMEPAGE=   https://fastestcode.org/emwm.h
 COMMENT=       Image browser and viewer for Unix - X/Motif
 LICENSE=       mit
 
-# Enable support for OpenMP, Xinerama and various image formats.
-CFLAGS+=       -fopenmp -DENABLE_JPEG -DENABLE_PNG -DENABLE_OMP \
-               -DENABLE_PNG -DENABLE_TIFF -DENABLE_XINERAMA
-LDFLAGS+=      -fopenmp
-
 PTHREAD_OPTS+=         require
 PTHREAD_AUTO_VARS=     yes
-BUILDLINK_TRANSFORM+=  rm:-pthread
 
-MAKE_FLAGS+=   CC?=${CC:Q}
-MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
-MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
-MAKE_FLAGS+=   PNG_LIBS=-lpng16
-MAKE_FLAGS+=   PREFIX=${PREFIX:Q}
-MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+=   APPLRESDIR=${PREFIX}/lib/X11/app-defaults
-
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS+=    lib/X11/app-defaults
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/ximaging ${DESTDIR}${PREFIX}/bin/
-       ${INSTALL_MAN} ${WRKSRC}/src/ximaging.1                                 \
-       ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/src/XImaging.ad                               \
-       ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XImaging
+SUBST_CLASSES+=                pkgsrc
+SUBST_STAGE.pkgsrc=    pre-configure
+SUBST_FILES.pkgsrc=    mf/Makefile.pkgsrc
+SUBST_VARS.pkgsrc+=    PREFIX PKGMANDIR RCDIR
+SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders
+
+# Enable OpenMP loop optimizations
+MAKE_FLAGS+=   ENABLE_OMP=1
 
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/ximaging/distinfo
diff -u pkgsrc/graphics/ximaging/distinfo:1.3 pkgsrc/graphics/ximaging/distinfo:1.4
--- pkgsrc/graphics/ximaging/distinfo:1.3       Tue Jul 30 15:30:54 2024
+++ pkgsrc/graphics/ximaging/distinfo   Sun Aug  3 06:29:10 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2024/07/30 15:30:54 vins Exp $
+$NetBSD: distinfo,v 1.4 2025/08/03 06:29:10 vins Exp $
 
-BLAKE2s (ximaging-src-1.8.tar.xz) = e65fd0c796b5520d2226c4392fa2c9432a82bcfc8700ff1868b76acd4e4542db
-SHA512 (ximaging-src-1.8.tar.xz) = 7494e25c799140251b5c672f81e674d53de5b2b6134cbf0d2d1af47802d9101e036434e27431395c70e089e81032304a748c140b29691b3d66464168e1e614b7
-Size (ximaging-src-1.8.tar.xz) = 111180 bytes
-SHA1 (patch-mf_Makefile.Linux) = 0b7fcd2f55f111258f099f5667611d2253e51169
-SHA1 (patch-mf_Makefile.SunOS) = ce7e3d7022035e67c4b200cec086e0da12329392
+BLAKE2s (ximaging-src-1.9.tar.xz) = 53b081365264be575dfb041cdd38785e40ba807aa1a97dd030847e97207a735c
+SHA512 (ximaging-src-1.9.tar.xz) = 4bfc452262e8adf60287777825c271215abefba4de4d2dfba24d249d58829dc421a24fdf2744c19d7dada14a0e45ce74839d3b930743cf238e6d0505ddeff886
+Size (ximaging-src-1.9.tar.xz) = 114000 bytes
+SHA1 (patch-Makefile) = 1316be75730b7823d5f0f00adb243bc5b9100f26
+SHA1 (patch-mf_Makefile.pkgsrc) = 591e05e44f7640d342e0c329923c6ba0d58b649f
+SHA1 (patch-src_common.mf) = 2244171b88c7d64a36af3b5edd5c4e29b2259052

Added files:

Index: pkgsrc/graphics/ximaging/patches/patch-Makefile
diff -u /dev/null pkgsrc/graphics/ximaging/patches/patch-Makefile:1.1
--- /dev/null   Sun Aug  3 06:29:10 2025
+++ pkgsrc/graphics/ximaging/patches/patch-Makefile     Sun Aug  3 06:29:10 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-Makefile,v 1.1 2025/08/03 06:29:10 vins Exp $
+
+Prefer pkgsrc Makefile.
+
+--- Makefile.orig      2024-12-08 10:46:59.443489899 +0000
++++ Makefile
+@@ -2,7 +2,10 @@ all:
+       @if [ -e src/Makefile ]; then \
+               $(MAKE) -C src $(MAKEFLAGS); \
+       else \
+-              if [ -e mf/Makefile.$$(uname) ]; then \
++               if [ -e mf/Makefile.pkgsrc ]; then \
++                      ln -s ../mf/Makefile.pkgsrc src/Makefile && \
++                      $(MAKE) -C src $(MAKEFLAGS); \
++              elif [ -e mf/Makefile.$$(uname) ]; then \
+                       ln -s ../mf/Makefile.$$(uname) src/Makefile && \
+                       $(MAKE) -C src $(MAKEFLAGS); \
+               else \
Index: pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.pkgsrc
diff -u /dev/null pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.pkgsrc:1.1
--- /dev/null   Sun Aug  3 06:29:10 2025
+++ pkgsrc/graphics/ximaging/patches/patch-mf_Makefile.pkgsrc   Sun Aug  3 06:29:10 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-mf_Makefile.pkgsrc,v 1.1 2025/08/03 06:29:10 vins Exp $
+
+Add custom Makefile for pkgsrc.
+
+--- mf/Makefile.pkgsrc.orig    2025-08-03 06:10:13.665504435 +0000
++++ mf/Makefile.pkgsrc
+@@ -0,0 +1,27 @@
++
++# Ximaging pkgsrc Makefile
++
++PREFIX                = @PREFIX@
++BINDIR                = @PREFIX@/bin
++MANDIR                = @PREFIX@/@PKGMANDIR@
++APPLRESDIR    = @PREFIX@/lib/X11/app-defaults
++
++# Enable support Xinerama and various image formats.
++CFLAGS+=        -DENABLE_XINERAMA \
++              -DENABLE_JPEG -DENABLE_PNG -DENABLE_TIFF
++
++# OpenMP loop optimizations
++.ifdef ENABLE_OMP
++CFLAGS                += -fopenmp -DENABLE_OMP
++LDFLAGS               += -fopenmp
++.endif
++
++# IPC support for when CDE integration is disabled
++IPC_OBJS      = xipc.o
++
++.include "common.mf"
++
++# pkgsrc compat
++PNG_LIBS      = -lpng16
++
++install: common_install
Index: pkgsrc/graphics/ximaging/patches/patch-src_common.mf
diff -u /dev/null pkgsrc/graphics/ximaging/patches/patch-src_common.mf:1.1
--- /dev/null   Sun Aug  3 06:29:10 2025
+++ pkgsrc/graphics/ximaging/patches/patch-src_common.mf        Sun Aug  3 06:29:10 2025
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_common.mf,v 1.1 2025/08/03 06:29:10 vins Exp $
+
+* Use standard CFLAGS and LDFLAGS.
+* Provide a pkgsrc-compliant install target.
+
+--- src/common.mf.orig 2025-07-30 21:22:50.000000000 +0000
++++ src/common.mf
+@@ -56,7 +56,7 @@ OBJS = main.o menu.o imgfile.o browser.o
+ 
+ # Application
+ ximaging: $(OBJS)
+-      $(CC) -o $@ $(LIBDIRS) $(LDFLAGS) $(OBJS) $(SYS_LIBS) $(X_LIBS) \
++      $(CC) -o $@ $(LDFLAGS) $(OBJS) $(SYS_LIBS) $(X_LIBS) \
+               $(EXT_LIBS) $(LD_RPATH) $(CDE_LIBS)
+ 
+ # Message catalogs
+@@ -76,14 +76,16 @@ clean:
+ 
+ # Dependencies
+ .depend:
+-      $(CC) -MM $(INCDIRS) $(OBJS:.o=.c) > .depend
++      $(CC) -MM $(CFLAGS) $(OBJS:.o=.c) > .depend
+ 
+ # Root installation
+ common_install: $(INSTALL_RULES)
+-      install -m755 -o0 -g0 ximaging $(PREFIX)/bin/ximaging
+-      install -d -o0 -g0 $(MANDIR)/man1
+-      install -m644 -o0 -g0 ximaging.1 $(MANDIR)/man1/ximaging.1
+-      install -m644 -o0 -g0 XImaging.ad $(APPLRESDIR)/XImaging
++      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_PROGRAM) ximaging $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
++      $(BSD_INSTALL_MAN) ximaging.1 $(DESTDIR)$(MANDIR)/man1
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(APPLRESDIR)
++      $(BSD_INSTALL_DATA) XImaging.ad $(DESTDIR)$(APPLRESDIR)/XImaging
+       
+ # Install message catalogs and localized share files
+ common_install_nls: messages