CVS commit: pkgsrc/devel/empty

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Dec 15 11:29:43 UTC 2022

Modified Files:
        pkgsrc/devel/empty: Makefile distinfo
        pkgsrc/devel/empty/patches: patch-Makefile

Log Message:
empty: Fix PKGMANDIR and remove libutil on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/empty/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/empty/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/empty/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/devel/empty/Makefile
diff -u pkgsrc/devel/empty/Makefile:1.2 pkgsrc/devel/empty/Makefile:1.3
--- pkgsrc/devel/empty/Makefile:1.2     Fri Mar 20 11:57:26 2020
+++ pkgsrc/devel/empty/Makefile Thu Dec 15 11:29:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/03/20 11:57:26 nia Exp $
+# $NetBSD: Makefile,v 1.3 2022/12/15 11:29:43 jperkin Exp $
 
 DISTNAME=      empty-0.6.20b
 CATEGORIES=    devel
@@ -10,4 +10,6 @@ HOMEPAGE=     http://downloads.sourceforge.n
 COMMENT=       Simple replacement for expect
 LICENSE=       modified-bsd
 
+BUILDLINK_TRANSFORM.SunOS+=    rm:-lutil
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/empty/distinfo
diff -u pkgsrc/devel/empty/distinfo:1.3 pkgsrc/devel/empty/distinfo:1.4
--- pkgsrc/devel/empty/distinfo:1.3     Tue Oct 26 10:14:36 2021
+++ pkgsrc/devel/empty/distinfo Thu Dec 15 11:29:43 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:14:36 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/12/15 11:29:43 jperkin Exp $
 
 BLAKE2s (empty-0.6.20b.tgz) = 34e816e80ddeac9cd968c0ae6ffe61df8c8960466f20283c18a94b52888c926d
 SHA512 (empty-0.6.20b.tgz) = bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d
 Size (empty-0.6.20b.tgz) = 16269 bytes
-SHA1 (patch-Makefile) = c15f37504340e500e9fad8755029ad3773c43ed4
+SHA1 (patch-Makefile) = 2bcb16a4b76eeec5de790c70a5cfb013fbd895e3

Index: pkgsrc/devel/empty/patches/patch-Makefile
diff -u pkgsrc/devel/empty/patches/patch-Makefile:1.1 pkgsrc/devel/empty/patches/patch-Makefile:1.2
--- pkgsrc/devel/empty/patches/patch-Makefile:1.1       Sat Feb 16 16:34:09 2019
+++ pkgsrc/devel/empty/patches/patch-Makefile   Thu Dec 15 11:29:43 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2019/02/16 16:34:09 bsiegert Exp $
+$NetBSD: patch-Makefile,v 1.2 2022/12/15 11:29:43 jperkin Exp $
 
 Do not set PREFIX to allow unprivileged use, and respect DESTDIR.
 
@@ -20,12 +20,12 @@ Do not set PREFIX to allow unprivileged 
 -      [ -d ${PREFIX}/bin ] && cp empty ${PREFIX}/bin || mkdir -p ${PREFIX}/bin && cp empty ${PREFIX}/bin
 -      [ -d ${PREFIX}/man/man1 ] && cp empty.1 ${PREFIX}/man/man1 || mkdir -p ${PREFIX}/man/man1 && cp empty.1 ${PREFIX}/man/man1
 +      [ -d ${DESTDIR}${PREFIX}/bin ] && cp empty ${DESTDIR}${PREFIX}/bin || mkdir -p ${DESTDIR}${PREFIX}/bin && cp empty ${DESTDIR}${PREFIX}/bin
-+      [ -d ${DESTDIR}${PREFIX}/man/man1 ] && cp empty.1 ${DESTDIR}${PREFIX}/man/man1 || mkdir -p ${DESTDIR}${PREFIX}/man/man1 && cp empty.1 ${DESTDIR}${PREFIX}/man/man1
++      [ -d ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ] && cp empty.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || mkdir -p ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && cp empty.1 
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
  deinstall:
 -      rm ${PREFIX}/bin/empty
 -      rm ${PREFIX}/man/man1/empty.1
 +      rm ${DESTDIR}${PREFIX}/bin/empty
-+      rm ${DESTDIR}${PREFIX}/man/man1/empty.1
++      rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/empty.1
  uninstall:    deinstall
  
  clean: