CVS commit: pkgsrc/sysutils/xfile

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 12 07:34:33 UTC 2025

Modified Files:
        pkgsrc/sysutils/xfile: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/xfile/files: README.pkgsrc
        pkgsrc/sysutils/xfile/patches: patch-src_res_prefs.ad

Log Message:
sysutils/xfile: add dependency on x11/xterm and x11/xfind

+ Document optional dependencies.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xfile/Makefile \
    pkgsrc/sysutils/xfile/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xfile/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xfile/files/README.pkgsrc
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xfile/patches/patch-src_res_prefs.ad

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.5 pkgsrc/sysutils/xfile/Makefile:1.6
--- pkgsrc/sysutils/xfile/Makefile:1.5  Sat Oct 11 16:40:39 2025
+++ pkgsrc/sysutils/xfile/Makefile      Sun Oct 12 07:34:33 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2025/10/11 16:40:39 vins Exp $
+# $NetBSD: Makefile,v 1.6 2025/10/12 07:34:33 vins Exp $
 
 DISTNAME=      xfile-src-1.0.1
 PKGNAME=       ${DISTNAME:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    sysutils x11
 MASTER_SITES=  https://fastestcode.org/dl/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
@@ -20,11 +21,20 @@ MAKE_JOBS_SAFE=     no
 USE_TOOLS+=            awk sed sh
 USE_BSD_MAKEFILE=      yes
 
+.include "../../mk/bsd.prefs.mk"
+
+# See the included README.pkgsrc for optional dependencies.
+
+.if ${X11_TYPE} == "modular"
+DEPENDS+=      xterm-[0-9]*:../../x11/xterm
+.endif
+DEPENDS+=      xfind-[0-9]*:../../x11/xfind
+
 SHAREDIR=      ${PREFIX}/share/${PKGBASE}
 
 SUBST_CLASSES+=                pkgsrc
 SUBST_STAGE.pkgsrc=    pre-configure
-SUBST_FILES.pkgsrc=    mf/Makefile.pkgsrc src/mkicons.sh
+SUBST_FILES.pkgsrc=    mf/Makefile.pkgsrc src/mkicons.sh README.pkgsrc
 SUBST_VARS.pkgsrc+=    PKGBASE PREFIX PKGMANDIR SED SHAREDIR
 SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders
 
@@ -39,6 +49,7 @@ MAKE_FLAGS+=  AWK=${AWK:Q}
 post-extract:
        ${RUN}${MV} ${WRKDIR}/slanted-icons/*.xpm       \
        ${WRKSRC}/src/icons/
+       ${RUN}${CP} ${FILESDIR}/README.pkgsrc ${WRKSRC}
 
 INSTALLATION_DIRS+=    share/applications
 
@@ -51,6 +62,8 @@ post-install:
                ${DESTDIR}${SHAREDIR}/types
        ${INSTALL_DATA} ${FILESDIR}/xfile.desktop               \
                ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/README.pkgsrc                 \
+               ${DESTDIR}${PREFIX}/share/doc/xfile
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
Index: pkgsrc/sysutils/xfile/distinfo
diff -u pkgsrc/sysutils/xfile/distinfo:1.5 pkgsrc/sysutils/xfile/distinfo:1.6
--- pkgsrc/sysutils/xfile/distinfo:1.5  Sat Oct 11 16:40:39 2025
+++ pkgsrc/sysutils/xfile/distinfo      Sun Oct 12 07:34:33 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/10/11 16:40:39 vins Exp $
+$NetBSD: distinfo,v 1.6 2025/10/12 07:34:33 vins Exp $
 
 BLAKE2s (xfile-1.0.1/xfile-addon.tar.xz) = 4ea033bd0c59337797eaa106e5f2e7d1064a79e3a8895a6af0b6d1e8b4739781
 SHA512 (xfile-1.0.1/xfile-addon.tar.xz) = db64405367fe4594369b21c0cdeffda3fa8de53e0e468dde09d9c6f295fc5e2b7225ab593ca6917f4b487a71bd4df7c41257b0a881124a3f0a7758707f94477d
@@ -16,4 +16,5 @@ SHA1 (patch-Makefile) = 1316be75730b7823
 SHA1 (patch-mf_Makefile.pkgsrc) = 1be35b7c590b81366b22871883f783c5fa559cce
 SHA1 (patch-src_common.mf) = cb9bea7fe9d4223777b39c9cbe2514069c3861e6
 SHA1 (patch-src_mkicons.sh) = fba5d7bd304d14bdbbee39146302f8c427601b1a
+SHA1 (patch-src_res_prefs.ad) = 5046e54572835754a4572001eefa8bd077ade04f
 SHA1 (patch-src_xdgsvc.mf) = 776de35bc93df1b63345a542bf712f328642e6c6

Index: pkgsrc/sysutils/xfile/PLIST
diff -u pkgsrc/sysutils/xfile/PLIST:1.3 pkgsrc/sysutils/xfile/PLIST:1.4
--- pkgsrc/sysutils/xfile/PLIST:1.3     Sun Aug  3 07:23:07 2025
+++ pkgsrc/sysutils/xfile/PLIST Sun Oct 12 07:34:33 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/08/03 07:23:07 vins Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/10/12 07:34:33 vins Exp $
 bin/xfile
 bin/xfile-open
 ${PLIST.dbus}bin/xfile-xdgsvc
@@ -8,6 +8,7 @@ share/applications/xfile.desktop
 ${PLIST.dbus}share/dbus-1/services/xfile.service
 share/doc/xfile/README
 share/doc/xfile/README.icons
+share/doc/xfile/README.pkgsrc
 share/pixmaps/xfile_48x48.xpm
 share/xfile/icons/arch.l.xpm
 share/xfile/icons/arch.m.xpm

Added files:

Index: pkgsrc/sysutils/xfile/files/README.pkgsrc
diff -u /dev/null pkgsrc/sysutils/xfile/files/README.pkgsrc:1.1
--- /dev/null   Sun Oct 12 07:34:33 2025
+++ pkgsrc/sysutils/xfile/files/README.pkgsrc   Sun Oct 12 07:34:33 2025
@@ -0,0 +1,18 @@
++-----------------------------------------------------------------------
+| # Optional dependencies for XFind 
++-----------------------------------------------------------------------
+
+XFile relies on the following applications to open files:
+
+       * x11/xedit             # text editor
+       * www/links             # url browser
+       * graphics/ximaging     # image viewer
+       * graphics/xpaint       # image editor
+       * print/mupdf           # pdf viewer
+       * multimedia/mpv        # audio/video player
+
+Local changes to the default file type associations may be applied 
+inside the  user's ~/.Xresources file.
+See @PREFIX@/lib/X11/app-defaults/XFile.
+
+------------------------------------------------------------------------

Index: pkgsrc/sysutils/xfile/patches/patch-src_res_prefs.ad
diff -u /dev/null pkgsrc/sysutils/xfile/patches/patch-src_res_prefs.ad:1.1
--- /dev/null   Sun Oct 12 07:34:33 2025
+++ pkgsrc/sysutils/xfile/patches/patch-src_res_prefs.ad        Sun Oct 12 07:34:33 2025
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_res_prefs.ad,v 1.1 2025/10/12 07:34:33 vins Exp $
+
+* Add support for XFind in tools menu.
+* Change some defaults.
+
+--- src/res/prefs.ad.orig      2025-09-13 08:56:10.000000000 +0000
++++ src/res/prefs.ad
+@@ -24,6 +24,14 @@ XFile*toolsMenu.terminal.accelerator: <K
+ !! Make sure it remains the first menu item
+ XFile*toolsMenu.terminal.positionIndex: 0
+ 
++!! Add XFind to the Tools menu
++XFile.tools.finder: xfind
++XFile*toolsMenu.finder.labelString: Finder
++XFile*toolsMenu.finder.mnemonic: F
++XFile*toolsMenu.finder.acceleratorText: F11
++XFile*toolsMenu.finder.accelerator: <Key>F11
++XFile*toolsMenu.terminal.positionIndex: 1
++
+ !-----------------------------------------------------------------------------
+ ! Environment variables used by the file type database
+ !-----------------------------------------------------------------------------
+@@ -31,9 +39,9 @@ XFile.variable.terminal: xterm -e
+ XFile.variable.textEditor: xedit
+ XFile.variable.imageViewer: ximaging
+ XFile.variable.imageEditor: xpaint
+-XFile.variable.audioPlayer: mplayer
+-XFile.variable.videoPlayer: mplayer
+-XFile.variable.pdfViewer: xpdf
++XFile.variable.audioPlayer: mpv
++XFile.variable.videoPlayer: mpv
++XFile.variable.pdfViewer: mupdf
+ XFile.variable.webBrowser: links -g
+ 
+ !-----------------------------------------------------------------------------