CVS commit: pkgsrc/sysutils/xfile

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Aug  3 07:23:08 UTC 2025

Modified Files:
        pkgsrc/sysutils/xfile: Makefile PLIST distinfo options.mk
        pkgsrc/sysutils/xfile/patches: patch-src_common.mf
Removed Files:
        pkgsrc/sysutils/xfile/patches: patch-addon_types_archive.db

Log Message:
sysutils/xfile: update to 1.0 (stale release)

# upstream changes (since 20250430 snapshot)

* Optional Directory Up button in the path widget.
* Added Edit->Reselect, which reacquires primary X selection.
* Use utf8 window/icon titles if supported.
* Added history to prompt and directory selection dialogs.
* Added progress widget.
* Other: various bug fixes, code cleanup, man page fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xfile/Makefile \
    pkgsrc/sysutils/xfile/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xfile/PLIST \
    pkgsrc/sysutils/xfile/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/xfile/patches/patch-addon_types_archive.db
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xfile/patches/patch-src_common.mf

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

Modified files:

Index: pkgsrc/sysutils/xfile/Makefile
diff -u pkgsrc/sysutils/xfile/Makefile:1.3 pkgsrc/sysutils/xfile/Makefile:1.4
--- pkgsrc/sysutils/xfile/Makefile:1.3  Wed May  7 15:56:43 2025
+++ pkgsrc/sysutils/xfile/Makefile      Sun Aug  3 07:23:07 2025
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2025/05/07 15:56:43 vins Exp $
+# $NetBSD: Makefile,v 1.4 2025/08/03 07:23:07 vins Exp $
 
-DISTNAME=      xfile-20250430
-PKGREVISION=   1
+DISTNAME=      xfile-src-1.0
+PKGNAME=       ${DISTNAME:S/-src//}
 CATEGORIES=    sysutils x11
-#MASTER_SITES= https://fastestcode.org/dl/
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=alx210/}
+MASTER_SITES=  https://fastestcode.org/dl/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
-GITHUB_TAG=    ffdae16e124727f85b3ad3226d619a8d0ab4abe9
+EXTRACT_SUFX=  .tar.xz
 
-DISTFILES+=    ${DEFAULT_DISTFILES} xfile-slanted-icons.tar.xz
-SITES.xfile-slanted-icons.tar.xz= https://fastestcode.org/dl/
+DISTFILES+=    ${DEFAULT_DISTFILES} xfile-addon.tar.xz \
+               xfile-slanted-icons.tar.xz
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://fastestcode.org/xfile.html
@@ -37,21 +36,20 @@ MAKE_FLAGS+=        LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=   SHELL=${SH:Q}
 MAKE_FLAGS+=   AWK=${AWK:Q}
 
-#WRKSRC=       ${WRKDIR}/xfile-beta
-
 post-extract:
        ${RUN}${MV} ${WRKDIR}/slanted-icons/*.xpm       \
-       ${WRKSRC}/addon/icons/
+       ${WRKSRC}/src/icons/
 
 INSTALLATION_DIRS+=    share/applications
 
 post-install:
-       ${RUN}${LN} -s ${PREFIX}/bin/xfile ${DESTDIR}${PREFIX}/bin/xfile-open
-       ${INSTALL_DATA} ${WRKSRC}/addon/icons/*.xpm     \
+       ${RUN}${LN} -s ${PREFIX}/bin/xfile                      \
+               ${DESTDIR}${PREFIX}/bin/xfile-open
+       ${INSTALL_DATA} ${WRKDIR}/xfile-addon/icons/*.xpm       \
                ${DESTDIR}${SHAREDIR}/icons
-       ${INSTALL_DATA} ${WRKSRC}/addon/types/*.db      \
+       ${INSTALL_DATA} ${WRKDIR}/xfile-addon/types/*.db        \
                ${DESTDIR}${SHAREDIR}/types
-       ${INSTALL_DATA} ${FILESDIR}/xfile.desktop       \
+       ${INSTALL_DATA} ${FILESDIR}/xfile.desktop               \
                ${DESTDIR}${PREFIX}/share/applications
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/sysutils/xfile/distinfo
diff -u pkgsrc/sysutils/xfile/distinfo:1.3 pkgsrc/sysutils/xfile/distinfo:1.4
--- pkgsrc/sysutils/xfile/distinfo:1.3  Wed May  7 15:56:43 2025
+++ pkgsrc/sysutils/xfile/distinfo      Sun Aug  3 07:23:07 2025
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.3 2025/05/07 15:56:43 vins Exp $
+$NetBSD: distinfo,v 1.4 2025/08/03 07:23:07 vins Exp $
 
-BLAKE2s (xfile-20250430/xfile-20250430-ffdae16e124727f85b3ad3226d619a8d0ab4abe9.tar.gz) = c581367b791b313d820094e422a38198afd021b21caab2ef37741897abca8451
-SHA512 (xfile-20250430/xfile-20250430-ffdae16e124727f85b3ad3226d619a8d0ab4abe9.tar.gz) = 
b489d1a9ba0277032df90bff7669b7013333f9bfb26b1f3b6360b3390ab008f74367cca3998d9853ecbffa582edca3a3880d1c22985f315dd6fe838b47a2a8ed
-Size (xfile-20250430/xfile-20250430-ffdae16e124727f85b3ad3226d619a8d0ab4abe9.tar.gz) = 149039 bytes
-BLAKE2s (xfile-20250430/xfile-slanted-icons.tar.xz) = 05d15677163ae69cd7184af0f96006303129d70ab4bebecf5187399f4b6b2761
-SHA512 (xfile-20250430/xfile-slanted-icons.tar.xz) = 0598f553d8f45487ceedd0495a115d0f1618e2fb18657e3d9ce7ae3ef0040c9b06aa9bf7224eeb59856f9e9f1258a666a4c52f46ca5edd25f8e29e4105387d50
-Size (xfile-20250430/xfile-slanted-icons.tar.xz) = 1772 bytes
-BLAKE2s (xfile-20250430/xfile-xdgsvc-src.tar.xz) = 17134f7556d67f1d340733e106c2b17903306ec07ad760fcd418f09b8f35df93
-SHA512 (xfile-20250430/xfile-xdgsvc-src.tar.xz) = df53d6db5eef47d3c1252d2a9346f0c56ec474622c54ebe0f3cb39ce45cca876315fa9e2ac333295f0be46e812b21b8d2e14bc08f9dc5914cd3aee2cdfac87b4
-Size (xfile-20250430/xfile-xdgsvc-src.tar.xz) = 3616 bytes
+BLAKE2s (xfile-1.0/xfile-addon.tar.xz) = 4ea033bd0c59337797eaa106e5f2e7d1064a79e3a8895a6af0b6d1e8b4739781
+SHA512 (xfile-1.0/xfile-addon.tar.xz) = db64405367fe4594369b21c0cdeffda3fa8de53e0e468dde09d9c6f295fc5e2b7225ab593ca6917f4b487a71bd4df7c41257b0a881124a3f0a7758707f94477d
+Size (xfile-1.0/xfile-addon.tar.xz) = 9848 bytes
+BLAKE2s (xfile-1.0/xfile-slanted-icons.tar.xz) = 05d15677163ae69cd7184af0f96006303129d70ab4bebecf5187399f4b6b2761
+SHA512 (xfile-1.0/xfile-slanted-icons.tar.xz) = 0598f553d8f45487ceedd0495a115d0f1618e2fb18657e3d9ce7ae3ef0040c9b06aa9bf7224eeb59856f9e9f1258a666a4c52f46ca5edd25f8e29e4105387d50
+Size (xfile-1.0/xfile-slanted-icons.tar.xz) = 1772 bytes
+BLAKE2s (xfile-1.0/xfile-src-1.0.tar.xz) = 0a91263920ddafb24718e402bfb0f3e10bb08f7c1d9b3239ec90f36fee5bb488
+SHA512 (xfile-1.0/xfile-src-1.0.tar.xz) = 8bcf80f7d387945f9c22aa476f27a100cd22f4cdadc7ed92627a983e8f8ce3f39ac5cb4b04cb58cc4a354194ba2a487640e8cb45eb746fd5849ff075596ad1f5
+Size (xfile-1.0/xfile-src-1.0.tar.xz) = 121120 bytes
+BLAKE2s (xfile-1.0/xfile-xdgsvc-src.tar.xz) = 17134f7556d67f1d340733e106c2b17903306ec07ad760fcd418f09b8f35df93
+SHA512 (xfile-1.0/xfile-xdgsvc-src.tar.xz) = df53d6db5eef47d3c1252d2a9346f0c56ec474622c54ebe0f3cb39ce45cca876315fa9e2ac333295f0be46e812b21b8d2e14bc08f9dc5914cd3aee2cdfac87b4
+Size (xfile-1.0/xfile-xdgsvc-src.tar.xz) = 3616 bytes
 SHA1 (patch-Makefile) = 1316be75730b7823d5f0f00adb243bc5b9100f26
-SHA1 (patch-addon_types_archive.db) = 62a95a0fc05a86771e9a0f9ab4c0c9be3e42eba7
 SHA1 (patch-mf_Makefile.pkgsrc) = 1be35b7c590b81366b22871883f783c5fa559cce
-SHA1 (patch-src_common.mf) = d7dc6dd85f73287d2dcc1143f5beb3911ef449d2
+SHA1 (patch-src_common.mf) = cb9bea7fe9d4223777b39c9cbe2514069c3861e6
 SHA1 (patch-src_mkicons.sh) = fba5d7bd304d14bdbbee39146302f8c427601b1a
 SHA1 (patch-src_xdgsvc.mf) = 776de35bc93df1b63345a542bf712f328642e6c6

Index: pkgsrc/sysutils/xfile/PLIST
diff -u pkgsrc/sysutils/xfile/PLIST:1.2 pkgsrc/sysutils/xfile/PLIST:1.3
--- pkgsrc/sysutils/xfile/PLIST:1.2     Thu May  1 07:33:20 2025
+++ pkgsrc/sysutils/xfile/PLIST Sun Aug  3 07:23:07 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/05/01 07:33:20 vins Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/08/03 07:23:07 vins Exp $
 bin/xfile
 bin/xfile-open
 ${PLIST.dbus}bin/xfile-xdgsvc
@@ -13,6 +13,10 @@ share/xfile/icons/arch.l.xpm
 share/xfile/icons/arch.m.xpm
 share/xfile/icons/arch.s.xpm
 share/xfile/icons/arch.t.xpm
+share/xfile/icons/asm.l.xpm
+share/xfile/icons/asm.m.xpm
+share/xfile/icons/asm.s.xpm
+share/xfile/icons/asm.t.xpm
 share/xfile/icons/audio.l.xpm
 share/xfile/icons/audio.m.xpm
 share/xfile/icons/audio.s.xpm
@@ -78,6 +82,14 @@ share/xfile/icons/isocd.l.xpm
 share/xfile/icons/isocd.m.xpm
 share/xfile/icons/isocd.s.xpm
 share/xfile/icons/isocd.t.xpm
+share/xfile/icons/java.l.xpm
+share/xfile/icons/java.m.xpm
+share/xfile/icons/java.s.xpm
+share/xfile/icons/java.t.xpm
+share/xfile/icons/javac.l.xpm
+share/xfile/icons/javac.m.xpm
+share/xfile/icons/javac.s.xpm
+share/xfile/icons/javac.t.xpm
 share/xfile/icons/kra.l.xpm
 share/xfile/icons/kra.m.xpm
 share/xfile/icons/kra.s.xpm
@@ -141,6 +153,14 @@ share/xfile/icons/pixmap.l.xpm
 share/xfile/icons/pixmap.m.xpm
 share/xfile/icons/pixmap.s.xpm
 share/xfile/icons/pixmap.t.xpm
+share/xfile/icons/python.l.xpm
+share/xfile/icons/python.m.xpm
+share/xfile/icons/python.s.xpm
+share/xfile/icons/python.t.xpm
+share/xfile/icons/rtrace.l.xpm
+share/xfile/icons/rtrace.m.xpm
+share/xfile/icons/rtrace.s.xpm
+share/xfile/icons/rtrace.t.xpm
 share/xfile/icons/script.l.xpm
 share/xfile/icons/script.m.xpm
 share/xfile/icons/script.s.xpm
@@ -182,6 +202,7 @@ share/xfile/icons/xpm.m.xpm
 share/xfile/icons/xpm.s.xpm
 share/xfile/icons/xpm.t.xpm
 share/xfile/types/archive.db
+share/xfile/types/code.db
 share/xfile/types/graphics.db
 share/xfile/types/office.db
 share/xfile/types/system.db
Index: pkgsrc/sysutils/xfile/options.mk
diff -u pkgsrc/sysutils/xfile/options.mk:1.2 pkgsrc/sysutils/xfile/options.mk:1.3
--- pkgsrc/sysutils/xfile/options.mk:1.2        Wed May  7 15:56:43 2025
+++ pkgsrc/sysutils/xfile/options.mk    Sun Aug  3 07:23:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2025/05/07 15:56:43 vins Exp $
+# $NetBSD: options.mk,v 1.3 2025/08/03 07:23:07 vins Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xfile
 
@@ -18,7 +18,6 @@ PLIST_VARS+=          dbus
 .  include "../../sysutils/dbus/buildlink3.mk"
 
 DISTFILES+=    xfile-xdgsvc-src.tar.xz
-SITES.xfile-xdgsvc-src.tar.xz= https://fastestcode.org/dl/
 
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure

Index: pkgsrc/sysutils/xfile/patches/patch-src_common.mf
diff -u pkgsrc/sysutils/xfile/patches/patch-src_common.mf:1.2 pkgsrc/sysutils/xfile/patches/patch-src_common.mf:1.3
--- pkgsrc/sysutils/xfile/patches/patch-src_common.mf:1.2       Thu May  1 07:33:20 2025
+++ pkgsrc/sysutils/xfile/patches/patch-src_common.mf   Sun Aug  3 07:23:07 2025
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_common.mf,v 1.2 2025/05/01 07:33:20 vins Exp $
+$NetBSD: patch-src_common.mf,v 1.3 2025/08/03 07:23:07 vins Exp $
 
 * Use standard CFLAGS and LDFLAGS.
 * Point to default awk implementation path.
 * Provide a pkgsrc-compliant install target.
 * Build and install DBus support.
 
---- src/common.mf.orig 2024-12-28 23:18:37.000000000 +0000
+--- src/common.mf.orig 2025-08-02 15:14:30.000000000 +0000
 +++ src/common.mf
 @@ -4,8 +4,6 @@
  X_LIBS = -lX11 -lXinerama -lXm -lXt -lXpm
@@ -29,7 +29,7 @@ $NetBSD: patch-src_common.mf,v 1.2 2025/
  
  # Built-in icons
  icons.h: mkicons.sh icons/*.xpm
-@@ -31,7 +29,7 @@ xfile.ad: $(APPDEFS)
+@@ -31,7 +29,7 @@ xfile.ad: $(APPDEFS_CORE)
  
  # Default (fallback) resources
  defaults.c: xfile.ad
@@ -37,8 +37,8 @@ $NetBSD: patch-src_common.mf,v 1.2 2025/
 +      $(AWK) -f adtoc.awk xfile.ad > $@
  
  # Manpage
- MANUAL = man/intro.man man/gui.man man/db.man man/res.man man/footer.man
-@@ -48,24 +46,24 @@ clean:
+ MANUAL = man/intro.man man/gui.man man/db.man man/appres.man \
+@@ -49,24 +47,24 @@ clean:
  
  # Dependencies
  .depend: $(XFILE_OBJS:.o=.c) icons.h