CVS commit: pkgsrc/misc/fd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 23 12:30:46 UTC 2026

Modified Files:
        pkgsrc/misc/fd: Makefile PLIST distinfo
        pkgsrc/misc/fd/patches: patch-Makefile.in

Log Message:
fd: install files under different name

to make space for fd-find

as proposed by pin@ on pkgsrc-users

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/misc/fd/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/fd/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/fd/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/fd/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/misc/fd/Makefile
diff -u pkgsrc/misc/fd/Makefile:1.35 pkgsrc/misc/fd/Makefile:1.36
--- pkgsrc/misc/fd/Makefile:1.35        Thu Dec 11 09:23:33 2025
+++ pkgsrc/misc/fd/Makefile     Fri Jan 23 12:30:46 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2025/12/11 09:23:33 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/01/23 12:30:46 wiz Exp $
 
 DISTNAME=      FD-3.01b
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc shells
 #MASTER_SITES= http://hp.vector.co.jp/authors/VA012337/soft/fd/
 
@@ -20,11 +20,11 @@ MAKE_FLAGS+=        LDFLAGS=${LDFLAGS:Q}
 MANLANG?=      ja_JP.eucJP
 MAKE_ENV+=     LANGDIR=${MANLANG:Q} DATADIR=${DATADIR}
 
-PLIST_SUBST+=  FD_CONFIG=${FD_CONFIG:Q} MANLANG=${MANLANG:Q}
+PLIST_SUBST+=  FD_CONFIG=${FD_CONFIG:Q}
 
-DATADIR=       ${PREFIX}/share/fd
-DOCDIR=                ${PREFIX}/share/doc/fd
-EXAMPLESDIR=   ${PREFIX}/share/examples/fd
+DATADIR=       ${PREFIX}/share/fdclone
+DOCDIR=                ${PREFIX}/share/doc/fdclone
+EXAMPLESDIR=   ${PREFIX}/share/examples/fdclone
 
 DESTDIR_VARNAME=       BUILD
 
@@ -42,6 +42,12 @@ post-configure:
 .endif
 
 post-install:
+       cd ${DESTDIR}${PREFIX}/bin && ${MV} fd fdclone
+       cd ${DESTDIR}${PREFIX}/bin && ${MV} fdsh fdclonesh
+       cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && ${MV} fd.1 fdclone.1
+       cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && ${MV} fdsh.1 fdclonesh.1
+       cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.eucJP/man1 && ${MV} fd.1 fdclone.1
+       cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.eucJP/man1 && ${MV} fdsh.1 fdclonesh.1
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/ja
        ${RUN}cd ${WRKSRC}; \
        for i in ${DOCS}; do \

Index: pkgsrc/misc/fd/PLIST
diff -u pkgsrc/misc/fd/PLIST:1.3 pkgsrc/misc/fd/PLIST:1.4
--- pkgsrc/misc/fd/PLIST:1.3    Fri Apr  8 11:34:44 2011
+++ pkgsrc/misc/fd/PLIST        Fri Jan 23 12:30:46 2026
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2011/04/08 11:34:44 obache Exp $
-bin/fd
-bin/fdsh
-man/${MANLANG}/man1/fd.1
-man/${MANLANG}/man1/fdsh.1
-man/man1/fd.1
-man/man1/fdsh.1
-share/doc/fd/FAQ
-share/doc/fd/HISTORY
-share/doc/fd/LICENSES
-share/doc/fd/README
-share/doc/fd/TECHKNOW
-share/doc/fd/ToAdmin
-share/doc/fd/ja/FAQ
-share/doc/fd/ja/HISTORY
-share/doc/fd/ja/LICENSES
-share/doc/fd/ja/README
-share/doc/fd/ja/TECHKNOW
-share/doc/fd/ja/ToAdmin
-share/examples/fd/${FD_CONFIG}
-${PLIST.fd-full}share/fd/${PKGVERSION}/fd-cat.C
-${PLIST.fd-full}share/fd/${PKGVERSION}/fd-cat.ja
-${PLIST.fd-full}share/fd/fd-dict.tbl
-share/fd/fd-unicd.tbl
+@comment $NetBSD: PLIST,v 1.4 2026/01/23 12:30:46 wiz Exp $
+bin/fdclone
+bin/fdclonesh
+man/ja_JP.eucJP/man1/fdclone.1
+man/ja_JP.eucJP/man1/fdclonesh.1
+man/man1/fdclone.1
+man/man1/fdclonesh.1
+share/doc/fdclone/FAQ
+share/doc/fdclone/HISTORY
+share/doc/fdclone/LICENSES
+share/doc/fdclone/README
+share/doc/fdclone/TECHKNOW
+share/doc/fdclone/ToAdmin
+share/doc/fdclone/ja/FAQ
+share/doc/fdclone/ja/HISTORY
+share/doc/fdclone/ja/LICENSES
+share/doc/fdclone/ja/README
+share/doc/fdclone/ja/TECHKNOW
+share/doc/fdclone/ja/ToAdmin
+share/examples/fdclone/${FD_CONFIG}
+${PLIST.fd-full}share/fdclone/${PKGVERSION}/fd-cat.C
+${PLIST.fd-full}share/fdclone/${PKGVERSION}/fd-cat.ja
+${PLIST.fd-full}share/fdclone/fd-dict.tbl
+share/fdclone/fd-unicd.tbl

Index: pkgsrc/misc/fd/distinfo
diff -u pkgsrc/misc/fd/distinfo:1.16 pkgsrc/misc/fd/distinfo:1.17
--- pkgsrc/misc/fd/distinfo:1.16        Tue Oct 26 10:59:03 2021
+++ pkgsrc/misc/fd/distinfo     Fri Jan 23 12:30:46 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:59:03 nia Exp $
+$NetBSD: distinfo,v 1.17 2026/01/23 12:30:46 wiz Exp $
 
 BLAKE2s (FD-3.01b.tar.gz) = aae80f6a834e6af6ee1cc1123b5bd6ecf380a1daac61e577f50d75fc022f0f4e
 SHA512 (FD-3.01b.tar.gz) = f98dae589fed90958dff335ab5975e11ad539c4c146455ba4607b7bcff2897fc745d9a5500cada0029d7a316795d8b29192ecd75dbd622ece06eeaf4838e310e
 Size (FD-3.01b.tar.gz) = 953287 bytes
-SHA1 (patch-Makefile.in) = cfb4ff0519b7b1eb158476ffa976060af9e20c6e
+SHA1 (patch-Makefile.in) = c212d3ffadd03c80cc4c72fd74e02c6c022e3b8a
 SHA1 (patch-machine.h) = 094bd6c4de6d336fbed60c1924da661407cb86ca

Index: pkgsrc/misc/fd/patches/patch-Makefile.in
diff -u pkgsrc/misc/fd/patches/patch-Makefile.in:1.4 pkgsrc/misc/fd/patches/patch-Makefile.in:1.5
--- pkgsrc/misc/fd/patches/patch-Makefile.in:1.4        Tue Jan  6 11:24:17 2015
+++ pkgsrc/misc/fd/patches/patch-Makefile.in    Fri Jan 23 12:30:46 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.4 2015/01/06 11:24:17 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2026/01/23 12:30:46 wiz Exp $
 
 * honor PKGMANDIR
 * let not to take __LANGDIR__ from ${LANG}
@@ -8,11 +8,13 @@ $NetBSD: patch-Makefile.in,v 1.4 2015/01
 
 --- Makefile.in.orig   2014-05-05 15:00:00.000000000 +0000
 +++ Makefile.in
-@@ -13,11 +13,11 @@ BINTOP     = $(PREFIX)/bin
+@@ -12,12 +12,12 @@ DATATOP    = $(PREFIX)/share
+ BINTOP        = $(PREFIX)/bin
  BINDIR        = $(BUILD)$(BINTOP)
  DATATOP       = $(PREFIX)/share
- DATADIR       = $(BUILD)$(DATATOP)/fd
+-DATADIR       = $(BUILD)$(DATATOP)/fd
 -MANTOP        = $(PREFIX)/man
++DATADIR       = $(BUILD)$(DATATOP)/fdclone
 +MANTOP        = $(PREFIX)/${PKGMANDIR}
  MANDIR        = $(BUILD)$(MANTOP)/man$(MANSEC)
  CATDIR        = $(BUILD)$(MANTOP)/cat$(MANSEC)