pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils
Module Name: pkgsrc
Committed By: nia
Date: Fri Apr 11 01:49:11 UTC 2025
Modified Files:
pkgsrc/sysutils: Makefile
Added Files:
pkgsrc/sysutils/moxfm: DESCR Makefile PLIST distinfo
pkgsrc/sysutils/moxfm/patches: patch-Imakefile patch-lib_Desktop
patch-lib_Main patch-lib_magic patch-lib_xfmrc
patch-lib_xfmrc.nomagic patch-regexp_regexp.c patch-src_Common.h
patch-src_FmChmod.c patch-src_FmDialogs.c patch-src_FmFwActions.c
patch-src_FmFwCb.c patch-src_FmIcons.c patch-usermount_usermount.c
Log Message:
moxfm: initial import of moxfm
Moxfm is a X/Motif file and application manager. It is kind of a
port of the excellent Athena based file manager xfm, but some
additional features have been implemented.
This version was revived by me (nia@) after I randomly stumbled
across it, found it interesting, then set about trying to
get it to run on a modern system. It's almost a fork but without
the commitment. *shrug*
To generate a diff of this commit:
cvs rdiff -u -r1.1154 -r1.1155 pkgsrc/sysutils/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/moxfm/DESCR \
pkgsrc/sysutils/moxfm/Makefile pkgsrc/sysutils/moxfm/PLIST \
pkgsrc/sysutils/moxfm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/moxfm/patches/patch-Imakefile \
pkgsrc/sysutils/moxfm/patches/patch-lib_Desktop \
pkgsrc/sysutils/moxfm/patches/patch-lib_Main \
pkgsrc/sysutils/moxfm/patches/patch-lib_magic \
pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc \
pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc.nomagic \
pkgsrc/sysutils/moxfm/patches/patch-regexp_regexp.c \
pkgsrc/sysutils/moxfm/patches/patch-src_Common.h \
pkgsrc/sysutils/moxfm/patches/patch-src_FmChmod.c \
pkgsrc/sysutils/moxfm/patches/patch-src_FmDialogs.c \
pkgsrc/sysutils/moxfm/patches/patch-src_FmFwActions.c \
pkgsrc/sysutils/moxfm/patches/patch-src_FmFwCb.c \
pkgsrc/sysutils/moxfm/patches/patch-src_FmIcons.c \
pkgsrc/sysutils/moxfm/patches/patch-usermount_usermount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/Makefile
diff -u pkgsrc/sysutils/Makefile:1.1154 pkgsrc/sysutils/Makefile:1.1155
--- pkgsrc/sysutils/Makefile:1.1154 Sun Apr 6 03:05:43 2025
+++ pkgsrc/sysutils/Makefile Fri Apr 11 01:49:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1154 2025/04/06 03:05:43 rxg Exp $
+# $NetBSD: Makefile,v 1.1155 2025/04/11 01:49:10 nia Exp $
#
COMMENT= System utilities
@@ -479,6 +479,7 @@ SUBDIR+= mktemp
SUBDIR+= mlog
SUBDIR+= monit
SUBDIR+= monitoring
+SUBDIR+= moxfm
SUBDIR+= mrsync
SUBDIR+= mtools
SUBDIR+= mtoolsfm
Added files:
Index: pkgsrc/sysutils/moxfm/DESCR
diff -u /dev/null pkgsrc/sysutils/moxfm/DESCR:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/DESCR Fri Apr 11 01:49:10 2025
@@ -0,0 +1,3 @@
+Moxfm is a X/Motif file and application manager. It is kind of a
+port of the excellent Athena based file manager xfm, but some
+additional features have been implemented.
Index: pkgsrc/sysutils/moxfm/Makefile
diff -u /dev/null pkgsrc/sysutils/moxfm/Makefile:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/Makefile Fri Apr 11 01:49:10 2025
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2025/04/11 01:49:10 nia Exp $
+
+DISTNAME= moxfm-1.0.1
+CATEGORIES= sysutils x11
+MASTER_SITES= https://www.musikinformatik.uni-mainz.de/ag/xfm/
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://web.archive.org/web/19970712063334/http://sugra.desy.de/user/mai/moxfm/
+COMMENT= Motif file manager
+LICENSE= gnu-gpl-v2
+
+USE_IMAKE= yes
+
+FORCE_C_STD= gnu89
+
+# NetBSD does not have statfs().
+CPPFLAGS.NetBSD+= -DUSE_STATVFS=1
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux" && ${OPSYS} != "SunOS"
+CPPFLAGS+= -DNO_GETMNTENT=1
+.endif
+
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_FILES.paths= src/FmMain.c
+SUBST_SED.paths= -e 's,/usr/include/X11,${PREFIX}/lib/X11/moxfm,g'
+
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/moxfm/PLIST
diff -u /dev/null pkgsrc/sysutils/moxfm/PLIST:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/PLIST Fri Apr 11 01:49:10 2025
@@ -0,0 +1,188 @@
+@comment $NetBSD: PLIST,v 1.1 2025/04/11 01:49:10 nia Exp $
+bin/moxfm
+lib/X11/app-defaults/Moxfm
+lib/X11/moxfm/checkmail
+lib/X11/moxfm/dot.moxfm/Desktop
+lib/X11/moxfm/dot.moxfm/Main
+lib/X11/moxfm/dot.moxfm/magic
+lib/X11/moxfm/dot.moxfm/moxfmdev
+lib/X11/moxfm/dot.moxfm/targets
+lib/X11/moxfm/dot.moxfm/xfmmon
+lib/X11/moxfm/dot.moxfm/xfmrc
+lib/X11/moxfm/dot.moxfm/xfmrc.nomagic
+lib/X11/moxfm/pixmaps/app.xpm
+lib/X11/moxfm/pixmaps/app_link.xpm
+lib/X11/moxfm/pixmaps/app_link_small.xpm
+lib/X11/moxfm/pixmaps/app_plain.xpm
+lib/X11/moxfm/pixmaps/app_small.xpm
+lib/X11/moxfm/pixmaps/backarr.xpm
+lib/X11/moxfm/pixmaps/bluelogo.xpm
+lib/X11/moxfm/pixmaps/book.xpm
+lib/X11/moxfm/pixmaps/bookshelf.xpm
+lib/X11/moxfm/pixmaps/bookshelf_small.xpm
+lib/X11/moxfm/pixmaps/bug.xpm
+lib/X11/moxfm/pixmaps/calc.xpm
+lib/X11/moxfm/pixmaps/calc2.xpm
+lib/X11/moxfm/pixmaps/camera.xpm
+lib/X11/moxfm/pixmaps/cdrom.xpm
+lib/X11/moxfm/pixmaps/chess.xpm
+lib/X11/moxfm/pixmaps/chess2.xpm
+lib/X11/moxfm/pixmaps/chess3.xpm
+lib/X11/moxfm/pixmaps/chip.xpm
+lib/X11/moxfm/pixmaps/circuit.xpm
+lib/X11/moxfm/pixmaps/circuit2.xpm
+lib/X11/moxfm/pixmaps/clip.xpm
+lib/X11/moxfm/pixmaps/clip_file.xpm
+lib/X11/moxfm/pixmaps/clip_folder.xpm
+lib/X11/moxfm/pixmaps/compress.xpm
+lib/X11/moxfm/pixmaps/compressed.xpm
+lib/X11/moxfm/pixmaps/core.xpm
+lib/X11/moxfm/pixmaps/cycle.xpm
+lib/X11/moxfm/pixmaps/data.xpm
+lib/X11/moxfm/pixmaps/debug.xpm
+lib/X11/moxfm/pixmaps/dev_cdrom.xpm
+lib/X11/moxfm/pixmaps/dev_floppy.xpm
+lib/X11/moxfm/pixmaps/dev_harddrive.xpm
+lib/X11/moxfm/pixmaps/diff.xpm
+lib/X11/moxfm/pixmaps/dot_a.xpm
+lib/X11/moxfm/pixmaps/dot_c.xpm
+lib/X11/moxfm/pixmaps/dot_cc.xpm
+lib/X11/moxfm/pixmaps/dot_h.xpm
+lib/X11/moxfm/pixmaps/dot_o.xpm
+lib/X11/moxfm/pixmaps/dot_sa.xpm
+lib/X11/moxfm/pixmaps/dot_so.xpm
+lib/X11/moxfm/pixmaps/draw.xpm
+lib/X11/moxfm/pixmaps/draw2.xpm
+lib/X11/moxfm/pixmaps/dvi.xpm
+lib/X11/moxfm/pixmaps/edit.xpm
+lib/X11/moxfm/pixmaps/editres.xpm
+lib/X11/moxfm/pixmaps/emacs.xpm
+lib/X11/moxfm/pixmaps/empty.xpm
+lib/X11/moxfm/pixmaps/exec.xpm
+lib/X11/moxfm/pixmaps/fig.xpm
+lib/X11/moxfm/pixmaps/file.xpm
+lib/X11/moxfm/pixmaps/file_bad.xpm
+lib/X11/moxfm/pixmaps/file_bad_small.xpm
+lib/X11/moxfm/pixmaps/file_link.xpm
+lib/X11/moxfm/pixmaps/file_link_bad.xpm
+lib/X11/moxfm/pixmaps/file_link_bad_small.xpm
+lib/X11/moxfm/pixmaps/file_link_small.xpm
+lib/X11/moxfm/pixmaps/file_small.xpm
+lib/X11/moxfm/pixmaps/fileman.xpm
+lib/X11/moxfm/pixmaps/files.xpm
+lib/X11/moxfm/pixmaps/fileserver.xpm
+lib/X11/moxfm/pixmaps/find.xpm
+lib/X11/moxfm/pixmaps/fish.xpm
+lib/X11/moxfm/pixmaps/floppy.xpm
+lib/X11/moxfm/pixmaps/folder.xpm
+lib/X11/moxfm/pixmaps/folder_bad.xpm
+lib/X11/moxfm/pixmaps/folder_bad_small.xpm
+lib/X11/moxfm/pixmaps/folder_button.xpm
+lib/X11/moxfm/pixmaps/folder_link.xpm
+lib/X11/moxfm/pixmaps/folder_link_small.xpm
+lib/X11/moxfm/pixmaps/folder_small.xpm
+lib/X11/moxfm/pixmaps/folder_up.xpm
+lib/X11/moxfm/pixmaps/folder_up_button.xpm
+lib/X11/moxfm/pixmaps/folder_up_small.xpm
+lib/X11/moxfm/pixmaps/font.xpm
+lib/X11/moxfm/pixmaps/framemaker.xpm
+lib/X11/moxfm/pixmaps/games.xpm
+lib/X11/moxfm/pixmaps/ghost.xpm
+lib/X11/moxfm/pixmaps/ghostview.xpm
+lib/X11/moxfm/pixmaps/gif.xpm
+lib/X11/moxfm/pixmaps/graph.xpm
+lib/X11/moxfm/pixmaps/hammer.xpm
+lib/X11/moxfm/pixmaps/harddrive.xpm
+lib/X11/moxfm/pixmaps/helpme.xpm
+lib/X11/moxfm/pixmaps/hex.xpm
+lib/X11/moxfm/pixmaps/home.xpm
+lib/X11/moxfm/pixmaps/home_button.xpm
+lib/X11/moxfm/pixmaps/home_small.xpm
+lib/X11/moxfm/pixmaps/html.xpm
+lib/X11/moxfm/pixmaps/icon.xpm
+lib/X11/moxfm/pixmaps/iff.xpm
+lib/X11/moxfm/pixmaps/info.xpm
+lib/X11/moxfm/pixmaps/jpeg.xpm
+lib/X11/moxfm/pixmaps/link.xpm
+lib/X11/moxfm/pixmaps/link_shadow.xpm
+lib/X11/moxfm/pixmaps/link_shadow_small.xpm
+lib/X11/moxfm/pixmaps/link_small.xpm
+lib/X11/moxfm/pixmaps/lisp.xpm
+lib/X11/moxfm/pixmaps/list.xpm
+lib/X11/moxfm/pixmaps/mag_glass.xpm
+lib/X11/moxfm/pixmaps/magic.xpm
+lib/X11/moxfm/pixmaps/mail.xpm
+lib/X11/moxfm/pixmaps/mailfolder.xpm
+lib/X11/moxfm/pixmaps/make.xpm
+lib/X11/moxfm/pixmaps/makefile.xpm
+lib/X11/moxfm/pixmaps/manpage.xpm
+lib/X11/moxfm/pixmaps/manual.xpm
+lib/X11/moxfm/pixmaps/modem.xpm
+lib/X11/moxfm/pixmaps/movies.xpm
+lib/X11/moxfm/pixmaps/mozilla.xpm
+lib/X11/moxfm/pixmaps/music.xpm
+lib/X11/moxfm/pixmaps/netscape.xpm
+lib/X11/moxfm/pixmaps/news.xpm
+lib/X11/moxfm/pixmaps/paint.xpm
+lib/X11/moxfm/pixmaps/paint2.xpm
+lib/X11/moxfm/pixmaps/paintings.xpm
+lib/X11/moxfm/pixmaps/paragraphs.xpm
+lib/X11/moxfm/pixmaps/pbm.xpm
+lib/X11/moxfm/pixmaps/pdf.xpm
+lib/X11/moxfm/pixmaps/pgm.xpm
+lib/X11/moxfm/pixmaps/pictures.xpm
+lib/X11/moxfm/pixmaps/ppm.xpm
+lib/X11/moxfm/pixmaps/printer.xpm
+lib/X11/moxfm/pixmaps/printer2.xpm
+lib/X11/moxfm/pixmaps/printer3.xpm
+lib/X11/moxfm/pixmaps/ps.xpm
+lib/X11/moxfm/pixmaps/ps2.xpm
+lib/X11/moxfm/pixmaps/raster.xpm
+lib/X11/moxfm/pixmaps/rc.xpm
+lib/X11/moxfm/pixmaps/readme.xpm
+lib/X11/moxfm/pixmaps/recycle.xpm
+lib/X11/moxfm/pixmaps/recycle_button.xpm
+lib/X11/moxfm/pixmaps/redhat.xpm
+lib/X11/moxfm/pixmaps/res.xpm
+lib/X11/moxfm/pixmaps/script.xpm
+lib/X11/moxfm/pixmaps/script_file.xpm
+lib/X11/moxfm/pixmaps/script_link.xpm
+lib/X11/moxfm/pixmaps/script_plain.xpm
+lib/X11/moxfm/pixmaps/sound.xpm
+lib/X11/moxfm/pixmaps/sounds.xpm
+lib/X11/moxfm/pixmaps/sounds2.xpm
+lib/X11/moxfm/pixmaps/stuff.xpm
+lib/X11/moxfm/pixmaps/stuff_button.xpm
+lib/X11/moxfm/pixmaps/suitcase.xpm
+lib/X11/moxfm/pixmaps/system.xpm
+lib/X11/moxfm/pixmaps/tape.xpm
+lib/X11/moxfm/pixmaps/tape_net.xpm
+lib/X11/moxfm/pixmaps/tar.xpm
+lib/X11/moxfm/pixmaps/teddy.xpm
+lib/X11/moxfm/pixmaps/term.xpm
+lib/X11/moxfm/pixmaps/tex.xpm
+lib/X11/moxfm/pixmaps/text.xpm
+lib/X11/moxfm/pixmaps/tiff.xpm
+lib/X11/moxfm/pixmaps/tmpfile.xpm
+lib/X11/moxfm/pixmaps/tools.xpm
+lib/X11/moxfm/pixmaps/trash_empty.xpm
+lib/X11/moxfm/pixmaps/trash_full.xpm
+lib/X11/moxfm/pixmaps/url.xpm
+lib/X11/moxfm/pixmaps/uu.xpm
+lib/X11/moxfm/pixmaps/video.xpm
+lib/X11/moxfm/pixmaps/winzip.xpm
+lib/X11/moxfm/pixmaps/write.xpm
+lib/X11/moxfm/pixmaps/writings.xpm
+lib/X11/moxfm/pixmaps/x.xpm
+lib/X11/moxfm/pixmaps/xapp.xpm
+lib/X11/moxfm/pixmaps/xbm.xpm
+lib/X11/moxfm/pixmaps/xfig.xpm
+lib/X11/moxfm/pixmaps/xlogo.xpm
+lib/X11/moxfm/pixmaps/xmcd.xpm
+lib/X11/moxfm/pixmaps/xplate.xpm
+lib/X11/moxfm/pixmaps/xrolodex.xpm
+lib/X11/moxfm/pixmaps/xterm.xpm
+lib/X11/moxfm/pixmaps/xv.xpm
+lib/X11/moxfm/pixmaps/zip.xpm
+lib/X11/moxfm/pixmaps/zoo.xpm
+man/man1/moxfm.1
Index: pkgsrc/sysutils/moxfm/distinfo
diff -u /dev/null pkgsrc/sysutils/moxfm/distinfo:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/distinfo Fri Apr 11 01:49:11 2025
@@ -0,0 +1,19 @@
+$NetBSD: distinfo,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+BLAKE2s (moxfm-1.0.1.tar.gz) = 7fd8e94f75a836ef084a20e7c518c249b3ace61baba9b621873f1932ec94d691
+SHA512 (moxfm-1.0.1.tar.gz) = a1291f46c7c8385d49cadb7581219ecc56ee16127536412152af40618facfa2aa9f3154901c2ac7bbe46a0e6e99f4721ba31db39a5f3d2aba29763ef9c56ae45
+Size (moxfm-1.0.1.tar.gz) = 338405 bytes
+SHA1 (patch-Imakefile) = 5e4ae1bd03315712bebaa361e2de49ad34f74f10
+SHA1 (patch-lib_Desktop) = 95c78751b30f05fa82e0f6684e247651d2d85e00
+SHA1 (patch-lib_Main) = b1b678db22eb30f190ed42b700ba2442669c2edc
+SHA1 (patch-lib_magic) = 665e62c24fc61f44a9deaa7b36a5bb2727ead43a
+SHA1 (patch-lib_xfmrc) = 8334237fe4dee90b610e6c2a4d0f1c400dd41507
+SHA1 (patch-lib_xfmrc.nomagic) = 8c65b6ed202de346867f4fbc74ca4d186c4c04b0
+SHA1 (patch-regexp_regexp.c) = 3040e6b09d48bbb5d24ff74b7eae81696e3d740f
+SHA1 (patch-src_Common.h) = 23fef5666fb44690cd71429fc71229f882f0dea3
+SHA1 (patch-src_FmChmod.c) = b63428100226a7ecf65c9292efaa27e5aec46f6f
+SHA1 (patch-src_FmDialogs.c) = 754175718bc56398af0c76da1200c2e88241e25a
+SHA1 (patch-src_FmFwActions.c) = b444fd28d59b5f4c2eb8845a8cbca8d2c4d32396
+SHA1 (patch-src_FmFwCb.c) = 335e52e65cf72f5b844fb83752131b2117713100
+SHA1 (patch-src_FmIcons.c) = ea5815abeaa7ffe1551b6e1288a88bdc0f6fdfc4
+SHA1 (patch-usermount_usermount.c) = 20ead3d49117c87c931c8f0cdeecbb7532941c55
Index: pkgsrc/sysutils/moxfm/patches/patch-Imakefile
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-Imakefile:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-Imakefile Fri Apr 11 01:49:11 2025
@@ -0,0 +1,41 @@
+$NetBSD: patch-Imakefile,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+DESTDIR support for installation.
+
+--- Imakefile.orig 2025-04-10 23:44:11.987906617 +0000
++++ Imakefile
+@@ -50,21 +50,21 @@ CppFileTarget(Moxfm.ad,lib/Moxfm.cpp,-DP
+ InstallAppDefaults(Moxfm)
+
+ install::
+- MakeDir($(XFMLIBDIR))
+- $(INSTALL) -c $(INSTBINFLAGS) lib/checkmail $(XFMLIBDIR)/checkmail
+- MakeDir($(XFMLIBDIR)/dot.moxfm)
++ MakeDir($(DESTDIR)$(XFMLIBDIR))
++ $(INSTALL) -c $(INSTBINFLAGS) lib/checkmail $(DESTDIR)$(XFMLIBDIR)/checkmail
++ MakeDir($(DESTDIR)$(XFMLIBDIR)/dot.moxfm)
+ #ifdef MAGIC_HEADERS
+- $(INSTALL) -c $(INSTDATFLAGS) lib/xfmrc $(XFMLIBDIR)/dot.moxfm/xfmrc
++ $(INSTALL) -c $(INSTDATFLAGS) lib/xfmrc $(DESTDIR)$(XFMLIBDIR)/dot.moxfm/xfmrc
+ #endif
+- $(INSTALL) -c $(INSTDATFLAGS) lib/xfmrc.nomagic $(XFMLIBDIR)/dot.moxfm/xfmrc.nomagic
+- $(INSTALL) -c $(INSTDATFLAGS) lib/xfmmon $(XFMLIBDIR)/dot.moxfm
+- $(INSTALL) -c $(INSTDATFLAGS) lib/moxfmdev $(XFMLIBDIR)/dot.moxfm
+- $(INSTALL) -c $(INSTDATFLAGS) lib/magic $(XFMLIBDIR)/dot.moxfm
+- $(INSTALL) -c $(INSTDATFLAGS) lib/targets $(XFMLIBDIR)/dot.moxfm
+- $(INSTALL) -c $(INSTDATFLAGS) lib/Desktop $(XFMLIBDIR)/dot.moxfm
+- $(INSTALL) -c $(INSTDATFLAGS) lib/Main $(XFMLIBDIR)/dot.moxfm
+- MakeDir($(PIXMAPDIR))
+- $(INSTALL) -c $(INSTDATFLAGS) lib/pixmaps/?* $(PIXMAPDIR)
++ $(INSTALL) -c $(INSTDATFLAGS) lib/xfmrc.nomagic $(DESTDIR)$(XFMLIBDIR)/dot.moxfm/xfmrc.nomagic
++ $(INSTALL) -c $(INSTDATFLAGS) lib/xfmmon $(DESTDIR)$(XFMLIBDIR)/dot.moxfm
++ $(INSTALL) -c $(INSTDATFLAGS) lib/moxfmdev $(DESTDIR)$(XFMLIBDIR)/dot.moxfm
++ $(INSTALL) -c $(INSTDATFLAGS) lib/magic $(DESTDIR)$(XFMLIBDIR)/dot.moxfm
++ $(INSTALL) -c $(INSTDATFLAGS) lib/targets $(DESTDIR)$(XFMLIBDIR)/dot.moxfm
++ $(INSTALL) -c $(INSTDATFLAGS) lib/Desktop $(DESTDIR)$(XFMLIBDIR)/dot.moxfm
++ $(INSTALL) -c $(INSTDATFLAGS) lib/Main $(DESTDIR)$(XFMLIBDIR)/dot.moxfm
++ MakeDir($(DESTDIR)$(PIXMAPDIR))
++ $(INSTALL) -c $(INSTDATFLAGS) lib/pixmaps/?* $(DESTDIR)$(PIXMAPDIR)
+
+ XCOMM Use the following before installing over an existing
+ XCOMM version of moxfm. (You might wish to back up
Index: pkgsrc/sysutils/moxfm/patches/patch-lib_Desktop
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-lib_Desktop:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-lib_Desktop Fri Apr 11 01:49:11 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_Desktop,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Modernize (in the loosest sense) defaults.
+
+--- lib/Desktop.orig 2025-04-11 01:28:14.915856415 +0000
++++ lib/Desktop
+@@ -4,6 +4,6 @@
+ #
+ ##########################################
+
+-Floppy:/:floppy:floppy.xpm:OPEN:COPY:10:120
+-CD-ROM:/:cdrom:cdrom.xpm:OPEN::2:180
++#Floppy:/:floppy:floppy.xpm:OPEN:COPY:10:120
++#CD-ROM:/:cdrom:cdrom.xpm:OPEN::2:180
+ Trash:~/.trash::trash_empty.xpm:OPEN:mv -f --backup=numbered $* ~/.trash:8:240
Index: pkgsrc/sysutils/moxfm/patches/patch-lib_Main
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-lib_Main:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-lib_Main Fri Apr 11 01:49:11 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-lib_Main,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Modernize (in the loosest sense) defaults.
+
+--- lib/Main.orig 2001-09-03 08:14:53.000000000 +0000
++++ lib/Main
+@@ -4,12 +4,14 @@
+ #
+ ##########################################
+
+-Floppy:/:floppy:floppy.xpm:OPEN:COPY
+-CD-ROM:/:cdrom:cdrom.xpm:OPEN:
+-Trash:/root/.trash::trash_empty.xpm:OPEN:mv -f --backup=numbered $* ~/.trash
+-Printer:::printer.xpm:exec /usr/bin/lpq | /usr/bin/X11/xless:exec lpr -#%Number of copies\:--1% $*
+-Xterm:::xterm.xpm:exec xterm -sb -sl 500 -j:exec xterm -sb -j -e $1 %Arguments\:%
++#Floppy:/:floppy:floppy.xpm:OPEN:COPY
++#CD-ROM:/:cdrom:cdrom.xpm:OPEN:
++Trash:~/.trash::trash_empty.xpm:OPEN:mv -f --backup=numbered $* ~/.trash
++Printer:::printer.xpm:exec lpq | xless:exec lpr -#%Number of copies\:--1% $*
++Xterm:::xterm.xpm:exec xterm:exec xterm -e $1 %Arguments\:%
++Xcalc:::calc2.xpm:exec xcalc:exec xcalc $*
++Xedit:::text.xpm:exec xedit:exec xedit $*
+ Emacs:::emacs.xpm:exec emacs:exec emacs $*
+-Netscape:::netscape.xpm:exec netscape:exec netscape $*
++Firefox:::mozilla.xpm:exec firefox:exec firefox $*
+ Gimp:::paint.xpm:exec gimp:exec gimp $*
+ XV:/usr/X11/bin::xv.xpm:exec xv:exec xv $*
Index: pkgsrc/sysutils/moxfm/patches/patch-lib_magic
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-lib_magic:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-lib_magic Fri Apr 11 01:49:11 2025
@@ -0,0 +1,36 @@
+$NetBSD: patch-lib_magic,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Add support for more file types.
+
+--- lib/magic.orig 2001-09-03 04:45:01.000000000 +0000
++++ lib/magic
+@@ -7,12 +7,15 @@
+ >0 lmode&0xF000 0xA000 LNK
+ 0 short 0x1F9D COMPRESS
+ 0 short 0x1F8B GZIP
++0 long 0xFD377A58 XZ
+ 0 string <MakerFile FRAME
+ 0 string <MIFFile FRAME
+ 0 string <MML FRAME
+ 0 string .snd SND
+ 0 string RIFF RIFF
+ >8 string WAVE WAVE
++0 string ID3 ID3
++0 string fLaC FLAC
+ 0 long 0x59A66A95 RAS
+ 0 string P1 PBM
+ 0 string P2 PGM
+@@ -24,9 +27,13 @@
+ 0 short 0x4949 TIFF
+ 0 string GIF87a GIF
+ 0 string GIF89a GIF
++0 long 0x89504E47 PNG
++0 long 0xFFD8FFDB JPG
+ 0 long 0xFFD8FFE0 JPG
++0 long 0xFFD8FFE1 JPG
+ 0 long 0xFFD8FFEE JPG
+ 0 long 0x01666370 PCF
++0 string %PDF- PDF
+ 0 string STARTFONT\ 2.1 BDF
+ 0 string From MAIL
+ 0 string #FIG FIG
Index: pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc Fri Apr 11 01:49:11 2025
@@ -0,0 +1,44 @@
+$NetBSD: patch-lib_xfmrc,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Add support for more file types.
+
+--- lib/xfmrc.orig 2001-09-03 06:15:56.000000000 +0000
++++ lib/xfmrc
+@@ -67,6 +67,7 @@
+
+ <PS>:ps.xpm:exec ghostview $1:
+ <GIF>:gif.xpm:exec xv $1:
++<PNG>:paint.xpm:exec xv $1:
+ <JPG>:jpeg.xpm:exec xv $1:
+ <TIFF>:tiff.xpm:exec xv $1:
+ <FIG>:fig.xpm:exec xfig $1:
+@@ -79,8 +80,10 @@
+
+ # audio files, assumes the sox/play program (still rather preliminary)
+
+-<SND>:sound.xpm:exec play -t .auto $1:
+-<RIFF WAVE>:sound.xpm:exec play -t .auto $1:
++<SND>:sound.xpm:exec audioplay $1:
++<RIFF WAVE>:sound.xpm:exec audioplay $1:
++<ID3>:sound.xpm:exec mpg123 $1:
++<FLAC>:sound.xpm:exec flac123 $1:
+
+ # common file types
+
+@@ -90,6 +93,8 @@
+ <MAN>:manpage.xpm:groff -TX100 -man -mX -P-geometry -P655x860 $1:
+ <HTML>:html.xpm:netscape $1:
+
++<PDF>:pdf.xpm:exec mupdf $1:
++
+ <data>*.a:dot_a.xpm:EDIT:
+ <ascii>*.c:dot_c.xpm:EDIT:
+ <ascii>*.cc:dot_cc.xpm:EDIT:
+@@ -122,6 +127,7 @@
+ <GZIP>*.tgz:tar.xpm:tar xfvz $1; echo "*** tar done ***":tar cfvz $*; echo "*** tar done ***"
+ <GZIP>*.tar.z:tar.xpm:tar xfvz $1; echo "*** tar done ***":tar cfvz $*; echo "*** tar done ***"
+ <GZIP>:compressed.xpm:exec gunzip $1:
++<XZ>:compressed.xpm:exec unxz $1:
+
+ <UUENC>:uu.xpm:exec uudecode $1:
+
Index: pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc.nomagic
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc.nomagic:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-lib_xfmrc.nomagic Fri Apr 11 01:49:11 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-lib_xfmrc.nomagic,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Add support for more file types.
+
+--- lib/xfmrc.nomagic.orig 1996-03-16 21:22:15.000000000 +0000
++++ lib/xfmrc.nomagic
+@@ -18,15 +18,25 @@
+ *.ez:wordprocess.xpm:exec ez $1:
+ *.gif:gif.xpm:exec xv $1:
+ *.html:html.xpm:exec Mosaic $1:
+-*.jpg:gif.xpm:exec xv $1:
++*.jpg:jpeg.xpm:exec xv $1:
++*.jpeg:jpeg.xpm:exec xv $1:
++*.png:paint.xpm:exec xv $1:
+ *.man:manpage.xpm:exec groff -Tps -mandoc -X $1:
+ *.mov:mpg.xpm:exec xanim $1:
+ *.mpg:mpg.xpm:exec mpeg_play $1 >/dev/console:
++*.wav:sound.xpm:exec audioplay $1 >/dev/console:
++*.flac:sound.xpm:exec flac123 $1 >/dev/console:
++*.mp3:sound.xpm:exec mpg123 $1 >/dev/console:
++*.mp4:video.xpm:exec mpv $1 >/dev/console:
++*.mkv:video.xpm:exec mpv $1 >/dev/console:
++*.webm:video.xpm:exec mpv $1 >/dev/console:
+ *.tga:gif.xpm:exec xli $1:
+ *.tiff:tiff.xpm:execxv $1:
+-*.tar.gz:tar_z.xpm:exec tar tfz $1| xless:
++*.tar.gz:tar_z.xpm:exec tar tzf $1| xless:
+ *.fig:fig.xpm:exec xfig -me -P $1:
+ *.gz:compressed.xpm:exec gunzip -c $1 | xless:
++*.xz:compressed.xpm:exec unxz -c $1| xless:
++*.pdf:pdf.xpm:exec mupdf $1:
+ *.h:dot_h.xpm:EDIT:
+ *.H:dot_h.xpm:EDIT:
+ *.o:dot_o.xpm:exec nm $1 | xless:
Index: pkgsrc/sysutils/moxfm/patches/patch-regexp_regexp.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-regexp_regexp.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-regexp_regexp.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-regexp_regexp.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Do not define own malloc prototype.
+
+--- regexp/regexp.c.orig 2025-04-11 00:05:57.925516490 +0000
++++ regexp/regexp.c
+@@ -29,6 +29,7 @@
+ * regular-expression syntax might require a total rethink.
+ */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "regexp.h"
+ #include "regmagic.h"
+
+@@ -200,7 +201,6 @@ char *exp;
+ register char *longest;
+ register int len;
+ int flags;
+- extern char *malloc();
+
+ if (exp == NULL)
+ FAIL("NULL argument");
Index: pkgsrc/sysutils/moxfm/patches/patch-src_Common.h
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-src_Common.h:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-src_Common.h Fri Apr 11 01:49:11 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Common.h,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Add missing include for exit() and friends.
+
+--- src/Common.h.orig 2025-04-10 23:48:01.910135767 +0000
++++ src/Common.h
+@@ -37,6 +37,7 @@
+ #endif /* _AIX */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h> /* just in case */
+ #include <sys/stat.h>
+ #include <dirent.h>
Index: pkgsrc/sysutils/moxfm/patches/patch-src_FmChmod.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-src_FmChmod.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-src_FmChmod.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_FmChmod.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Modern systems might have slightly longer usernames.
+
+--- src/FmChmod.c.orig 2025-04-11 00:08:50.660878438 +0000
++++ src/FmChmod.c
+@@ -45,7 +45,7 @@ typedef struct
+ {
+ Widget dialog, w_owner, w_group;
+ String file, directory;
+- char owner[10], group[10];
++ char owner[32], group[32];
+ uid_t owner_id;
+ gid_t group_id;
+ ChmodItem items[3][3];
Index: pkgsrc/sysutils/moxfm/patches/patch-src_FmDialogs.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-src_FmDialogs.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-src_FmDialogs.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_FmDialogs.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Convert errno to a string in a more standard way.
+
+--- src/FmDialogs.c.orig 2025-04-11 00:47:28.898851330 +0000
++++ src/FmDialogs.c
+@@ -23,12 +23,6 @@
+
+ #define TRASHDIR "/.trash" /* relative to home dir */
+
+-#ifndef linux
+-#ifndef __NetBSD__
+-extern char *sys_errlist[];
+-#endif
+-#endif
+-
+ static char error_string[MAXPATHLEN+256];
+
+ typedef enum { Question, Information, Error, Warning } DialogType;
+@@ -230,7 +224,7 @@ void unmountDialog(UnmountProcRec *data)
+
+ void copyError(String from, String to)
+ {
+- sprintf(error_string, "Error copying %s\nto %s:\n%s", from, to, sys_errlist[errno]);
++ sprintf(error_string, "Error copying %s\nto %s:\n%s", from, to, strerror(errno));
+ askQuestion(getAnyShell(), error_string, False, False, False, Error, None, copyErrorProc, NULL);
+ }
+
+@@ -333,7 +327,7 @@ int opError(Widget shell, String msg, St
+ {
+ int answ = -1;
+
+- sprintf(error_string, "%s\n%s:\n%s", msg, fname, sys_errlist[errno]);
++ sprintf(error_string, "%s\n%s:\n%s", msg, fname, strerror(errno));
+ askQuestion(shell, error_string, False, False, False, Error, None, operr_callback, &answ);
+ while (answ == -1)
+ XtAppProcessEvent(app_context, XtIMAll);
+@@ -734,5 +728,5 @@ void error(Widget shell, String line1, S
+
+ void sysError(Widget shell, String line)
+ {
+- error(shell, line, sys_errlist[errno]);
++ error(shell, line, strerror(errno));
+ }
Index: pkgsrc/sysutils/moxfm/patches/patch-src_FmFwActions.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-src_FmFwActions.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-src_FmFwActions.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_FmFwActions.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+64-bit support.
+
+--- src/FmFwActions.c.orig 2025-04-10 23:50:02.567715369 +0000
++++ src/FmFwActions.c
+@@ -188,7 +188,7 @@ void filePopup(Widget w, XEvent *event,
+ FileWindowRec *fw;
+ int x, y, x_win, y_win;
+ unsigned int mask;
+- int item;
++ long item;
+
+ fw = findFileWidgetByForm(w);
+ if (!fw || fw->scrolled == None) return;
Index: pkgsrc/sysutils/moxfm/patches/patch-src_FmFwCb.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-src_FmFwCb.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-src_FmFwCb.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,51 @@
+$NetBSD: patch-src_FmFwCb.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+64-bit support.
+
+--- src/FmFwCb.c.orig 2025-04-11 00:12:39.255422476 +0000
++++ src/FmFwCb.c
+@@ -31,7 +31,7 @@ typedef struct
+ void fileEditCb(Widget w, XtPointer client_data, XtPointer call_data)
+ {
+ FileWindowRec *fw = (FileWindowRec *) client_data;
+- int item;
++ long item;
+
+ XtVaGetValues(fw->form, XmNuserData, (XtPointer) &item, NULL);
+ doEdit(fw->directory, fw->files[item]->name);
+@@ -44,7 +44,7 @@ void fileExecCb(Widget w, XtPointer clie
+ FileWindowRec *fw = (FileWindowRec *) client_data;
+ ExecFileRec *data = (ExecFileRec *) XtMalloc(sizeof(ExecFileRec));
+ TextFieldRec argLine[2];
+- int item;
++ long item;
+
+ XtVaGetValues(fw->form, XmNuserData, (XtPointer) &item, NULL);
+ data->directory = XtNewString(fw->directory);
+@@ -86,7 +86,7 @@ void commandCb(Widget w, XtPointer clien
+ FileWindowRec *fw = (FileWindowRec *) client_data;
+ ExecFileRec *data = (ExecFileRec *) XtMalloc(sizeof(ExecFileRec));
+ TextFieldRec actionLine[2];
+- int item;
++ long item;
+
+ XtVaGetValues(fw->form, XmNuserData, (XtPointer) &item, NULL);
+ data->directory = XtNewString(fw->directory);
+@@ -104,7 +104,7 @@ void commandCb(Widget w, XtPointer clien
+ void fileViewCb(Widget w, XtPointer client_data, XtPointer call_data)
+ {
+ FileWindowRec *fw = (FileWindowRec *) client_data;
+- int item;
++ long item;
+
+ XtVaGetValues(fw->form, XmNuserData, (XtPointer) &item, NULL);
+ doView(fw->directory, fw->files[item]->name);
+@@ -159,7 +159,7 @@ void dirOpenCb(Widget w, XtPointer clien
+ {
+ FileWindowRec *fw = (FileWindowRec *) client_data;
+ char path[MAXPATHLEN];
+- int item;
++ long item;
+
+ zzz();
+ XtVaGetValues(fw->form, XmNuserData, (XtPointer) &item, NULL);
Index: pkgsrc/sysutils/moxfm/patches/patch-src_FmIcons.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-src_FmIcons.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-src_FmIcons.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_FmIcons.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Fix a very obvious overflow bug.
+
+--- src/FmIcons.c.orig 2025-04-10 23:51:35.480102112 +0000
++++ src/FmIcons.c
+@@ -501,7 +501,7 @@ static void displayDTIcon(DTIconRec *dti
+ }
+ else
+ {
+- for (i=0; i < XtNumber(file_popup_menu); i++)
++ for (i=0; i < XtNumber(popup_menu); i++)
+ popup_menu[i].callback_data = dticon;
+ dticon->popup = BuildMenu(dticon->app.form, XmMENU_POPUP, "Button Actions", 0, False, popup_menu);
+ if (resources.auto_save)
Index: pkgsrc/sysutils/moxfm/patches/patch-usermount_usermount.c
diff -u /dev/null pkgsrc/sysutils/moxfm/patches/patch-usermount_usermount.c:1.1
--- /dev/null Fri Apr 11 01:49:11 2025
+++ pkgsrc/sysutils/moxfm/patches/patch-usermount_usermount.c Fri Apr 11 01:49:11 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-usermount_usermount.c,v 1.1 2025/04/11 01:49:11 nia Exp $
+
+Convert errno to a string in a more standard way.
+
+--- usermount/usermount.c.orig 2025-04-11 00:48:16.259958076 +0000
++++ usermount/usermount.c
+@@ -34,7 +34,7 @@ void logAction(char *device, int err)
+ now = time(NULL);
+ fprintf(flog, "%s", asctime(localtime(&now)));
+ if (err)
+- fprintf(flog, "Unsuccessfull trial to mount %s by %s: %s\n", device, pwent->pw_name, sys_errlist[err]);
++ fprintf(flog, "Unsuccessfull trial to mount %s by %s: %s\n", device, pwent->pw_name, strerror(err));
+ else
+ fprintf(flog, "%s mounted by %s\n", device, pwent->pw_name);
+ fclose(flog);
+@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
+ else errfl = 1;
+ if (errfl)
+ {
+- fprintf(stderr, "usermount: Could not mount %s on %s: %s\n", entry->mnt_fsname, entry->mnt_dir, sys_errlist[errno]);
++ fprintf(stderr, "usermount: Could not mount %s on %s: %s\n", entry->mnt_fsname, entry->mnt_dir, strerror(errno));
+ #ifdef LOGFILE
+ logAction(entry->mnt_fsname, errno);
+ #endif
+@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
+ }
+ if (!(mtab = setmntent(MTAB, "r+")) || addmntent(mtab, entry))
+ {
+- fprintf(stderr, "usermount: Warning - error updating %s: %s\n", MTAB, sys_errlist[errno]);
++ fprintf(stderr, "usermount: Warning - error updating %s: %s\n", MTAB, strerror(errno));
+ endmntent(mtab);
+ }
+ #ifdef SET_OWNER
Home |
Main Index |
Thread Index |
Old Index