CVS commit: pkgsrc/sysutils/xfile

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/xfile
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Thu, 1 May 2025 07:33:20 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu May  1 07:33:20 UTC 2025

Modified Files:
        pkgsrc/sysutils/xfile: Makefile PLIST distinfo
        pkgsrc/sysutils/xfile/patches: patch-mf_Makefile.pkgsrc
            patch-src_common.mf
Added Files:
        pkgsrc/sysutils/xfile/patches: patch-src_xdgsvc.mf
Removed Files:
        pkgsrc/sysutils/xfile/patches: patch-src_xfile.service

Log Message:
sysutils/xfile: update to 20250430

# pkgsrc changes
* The beta 1.0 release is not actually a fixed release, but a rolling
  distribution which is kept in sync with the most recent upstream commit.
  The package uses now a different versioning scheme based on commit date.
  This is a temporary solution until an official 1.0 release is out.

* DBus support is now optional (disabled by default).

# upstream changes
* Added more icons and types
* Support primary selection copy/move
* Updated mount/progress dialogs
* Minor bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/xfile/Makefile \
    pkgsrc/sysutils/xfile/PLIST pkgsrc/sysutils/xfile/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xfile/patches/patch-mf_Makefile.pkgsrc \
    pkgsrc/sysutils/xfile/patches/patch-src_common.mf
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xfile/patches/patch-src_xdgsvc.mf
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/xfile/patches/patch-src_xfile.service

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.1 pkgsrc/sysutils/xfile/Makefile:1.2
--- pkgsrc/sysutils/xfile/Makefile:1.1  Sun Jan  5 21:38:21 2025
+++ pkgsrc/sysutils/xfile/Makefile      Thu May  1 07:33:20 2025
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2025/01/05 21:38:21 vins Exp $
+# $NetBSD: Makefile,v 1.2 2025/05/01 07:33:20 vins Exp $
 
 DISTNAME=      xfile-src-1.0-beta
-PKGNAME=       ${DISTNAME:S/-src//:S/-beta/beta/}
+PKGNAME=       ${DISTNAME:S/-src//:S/1.0-beta/20250430/}
 CATEGORIES=    sysutils x11
 MASTER_SITES=  https://fastestcode.org/dl/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 EXTRACT_SUFX=  .tar.xz
-DISTFILES+=    ${DEFAULT_DISTFILES} xfile-xdgsvc-src.tar.xz    \
-               xfile-slanted-icons.tar.xz
+DISTFILES+=    ${DEFAULT_DISTFILES} xfile-slanted-icons.tar.xz
 
 MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://fastestcode.org/xfile.html
@@ -23,10 +22,12 @@ SHAREDIR=   ${PREFIX}/share/${PKGBASE}
 
 SUBST_CLASSES+=                pkgsrc
 SUBST_STAGE.pkgsrc=    pre-configure
-SUBST_FILES.pkgsrc=    mf/Makefile.pkgsrc src/mkicons.sh src/xfile.service
+SUBST_FILES.pkgsrc=    mf/Makefile.pkgsrc src/mkicons.sh
 SUBST_VARS.pkgsrc+=    PKGBASE PREFIX PKGMANDIR SED SHAREDIR
 SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders
 
+.include "options.mk"
+
 MAKE_FLAGS+=   CC=${CC:Q}
 MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
@@ -37,16 +38,12 @@ WRKSRC=     ${WRKDIR}/xfile-beta
 
 post-extract:
        ${RUN}${MV} ${WRKDIR}/slanted-icons/*.xpm       \
-               ${WRKSRC}/addon/icons/
-.for f in xfile-xdg.c xfile.service
-       ${RUN}${MV} ${WRKDIR}/xfile-xdgsvc/${f} ${WRKSRC}/src
-.endfor
+       ${WRKSRC}/addon/icons/
 
 INSTALLATION_DIRS+=    share/applications
 
 post-install:
-       ${RUN}${LN} -s ${DESTDIR}${PREFIX}/bin/xfile    \
-               ${DESTDIR}${PREFIX}/bin/xfile-open
+       ${RUN}${LN} -s ${PREFIX}/bin/xfile ${DESTDIR}${PREFIX}/bin/xfile-open
        ${INSTALL_DATA} ${WRKSRC}/addon/icons/*.xpm     \
                ${DESTDIR}${SHAREDIR}/icons
        ${INSTALL_DATA} ${WRKSRC}/addon/types/*.db      \
@@ -58,6 +55,5 @@ post-install:
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/xfile/PLIST
diff -u pkgsrc/sysutils/xfile/PLIST:1.1 pkgsrc/sysutils/xfile/PLIST:1.2
--- pkgsrc/sysutils/xfile/PLIST:1.1     Sun Jan  5 21:38:21 2025
+++ pkgsrc/sysutils/xfile/PLIST Thu May  1 07:33:20 2025
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2025/01/05 21:38:21 vins Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/05/01 07:33:20 vins Exp $
 bin/xfile
 bin/xfile-open
-bin/xfile-xdgsvc
+${PLIST.dbus}bin/xfile-xdgsvc
 lib/X11/app-defaults/XFile
 man/man1/xfile.1
 share/applications/xfile.desktop
-share/dbus-1/services/xfile.service
+${PLIST.dbus}share/dbus-1/services/xfile.service
 share/doc/xfile/README
 share/doc/xfile/README.icons
 share/pixmaps/xfile_48x48.xpm
@@ -82,6 +82,10 @@ share/xfile/icons/kra.l.xpm
 share/xfile/icons/kra.m.xpm
 share/xfile/icons/kra.s.xpm
 share/xfile/icons/kra.t.xpm
+share/xfile/icons/lib.l.xpm
+share/xfile/icons/lib.m.xpm
+share/xfile/icons/lib.s.xpm
+share/xfile/icons/lib.t.xpm
 share/xfile/icons/makefile.l.xpm
 share/xfile/icons/makefile.m.xpm
 share/xfile/icons/makefile.s.xpm
@@ -117,6 +121,10 @@ share/xfile/icons/ofwp.l.xpm
 share/xfile/icons/ofwp.m.xpm
 share/xfile/icons/ofwp.s.xpm
 share/xfile/icons/ofwp.t.xpm
+share/xfile/icons/package.l.xpm
+share/xfile/icons/package.m.xpm
+share/xfile/icons/package.s.xpm
+share/xfile/icons/package.t.xpm
 share/xfile/icons/paint.l.xpm
 share/xfile/icons/paint.m.xpm
 share/xfile/icons/paint.s.xpm
@@ -125,6 +133,10 @@ share/xfile/icons/pdf.l.xpm
 share/xfile/icons/pdf.m.xpm
 share/xfile/icons/pdf.s.xpm
 share/xfile/icons/pdf.t.xpm
+share/xfile/icons/picture.l.xpm
+share/xfile/icons/picture.m.xpm
+share/xfile/icons/picture.s.xpm
+share/xfile/icons/picture.t.xpm
 share/xfile/icons/pixmap.l.xpm
 share/xfile/icons/pixmap.m.xpm
 share/xfile/icons/pixmap.s.xpm
Index: pkgsrc/sysutils/xfile/distinfo
diff -u pkgsrc/sysutils/xfile/distinfo:1.1 pkgsrc/sysutils/xfile/distinfo:1.2
--- pkgsrc/sysutils/xfile/distinfo:1.1  Sun Jan  5 21:38:21 2025
+++ pkgsrc/sysutils/xfile/distinfo      Thu May  1 07:33:20 2025
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.1 2025/01/05 21:38:21 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/05/01 07:33:20 vins Exp $
 
-BLAKE2s (xfile-1.0beta/xfile-slanted-icons.tar.xz) = 05d15677163ae69cd7184af0f96006303129d70ab4bebecf5187399f4b6b2761
-SHA512 (xfile-1.0beta/xfile-slanted-icons.tar.xz) = 0598f553d8f45487ceedd0495a115d0f1618e2fb18657e3d9ce7ae3ef0040c9b06aa9bf7224eeb59856f9e9f1258a666a4c52f46ca5edd25f8e29e4105387d50
-Size (xfile-1.0beta/xfile-slanted-icons.tar.xz) = 1772 bytes
-BLAKE2s (xfile-1.0beta/xfile-src-1.0-beta.tar.xz) = aa42deedabd1da7ca1b2b69da578dc23cfcc362ebf206b9ad4629b18a1874e6f
-SHA512 (xfile-1.0beta/xfile-src-1.0-beta.tar.xz) = 9362f1c1f940221ec1dd609b4b82a42c325283c824908aa41bac33de5d5928ec756397dd5579f793df660e029d9f3dd139555d83ffab76caea1e4c3694030f7d
-Size (xfile-1.0beta/xfile-src-1.0-beta.tar.xz) = 111280 bytes
-BLAKE2s (xfile-1.0beta/xfile-xdgsvc-src.tar.xz) = 17134f7556d67f1d340733e106c2b17903306ec07ad760fcd418f09b8f35df93
-SHA512 (xfile-1.0beta/xfile-xdgsvc-src.tar.xz) = df53d6db5eef47d3c1252d2a9346f0c56ec474622c54ebe0f3cb39ce45cca876315fa9e2ac333295f0be46e812b21b8d2e14bc08f9dc5914cd3aee2cdfac87b4
-Size (xfile-1.0beta/xfile-xdgsvc-src.tar.xz) = 3616 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-src-1.0-beta.tar.xz) = 4783335e383acee1e7aeb666889a2137b424f06d85ec57895adb16c167d6a929
+SHA512 (xfile-20250430/xfile-src-1.0-beta.tar.xz) = d77f9838d2ddd70b0d2e32bd959f646dcbc91aca872db9883bdee74d4dae20fe1fd213fb0989efa425a0d5d1dd9b170112ee3cdb6042b53dbff703d24c5d1360
+Size (xfile-20250430/xfile-src-1.0-beta.tar.xz) = 115544 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
 SHA1 (patch-Makefile) = 1316be75730b7823d5f0f00adb243bc5b9100f26
 SHA1 (patch-addon_types_archive.db) = 62a95a0fc05a86771e9a0f9ab4c0c9be3e42eba7
-SHA1 (patch-mf_Makefile.pkgsrc) = 4f10424911a8216d2aa5362d30b38689bb0880d0
-SHA1 (patch-src_common.mf) = 52e5dcac5c82c61d1a7b34ed23e95a44ea7be9a4
+SHA1 (patch-mf_Makefile.pkgsrc) = 1be35b7c590b81366b22871883f783c5fa559cce
+SHA1 (patch-src_common.mf) = d7dc6dd85f73287d2dcc1143f5beb3911ef449d2
 SHA1 (patch-src_mkicons.sh) = fba5d7bd304d14bdbbee39146302f8c427601b1a
-SHA1 (patch-src_xfile.service) = 5e412271706f83715e8b410162639852623c55f5
+SHA1 (patch-src_xdgsvc.mf) = 776de35bc93df1b63345a542bf712f328642e6c6

Index: pkgsrc/sysutils/xfile/patches/patch-mf_Makefile.pkgsrc
diff -u pkgsrc/sysutils/xfile/patches/patch-mf_Makefile.pkgsrc:1.1 pkgsrc/sysutils/xfile/patches/patch-mf_Makefile.pkgsrc:1.2
--- pkgsrc/sysutils/xfile/patches/patch-mf_Makefile.pkgsrc:1.1  Sun Jan  5 21:38:22 2025
+++ pkgsrc/sysutils/xfile/patches/patch-mf_Makefile.pkgsrc      Thu May  1 07:33:20 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-mf_Makefile.pkgsrc,v 1.1 2025/01/05 21:38:22 vins Exp $
+$NetBSD: patch-mf_Makefile.pkgsrc,v 1.2 2025/05/01 07:33:20 vins Exp $
 
 Add custom Makefile for pkgsrc.
 
---- mf/Makefile.pkgsrc.orig    2025-01-05 16:52:21.386683075 +0000
+--- mf/Makefile.pkgsrc.orig    2025-05-01 05:08:16.645311130 +0000
 +++ mf/Makefile.pkgsrc
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,29 @@
 +# XFile pkgsrc Makefile
 +
 +PREFIX = @PREFIX@
@@ -16,10 +16,15 @@ Add custom Makefile for pkgsrc.
 +PIXMAPDIR = @PREFIX@/share/pixmaps
 +DOCDIR = @PREFIX@/share/doc/@PKGBASE@
 +
-+DBUS_INCDIRS = -I@PREFIX@/include/dbus-1.0 -I@PREFIX@/lib/dbus-1.0/include
-+
 +.include "common.mf"
 +
++# DBus support
++.if !empty(DBUS:M1)
++DBUS_INCDIRS = -I@PREFIX@/include/dbus-1.0 -I@PREFIX@/lib/dbus-1.0/include
++DBUS_LIBS = -ldbus-1
++.include "xdgsvc.mf"
++.endif
++
 +# Set to APPDEFS_CORE for core fonts
 +APPDEFS = $(APPDEFS_XFT)
 +
Index: pkgsrc/sysutils/xfile/patches/patch-src_common.mf
diff -u pkgsrc/sysutils/xfile/patches/patch-src_common.mf:1.1 pkgsrc/sysutils/xfile/patches/patch-src_common.mf:1.2
--- pkgsrc/sysutils/xfile/patches/patch-src_common.mf:1.1       Sun Jan  5 21:38:22 2025
+++ pkgsrc/sysutils/xfile/patches/patch-src_common.mf   Thu May  1 07:33:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_common.mf,v 1.1 2025/01/05 21:38:22 vins Exp $
+$NetBSD: patch-src_common.mf,v 1.2 2025/05/01 07:33:20 vins Exp $
 
 * Use standard CFLAGS and LDFLAGS.
 * Point to default awk implementation path.
@@ -7,22 +7,21 @@ $NetBSD: patch-src_common.mf,v 1.1 2025/
 
 --- src/common.mf.orig 2024-12-28 23:18:37.000000000 +0000
 +++ src/common.mf
-@@ -3,8 +3,7 @@
- 
+@@ -4,8 +4,6 @@
  X_LIBS = -lX11 -lXinerama -lXm -lXt -lXpm
  SYS_LIBS = -lm -lc
--
--CFLAGS += -DPREFIX='"$(PREFIX)"' $(INCDIRS)
-+DBUS_LIBS = -ldbus-1
  
+-CFLAGS += -DPREFIX='"$(PREFIX)"' $(INCDIRS)
+-
  XFILE_OBJS = main.o menu.o defaults.o comdlgs.o guiutil.o typedb.o \
        path.o listw.o pathw.o filemgr.o graphics.o cbproc.o exec.o \
-@@ -13,10 +12,10 @@ XFILE_OBJS = main.o menu.o defaults.o co
+       stack.o fsutil.o mbstr.o attrib.o mount.o fsproc.o fstab.o \
+@@ -13,10 +11,10 @@ XFILE_OBJS = main.o menu.o defaults.o co
  
  .PHONY: clean install uninstall
  
 -all: .depend xfile.ad xfile.1 xfile
-+all: .depend xfile.ad xfile.1 xfile xfile-xdgsvc
++all:: .depend xfile.ad xfile.1 xfile
  
  xfile: icons.h $(XFILE_OBJS)
 -      $(CC) $(LDFLAGS) $(LIBDIRS) -o $@ $(XFILE_OBJS) $(X_LIBS) $(SYS_LIBS)
@@ -30,28 +29,16 @@ $NetBSD: patch-src_common.mf,v 1.1 2025/
  
  # Built-in icons
  icons.h: mkicons.sh icons/*.xpm
-@@ -31,7 +30,13 @@ xfile.ad: $(APPDEFS)
+@@ -31,7 +29,7 @@ xfile.ad: $(APPDEFS)
  
  # Default (fallback) resources
  defaults.c: xfile.ad
 -      awk -f adtoc.awk xfile.ad > $@
 +      $(AWK) -f adtoc.awk xfile.ad > $@
-+
-+# XDG shim (DBus support)
-+xfile-xdg.o: xfile-xdg.c
-+      $(CC) $(CFLAGS) $(DBUS_INCDIRS) -c $< -o $@
-+xfile-xdgsvc: xfile-xdg.o
-+      $(CC) $(LDFLAGS) -o $@ xfile-xdg.o $(DBUS_LIBS)
  
  # Manpage
  MANUAL = man/intro.man man/gui.man man/db.man man/res.man man/footer.man
-@@ -43,29 +48,32 @@ clean:
-       -rm defaults.c icons.h
-       -rm xfile.ad
-       -rm xfile.1
-+      -rm xfile-xdg
-       -rm .depend
-       -rm $(XFILE_OBJS) xfile
+@@ -48,24 +46,24 @@ clean:
  
  # Dependencies
  .depend: $(XFILE_OBJS:.o=.c) icons.h
@@ -74,9 +61,9 @@ $NetBSD: patch-src_common.mf,v 1.1 2025/
 -      install -o 0 -g 0 -m 644 icons/README $(SHAREDIR)/README.icons
 -      install -o 0 -g 0 -m 644 xbm/cabinet.xpm $(PREFIX)/share/pixmaps/xfile_48x48.xpm
 -
-+common_install: xfile xfile.ad xfile.1 xfile-xdgsvc
++common_install:: xfile xfile.ad xfile.1
 +      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
-+      $(BSD_INSTALL_PROGRAM) xfile xfile-xdgsvc $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_PROGRAM) xfile $(DESTDIR)$(BINDIR)
 +      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
 +      $(BSD_INSTALL_MAN) xfile.1 $(DESTDIR)$(MANDIR)/man1
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(SHAREDIR) $(DESTDIR)$(APPLRESDIR)
@@ -84,8 +71,6 @@ $NetBSD: patch-src_common.mf,v 1.1 2025/
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(SHAREDIR)/icons $(DESTDIR)$(SHAREDIR)/types
 +      $(BSD_INSTALL_DATA) default.db $(DESTDIR)$(SHAREDIR)/types/system.db
 +      for n in icons/*.xpm; do $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(SHAREDIR)/$$n; done
-+      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/dbus-1/services
-+      $(BSD_INSTALL_DATA) xfile.service $(DESTDIR)$(PREFIX)/share/dbus-1/services
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PIXMAPDIR) $(DESTDIR)$(DOCDIR)
 +      $(BSD_INSTALL_DATA) xbm/cabinet.xpm $(DESTDIR)$(PIXMAPDIR)/xfile_48x48.xpm
 +      $(BSD_INSTALL_DATA) ../README $(DESTDIR)$(DOCDIR)

Added files:

Index: pkgsrc/sysutils/xfile/patches/patch-src_xdgsvc.mf
diff -u /dev/null pkgsrc/sysutils/xfile/patches/patch-src_xdgsvc.mf:1.1
--- /dev/null   Thu May  1 07:33:20 2025
+++ pkgsrc/sysutils/xfile/patches/patch-src_xdgsvc.mf   Thu May  1 07:33:20 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_xdgsvc.mf,v 1.1 2025/05/01 07:33:20 vins Exp $
+
+Add DBus support.
+
+--- src/xdgsvc.mf.orig 2025-05-01 05:08:16.708736625 +0000
++++ src/xdgsvc.mf
+@@ -0,0 +1,16 @@
++# XDG shim common target 
++# Provides DBus support to XFile
++
++all:: xfile-xdgsvc
++
++# Build
++ xfile-xdg.o: xfile-xdg.c
++      $(CC) $(CFLAGS) $(DBUS_INCDIRS) -c $< -o $@
++ xfile-xdgsvc: xfile-xdg.o
++      $(CC) $(LDFLAGS) -o $@ xfile-xdg.o $(DBUS_LIBS)
++
++# Install
++common_install:: xfile-xdgsvc
++      $(BSD_INSTALL_PROGRAM) xfile-xdgsvc $(DESTDIR)$(BINDIR)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/dbus-1/services
++      $(BSD_INSTALL_DATA) xfile.service $(DESTDIR)$(PREFIX)/share/dbus-1/services

Prev by Date: CVS commit: pkgsrc/www/arcticfox
Next by Date: CVS commit: pkgsrc/sysutils/xfile
Previous by Thread: CVS commit: pkgsrc/www/arcticfox
Next by Thread: CVS commit: pkgsrc/sysutils/xfile
Indexes:

Home | Main Index | Thread Index | Old Index