[pkgsrc/trunk]: pkgsrc/sysutils DESTDIR support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils DESTDIR support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 08:54:02 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4729a16980f
branches:  trunk
changeset: 570270:f4729a16980f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 27 18:38:15 2010 +0000

description:
DESTDIR support

diffstat:

 sysutils/checkpassword/Makefile    |   6 +++++-
 sysutils/cpmtools/Makefile         |   5 ++++-
 sysutils/cpmtools/distinfo         |   3 ++-
 sysutils/cpmtools/patches/patch-ad |  13 +++++++++++++
 sysutils/cpogm/Makefile            |   6 ++++--
 sysutils/cpogm/distinfo            |   4 ++--
 sysutils/cpogm/patches/patch-aa    |   6 +++---
 sysutils/dmsdos/Makefile           |   8 ++++++--
 sysutils/dptutil/Makefile          |   8 +++++---
 9 files changed, 44 insertions(+), 15 deletions(-)

diffs (194 lines):

diff -r a57a9c644a55 -r f4729a16980f sysutils/checkpassword/Makefile
--- a/sysutils/checkpassword/Makefile   Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/checkpassword/Makefile   Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/19 03:55:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/27 18:38:15 joerg Exp $
 #
 
 DISTNAME=              checkpassword-0.90
@@ -12,8 +12,12 @@
 DJB_RESTRICTED=                YES
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 INSTALLATION_DIRS=     bin
 
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/checkpassword ${DESTDIR}${PREFIX}/bin
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a57a9c644a55 -r f4729a16980f sysutils/cpmtools/Makefile
--- a/sysutils/cpmtools/Makefile        Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/cpmtools/Makefile        Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/12/30 12:37:28 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/27 18:43:52 joerg Exp $
 #
 
 DISTNAME=              cpmtools-2.5
@@ -9,10 +9,13 @@
 HOMEPAGE=              http://www.moria.de/~michael/cpmtools/
 COMMENT=               Similar to mtools, except for CP/M filesystems
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/cpmtools
 
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 INSTALLATION_DIRS+=    bin share/cpmtools ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r a57a9c644a55 -r f4729a16980f sysutils/cpmtools/distinfo
--- a/sysutils/cpmtools/distinfo        Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/cpmtools/distinfo        Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2006/12/06 14:58:01 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/01/27 18:43:52 joerg Exp $
 
 SHA1 (cpmtools-2.5.tar.gz) = f563ed2fff83f6e9f7b7dfaf9c93c330d089542e
 RMD160 (cpmtools-2.5.tar.gz) = 36548809b9296023cd89e3b54aa26e51f9431763
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 1bab34c82e5f56391cb4a0822f1afc68bc717132
 SHA1 (patch-ab) = beea1a1a0985506a8d5719d54ec95c2bcf1293de
 SHA1 (patch-ac) = e473ebcc2a9a89089d38340a91efffcbde6dbfac
+SHA1 (patch-ad) = 8d16645203eade5f8d850c936b902970529ca46d
diff -r a57a9c644a55 -r f4729a16980f sysutils/cpmtools/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cpmtools/patches/patch-ad        Wed Jan 27 18:38:15 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/01/27 18:43:52 joerg Exp $
+
+--- Makefile.in.orig   2010-01-27 18:41:45.000000000 +0000
++++ Makefile.in
+@@ -85,7 +85,7 @@ install:     all
+               $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+               $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+               $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+-              $(INSTALL_DATA) diskdefs @datadir@/diskdefs
++              $(INSTALL_DATA) diskdefs ${DESTDIR}@datadir@/diskdefs
+               $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
+               $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
+               $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1
diff -r a57a9c644a55 -r f4729a16980f sysutils/cpogm/Makefile
--- a/sysutils/cpogm/Makefile   Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/cpogm/Makefile   Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/03/15 18:37:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/27 18:45:27 joerg Exp $
 #
 
 DISTNAME=              cpogm-1.0
@@ -8,11 +8,13 @@
 MAINTAINER=            kim%tac.nyc.ny.us@localhost
 COMMENT=               Copy owner, group and mode of a file
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            perl:run
 
 NO_CONFIGURE=          yes
 BUILD_TARGET=          all PREFIX=${PREFIX}
-INSTALL_TARGET=                install PREFIX=${PREFIX}
+INSTALL_MAKE_FLAGS+=   PREFIX=${PREFIX}
 INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff -r a57a9c644a55 -r f4729a16980f sysutils/cpogm/distinfo
--- a/sysutils/cpogm/distinfo   Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/cpogm/distinfo   Wed Jan 27 18:38:15 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.5 2010/01/27 18:45:27 joerg Exp $
 
 SHA1 (cpogm-1.0.tar.gz) = 676cc5d6220c29c9a7832500a86b133c474e395a
 RMD160 (cpogm-1.0.tar.gz) = 7c9622a794aead08a5b41bba397335aef3c6fed5
 Size (cpogm-1.0.tar.gz) = 981 bytes
-SHA1 (patch-aa) = 5de67b71c884e5dc0a02806e80bec5cd78765cd0
+SHA1 (patch-aa) = 143a8c00c99b9c0b56433bd5d67d622e83c87fff
diff -r a57a9c644a55 -r f4729a16980f sysutils/cpogm/patches/patch-aa
--- a/sysutils/cpogm/patches/patch-aa   Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/cpogm/patches/patch-aa   Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/09/23 13:29:26 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/27 18:45:27 joerg Exp $
 
 --- Makefile.orig      Sun Sep 12 16:23:32 1999
 +++ Makefile   Tue Sep 23 10:04:24 2003
@@ -8,8 +8,8 @@
  install: ${CMD}
 -      install -c -m 755 ${CMD} ${PREFIX}/${BIN}/${CMD}
 -      install -c -m 444 ${CMD}.man ${PREFIX}/man/man${MAN}/${CMD}.${MAN}
-+      ${BSD_INSTALL_SCRIPT} ${CMD} ${PREFIX}/${BIN}/${CMD}
-+      ${BSD_INSTALL_MAN} ${CMD}.man ${PREFIX}/man/man${MAN}/${CMD}.${MAN}
++      ${BSD_INSTALL_SCRIPT} ${CMD} ${DESTDIR}${PREFIX}/${BIN}/${CMD}
++      ${BSD_INSTALL_MAN} ${CMD}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man${MAN}/${CMD}.${MAN}
  
  clean:
        rm -f ${CMD}
diff -r a57a9c644a55 -r f4729a16980f sysutils/dmsdos/Makefile
--- a/sysutils/dmsdos/Makefile  Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/dmsdos/Makefile  Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/02/08 21:18:44 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/27 18:46:39 joerg Exp $
 #
 
 DISTNAME=      dmsdos-0.9.2.3-pre2
@@ -11,12 +11,16 @@
 HOMEPAGE=      http://cmp.felk.cvut.cz/~pisa/dmsdos/
 COMMENT=       Program to access DBLSPACE/DRVSPACE containers
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/dmsdos-0.9.2.3-pre2/src
 
 F=     mcdmsdos.c dblspace_dec.c lib_interface.c dblspace_interface.c \
        dblspace_chk.c dblspace_tables.c dstacker_alloc.c dblspace_alloc.c \
        dblspace_compr.c dstacker_compr.c dstacker_dec.c dblspace_methsq.c
 
+INSTALLATION_DIRS=     bin
+
 post-extract:
        find ${WRKDIR}/dmsdos-0.9.2.3-pre2 -type d -exec chmod +x {} \;
 
@@ -27,6 +31,6 @@
        cd ${WRKSRC} && ${CC} -D__DMSDOS_LIB__ ${F} -o mcdmsdos
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/mcdmsdos ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/mcdmsdos ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r a57a9c644a55 -r f4729a16980f sysutils/dptutil/Makefile
--- a/sysutils/dptutil/Makefile Wed Jan 27 18:36:54 2010 +0000
+++ b/sysutils/dptutil/Makefile Wed Jan 27 18:38:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/06/11 16:46:36 ad Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/27 18:47:15 joerg Exp $
 
 DISTNAME=              raidmgt-3.31
 PKGNAME=               dptutil-3.31
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://opensource.adaptec.com/
 COMMENT=               DPT/Adaptec Storage Management software (dptutil)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # Should work for 32-bit PowerPC and SPARC, but untested.  64-bit platforms
 # may have problems.
 ONLY_FOR_PLATFORM=     NetBSD-*-i386
@@ -27,7 +29,7 @@
        ${MV} ${WRKSRC}/dptutil/makefile.tmp ${WRKSRC}/dptutil/makefile
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${PREFIX}/sbin/dpteng
-       ${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${PREFIX}/sbin/dptutil
+       ${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${DESTDIR}${PREFIX}/sbin/dpteng
+       ${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${DESTDIR}${PREFIX}/sbin/dptutil
 
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/comms/jpilot DESTDIR support. Based on patch from Stev...
Next by Date: [pkgsrc/trunk]: pkgsrc DESTDIR support
Previous by Thread: [pkgsrc/trunk]: pkgsrc/comms/jpilot DESTDIR support. Based on patch from Stev...
Next by Thread: [pkgsrc/trunk]: pkgsrc DESTDIR support
Indexes:
Home | Main Index | Thread Index | Old Index