Thu Dec 15 11:29:43 2022 UTC ()
empty: Fix PKGMANDIR and remove libutil on SunOS.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/devel/empty/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/empty/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/empty/patches/patch-Makefile
cvs diff -r1.2 -r1.3 pkgsrc/devel/empty/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/empty/Makefile 2020/03/20 11:57:26 1.2
+++ pkgsrc/devel/empty/Makefile 2022/12/15 11:29:43 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: Makefile,v 1.2 2020/03/20 11:57:26 nia Exp $ 1# $NetBSD: Makefile,v 1.3 2022/12/15 11:29:43 jperkin Exp $
2 2
3DISTNAME= empty-0.6.20b 3DISTNAME= empty-0.6.20b
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= https://downloads.sourceforge.net/project/empty/empty/empty-0.6.20b/ 5MASTER_SITES= https://downloads.sourceforge.net/project/empty/empty/empty-0.6.20b/
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8MAINTAINER= dave@weller-fahy.com 8MAINTAINER= dave@weller-fahy.com
9HOMEPAGE= http://downloads.sourceforge.net/project/empty/empty/empty-0.6.20b/ 9HOMEPAGE= http://downloads.sourceforge.net/project/empty/empty/empty-0.6.20b/
10COMMENT= Simple replacement for expect 10COMMENT= Simple replacement for expect
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
 13BUILDLINK_TRANSFORM.SunOS+= rm:-lutil
 14
13.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/empty/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/empty/distinfo 2021/10/26 10:14:36 1.3
+++ pkgsrc/devel/empty/distinfo 2022/12/15 11:29:43 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2021/10/26 10:14:36 nia Exp $ 1$NetBSD: distinfo,v 1.4 2022/12/15 11:29:43 jperkin Exp $
2 2
3BLAKE2s (empty-0.6.20b.tgz) = 34e816e80ddeac9cd968c0ae6ffe61df8c8960466f20283c18a94b52888c926d 3BLAKE2s (empty-0.6.20b.tgz) = 34e816e80ddeac9cd968c0ae6ffe61df8c8960466f20283c18a94b52888c926d
4SHA512 (empty-0.6.20b.tgz) = bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d 4SHA512 (empty-0.6.20b.tgz) = bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d
5Size (empty-0.6.20b.tgz) = 16269 bytes 5Size (empty-0.6.20b.tgz) = 16269 bytes
6SHA1 (patch-Makefile) = c15f37504340e500e9fad8755029ad3773c43ed4 6SHA1 (patch-Makefile) = 2bcb16a4b76eeec5de790c70a5cfb013fbd895e3
cvs diff -r1.1 -r1.2 pkgsrc/devel/empty/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/empty/patches/patch-Makefile 2019/02/16 16:34:09 1.1
+++ pkgsrc/devel/empty/patches/patch-Makefile 2022/12/15 11:29:43 1.2
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-Makefile,v 1.1 2019/02/16 16:34:09 bsiegert Exp $ 1$NetBSD: patch-Makefile,v 1.2 2022/12/15 11:29:43 jperkin Exp $
2 2
3Do not set PREFIX to allow unprivileged use, and respect DESTDIR. 3Do not set PREFIX to allow unprivileged use, and respect DESTDIR.
4 4
5--- Makefile.orig 2015-08-10 08:21:35.000000000 +0000 5--- Makefile.orig 2015-08-10 08:21:35.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -13,8 +13,6 @@ 7@@ -13,8 +13,6 @@
8 CC = cc 8 CC = cc
9 LIBS = -lutil 9 LIBS = -lutil
10  10
11-PREFIX = /usr/local 11-PREFIX = /usr/local
12- 12-
13 all: 13 all:
14 ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c 14 ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c
15  15
16@@ -41,11 +39,11 @@ SunOS-gcc: 16@@ -41,11 +39,11 @@ SunOS-gcc:
17  17
18 install: 18 install:
19 [ -f `which strip` ] && strip empty 19 [ -f `which strip` ] && strip empty
20- [ -d ${PREFIX}/bin ] && cp empty ${PREFIX}/bin || mkdir -p ${PREFIX}/bin && cp empty ${PREFIX}/bin 20- [ -d ${PREFIX}/bin ] && cp empty ${PREFIX}/bin || mkdir -p ${PREFIX}/bin && cp empty ${PREFIX}/bin
21- [ -d ${PREFIX}/man/man1 ] && cp empty.1 ${PREFIX}/man/man1 || mkdir -p ${PREFIX}/man/man1 && cp empty.1 ${PREFIX}/man/man1 21- [ -d ${PREFIX}/man/man1 ] && cp empty.1 ${PREFIX}/man/man1 || mkdir -p ${PREFIX}/man/man1 && cp empty.1 ${PREFIX}/man/man1
22+ [ -d ${DESTDIR}${PREFIX}/bin ] && cp empty ${DESTDIR}${PREFIX}/bin || mkdir -p ${DESTDIR}${PREFIX}/bin && cp empty ${DESTDIR}${PREFIX}/bin 22+ [ -d ${DESTDIR}${PREFIX}/bin ] && cp empty ${DESTDIR}${PREFIX}/bin || mkdir -p ${DESTDIR}${PREFIX}/bin && cp empty ${DESTDIR}${PREFIX}/bin
23+ [ -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 23+ [ -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
24 deinstall: 24 deinstall:
25- rm ${PREFIX}/bin/empty 25- rm ${PREFIX}/bin/empty
26- rm ${PREFIX}/man/man1/empty.1 26- rm ${PREFIX}/man/man1/empty.1
27+ rm ${DESTDIR}${PREFIX}/bin/empty 27+ rm ${DESTDIR}${PREFIX}/bin/empty
28+ rm ${DESTDIR}${PREFIX}/man/man1/empty.1 28+ rm ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/empty.1
29 uninstall: deinstall 29 uninstall: deinstall
30  30
31 clean: 31 clean: