CVS commit: pkgsrc/x11/xfind

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun Oct 12 08:24:30 UTC 2025

Modified Files:
        pkgsrc/x11/xfind: Makefile distinfo
        pkgsrc/x11/xfind/patches: patch-make.local

Log Message:
x11/xfind: use BSD Makefile

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xfind/Makefile pkgsrc/x11/xfind/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xfind/patches/patch-make.local

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

Modified files:

Index: pkgsrc/x11/xfind/Makefile
diff -u pkgsrc/x11/xfind/Makefile:1.2 pkgsrc/x11/xfind/Makefile:1.3
--- pkgsrc/x11/xfind/Makefile:1.2       Sat Oct 11 16:48:48 2025
+++ pkgsrc/x11/xfind/Makefile   Sun Oct 12 08:24:30 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2025/10/11 16:48:48 vins Exp $
+# $NetBSD: Makefile,v 1.3 2025/10/12 08:24:30 vins Exp $
 
 DISTNAME=      xfind-src
-VERSION=       1.0.3
-PKGNAME=       ${DISTNAME:S,-src,,}-${VERSION}
+PKGNAME=       xfind-1.0.3
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  https://fastestcode.org/dl/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
@@ -15,18 +15,21 @@ LICENSE=    isc
 
 WRKSRC=                ${WRKDIR}/${PKGBASE}
 
-SUBST_CLASSES+=                pkgsrc
-SUBST_STAGE.pkgsrc=    pre-configure
-SUBST_FILES.pkgsrc=    make.local
-SUBST_VARS.pkgsrc+=    PREFIX PKGMANDIR
-SUBST_MESSAGE.pkgsrc=  Replacing pkgsrc placeholders
+MAKE_FILE=             make.local
+USE_BSD_MAKEFILE=      yes
 
-MAKE_FILE=     make.local
+PIXMAPDIR=             share/pixmaps
+APPLRESDIR=            lib/X11/app-defaults
 
-INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1 share/applications
+INSTALLATION_DIRS+=    ${PIXMAPDIR} ${APPLRESDIR}
 
 post-install:
-       ${INSTALL_DATA} ${FILESDIR}/xfind.desktop       \
+       ${INSTALL_DATA} ${WRKSRC}/xfind.xpm       \
+               ${DESTDIR}${PREFIX}/${PIXMAPDIR}/xfind_48x48.xpm
+       ${INSTALL_DATA} ${WRKSRC}/XFind.ad        \
+               ${DESTDIR}${PREFIX}/${APPLRESDIR}/XFind
+       ${INSTALL_DATA} ${FILESDIR}/xfind.desktop \
                ${DESTDIR}${PREFIX}/share/applications
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/x11/xfind/distinfo
diff -u pkgsrc/x11/xfind/distinfo:1.2 pkgsrc/x11/xfind/distinfo:1.3
--- pkgsrc/x11/xfind/distinfo:1.2       Sat Oct 11 16:48:48 2025
+++ pkgsrc/x11/xfind/distinfo   Sun Oct 12 08:24:30 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2025/10/11 16:48:48 vins Exp $
+$NetBSD: distinfo,v 1.3 2025/10/12 08:24:30 vins Exp $
 
 BLAKE2s (xfind-1.0.3/xfind-src.tar.xz) = b56c7abfcd27cc23a192d963ecad700087f86b9813a50cc80277c2a20fa2120f
 SHA512 (xfind-1.0.3/xfind-src.tar.xz) = b8bd28d371e332f05b0bc1f350744b57f9f0844a9381604777a7fb16ac8abb09d5bcafb7f1159f9d29d1f2d37cf07f091d36e033f1535f0b5de020098d37f2c9
 Size (xfind-1.0.3/xfind-src.tar.xz) = 15676 bytes
-SHA1 (patch-make.local) = 5a635b903f6e2a20e82454a0f0440c0c63ded0aa
+SHA1 (patch-make.local) = 5c5d0185088748a234a0e182ad2e4ca30971b01a

Index: pkgsrc/x11/xfind/patches/patch-make.local
diff -u pkgsrc/x11/xfind/patches/patch-make.local:1.1 pkgsrc/x11/xfind/patches/patch-make.local:1.2
--- pkgsrc/x11/xfind/patches/patch-make.local:1.1       Wed Aug  6 19:57:56 2025
+++ pkgsrc/x11/xfind/patches/patch-make.local   Sun Oct 12 08:24:30 2025
@@ -1,39 +1,21 @@
-$NetBSD: patch-make.local,v 1.1 2025/08/06 19:57:56 vins Exp $
+$NetBSD: patch-make.local,v 1.2 2025/10/12 08:24:30 vins Exp $
 
 Local makefile for pkgsrc.
 
---- make.local.orig    2025-08-06 19:15:06.383429826 +0000
+--- make.local.orig    2025-10-12 08:18:05.837454640 +0000
 +++ make.local
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,14 @@
 +# pkgsrc Makefile
 +
-+PREFIX        = @PREFIX@
-+BINDIR        = $(PREFIX)/bin
-+MANDIR        = $(PREFIX)/@PKGMANDIR@
++SRCS  = xfind.c util.c
++PROG  = xfind
 +
-+PIXMAPDIR     = $(PREFIX)/share/pixmaps
-+APPLRESDIR    = $(PREFIX)/lib/X11/app-defaults
++CLEANFILES    += xfind.1
 +
-+LIBS  += -lc -lm -lXm -lXt -lX11
++LDADD += -lc -lm -lXm -lXt -lX11
++DPADD += ${LIBC} ${LIBM} ${LIBXM} ${LIBXT} ${LIBX11}
 +
-+src   = xfind.c util.c
-+objs  = $(src:.c=.o)
-+prog  = xfind
++xfind.1: ${.CURDIR}/$(PROG).man
++      @cp ${.ALLSRC} ${.TARGET}
 +
-+all: $(prog)
-+
-+$(prog): $(objs)
-+      $(CC) -o $@ $(objs) $(LDFLAGS) $(LIBS)
-+
-+.c.o:
-+      $(CC) -c -o $@ $(CFLAGS) $<
-+
-+install:
-+      $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
-+      $(BSD_INSTALL_PROGRAM) $(prog) $(DESTDIR)$(BINDIR)
-+      $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man1
-+      $(BSD_INSTALL_MAN) $(prog).man $(DESTDIR)$(MANDIR)/man1/$(prog).1
-+      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PIXMAPDIR) $(DESTDIR)$(APPLRESDIR)
-+      $(BSD_INSTALL_DATA) xfind.xpm $(DESTDIR)$(PIXMAPDIR)/xfind_48x48.xpm
-+      $(BSD_INSTALL_DATA) XFind.ad $(DESTDIR)$(APPLRESDIR)/XFind
-+.PHONY: all install
++.include <bsd.prog.mk>