CVS commit: pkgsrc/sysutils/libtree

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct 10 17:59:19 UTC 2024

Modified Files:
        pkgsrc/sysutils/libtree: Makefile distinfo
Added Files:
        pkgsrc/sysutils/libtree/patches: patch-Makefile

Log Message:
libtree: Honour PKGMANDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/libtree/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/libtree/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/libtree/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/sysutils/libtree/Makefile
diff -u pkgsrc/sysutils/libtree/Makefile:1.6 pkgsrc/sysutils/libtree/Makefile:1.7
--- pkgsrc/sysutils/libtree/Makefile:1.6        Mon Dec 12 14:10:48 2022
+++ pkgsrc/sysutils/libtree/Makefile    Thu Oct 10 17:59:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/12/12 14:10:48 nros Exp $
+# $NetBSD: Makefile,v 1.7 2024/10/10 17:59:19 nia Exp $
 
 DISTNAME=      libtree-3.1.1
 CATEGORIES=    sysutils
@@ -10,9 +10,8 @@ HOMEPAGE=     https://github.com/haampie/lib
 COMMENT=       Show library info in a tree form
 LICENSE=       mit
 
-USE_LANGUAGES= c99
 USE_TOOLS+=    gmake
 
-MAKE_FLAGS=    SHAREDIR=${PREFIX}
+USE_CC_FEATURES=       c99
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/libtree/distinfo
diff -u pkgsrc/sysutils/libtree/distinfo:1.3 pkgsrc/sysutils/libtree/distinfo:1.4
--- pkgsrc/sysutils/libtree/distinfo:1.3        Mon Dec 12 14:10:48 2022
+++ pkgsrc/sysutils/libtree/distinfo    Thu Oct 10 17:59:19 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2022/12/12 14:10:48 nros Exp $
+$NetBSD: distinfo,v 1.4 2024/10/10 17:59:19 nia Exp $
 
 BLAKE2s (libtree-3.1.1.tar.gz) = 0d7941927f0552a1b89f42c0a325cbc819267f73827cf79dba995317e817ff2c
 SHA512 (libtree-3.1.1.tar.gz) = 6b4b41b16edfcaa83c16b566a3afff1de0ecffdd5f91af2c82db95fca678b993e021ca8fac5fd1d37ad60ea2215100a0889ee457ce08019f3888e32c755ba1ce
 Size (libtree-3.1.1.tar.gz) = 79931 bytes
+SHA1 (patch-Makefile) = 7c15147aef90133b6d4a2a9466c2bcc1c2ab7fe4

Added files:

Index: pkgsrc/sysutils/libtree/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/libtree/patches/patch-Makefile:1.1
--- /dev/null   Thu Oct 10 17:59:19 2024
+++ pkgsrc/sysutils/libtree/patches/patch-Makefile      Thu Oct 10 17:59:19 2024
@@ -0,0 +1,25 @@
+$NetBSD: patch-Makefile,v 1.1 2024/10/10 17:59:19 nia Exp $
+
+Honour PKGMANDIR.
+
+--- Makefile.orig      2024-10-10 17:57:44.340636734 +0000
++++ Makefile
+@@ -6,7 +6,6 @@ LIBTREE_DEFINES = -D_FILE_OFFSET_BITS=64
+ 
+ PREFIX ?= /usr/local
+ BINDIR ?= $(PREFIX)/bin
+-SHAREDIR ?= $(PREFIX)/share
+ 
+ .PHONY: all check install clean
+ 
+@@ -22,8 +21,8 @@ libtree: $(libtree-objs)
+ install: all
+       mkdir -p $(DESTDIR)$(BINDIR)
+       cp -p libtree $(DESTDIR)$(BINDIR)
+-      mkdir -p $(DESTDIR)$(SHAREDIR)/man/man1
+-      cp -p doc/libtree.1 $(DESTDIR)$(SHAREDIR)/man/man1
++      mkdir -p $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
++      cp -p doc/libtree.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
+ 
+ check:: libtree
+