[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:08 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/629979d764dc
branches:  trunk
changeset: 570289:629979d764dc
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 27 20:09:09 2010 +0000

description:
DESTDIR support

diffstat:

 sysutils/sredird/Makefile         |   7 ++-
 sysutils/storage-manager/Makefile |  61 +++++++++++++++++++-------------------
 sysutils/su2/Makefile             |   8 ++++-
 sysutils/su2/distinfo             |   4 +-
 sysutils/su2/patches/patch-aa     |   8 ++--
 sysutils/sux/Makefile             |   8 +++-
 6 files changed, 54 insertions(+), 42 deletions(-)

diffs (211 lines):

diff -r 18a5594374b3 -r 629979d764dc sysutils/sredird/Makefile
--- a/sysutils/sredird/Makefile Wed Jan 27 20:05:28 2010 +0000
+++ b/sysutils/sredird/Makefile Wed Jan 27 20:09:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/19 16:40:28 tv Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/27 20:09:09 joerg Exp $
 #
 
 DISTNAME=              sredird-2.0.0
@@ -9,13 +9,14 @@
 HOMEPAGE=              http://www.pcmicro.com/sredird/
 COMMENT=               RFC2217 compliant serial port redirector
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_FLAGS+=           CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q}
 BUILD_TARGET=          sredird
 INSTALLATION_DIRS=     libexec share/doc
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sredird ${PREFIX}/libexec/sredird
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sredird.README
+       ${INSTALL_PROGRAM} ${WRKSRC}/sredird ${DESTDIR}${PREFIX}/libexec/sredird
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/sredird.README
 
 .include "../../mk/bsd.pkg.mk"
diff -r 18a5594374b3 -r 629979d764dc sysutils/storage-manager/Makefile
--- a/sysutils/storage-manager/Makefile Wed Jan 27 20:05:28 2010 +0000
+++ b/sysutils/storage-manager/Makefile Wed Jan 27 20:09:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/01/27 20:12:53 joerg Exp $
 
 DISTNAME=              sm_linux_v314_install
 PKGNAME=               storage-manager-3.14
@@ -12,6 +12,8 @@
 COMMENT=               Adaptec Storage Management software
 LICENSE=               generic-nonlicense
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 RESTRICTED=            Redistribution not permitted
 NO_SRC_ON_FTP=         ${RESTRICTED}
 NO_SRC_ON_CDROM=       ${RESTRICTED}
@@ -39,7 +41,7 @@
        "from"                                                          \
        "    ${DOWNLOAD}"
 
-INSTALLATION_DIRS=     etc/rc.d sbin
+INSTALLATION_DIRS=     etc/rc.d sbin lib/dpt
 
 do-extract:
        ${MKDIR} ${WRKSRC}
@@ -59,33 +61,32 @@
                ${FILESDIR}/dptelog > ${WRKDIR}/dptelog
 
 do-install:
-       ${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptcom ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptelog ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dpteng ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptmgr ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptscom ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptsig ${PREFIX}/lib/dpt
-       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/raidutil ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptcom.chk ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptelog.ini ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.hlp ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.rsc ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.ini ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/read.me ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.la ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so.1 ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so.1.0.2 ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.la ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1 ${PREFIX}/lib/dpt
-       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1.0.2 ${PREFIX}/lib/dpt
-       ${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${PREFIX}/${PKGMANDIR}/man8
-       ${INSTALL_SCRIPT} ${WRKDIR}/dptmgr.sh ${PREFIX}/sbin/dptmgr
-       ${INSTALL_SCRIPT} ${WRKDIR}/dptsig.sh ${PREFIX}/sbin/dptsig
-       ${INSTALL_SCRIPT} ${WRKDIR}/raidutil.sh ${PREFIX}/sbin/raidutil
-       ${INSTALL_SCRIPT} ${WRKDIR}/dpteng ${PREFIX}/etc/rc.d/dpteng
-       ${INSTALL_SCRIPT} ${WRKDIR}/dptelog ${PREFIX}/etc/rc.d/dptelog
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptcom ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptelog ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dpteng ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptmgr ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptscom ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptsig ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/raidutil ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptcom.chk ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptelog.ini ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.hlp ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.rsc ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.ini ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/dpt/read.me ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.la ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so.1 ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so.1.0.2 ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.la ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1 ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1.0.2 ${DESTDIR}${PREFIX}/lib/dpt
+       ${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_SCRIPT} ${WRKDIR}/dptmgr.sh ${DESTDIR}${PREFIX}/sbin/dptmgr
+       ${INSTALL_SCRIPT} ${WRKDIR}/dptsig.sh ${DESTDIR}${PREFIX}/sbin/dptsig
+       ${INSTALL_SCRIPT} ${WRKDIR}/raidutil.sh ${DESTDIR}${PREFIX}/sbin/raidutil
+       ${INSTALL_SCRIPT} ${WRKDIR}/dpteng ${DESTDIR}${PREFIX}/etc/rc.d/dpteng
+       ${INSTALL_SCRIPT} ${WRKDIR}/dptelog ${DESTDIR}${PREFIX}/etc/rc.d/dptelog
 
 .include "../../mk/bsd.pkg.mk"
diff -r 18a5594374b3 -r 629979d764dc sysutils/su2/Makefile
--- a/sysutils/su2/Makefile     Wed Jan 27 20:05:28 2010 +0000
+++ b/sysutils/su2/Makefile     Wed Jan 27 20:09:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/01/27 20:15:39 joerg Exp $
 #
 
 DISTNAME=              su2-1.3
@@ -10,6 +10,10 @@
 COMMENT=               Enhanced su, users su with own password + more
 LICENSE=               su2-license
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+SPECIAL_PERMS+=                bin/su2 ${SETUID_ROOT_PERMS}
+
 RESTRICTED=            may not be sold for profit
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
@@ -33,6 +37,8 @@
 
 MAKE_ENV+=             LDLIBS=${LDLIBS:Q}
 
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
+
 post-extract:
        ${CHMOD} -R og+w ${WRKSRC}
 
diff -r 18a5594374b3 -r 629979d764dc sysutils/su2/distinfo
--- a/sysutils/su2/distinfo     Wed Jan 27 20:05:28 2010 +0000
+++ b/sysutils/su2/distinfo     Wed Jan 27 20:09:09 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/03/14 02:53:13 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/01/27 20:15:39 joerg Exp $
 
 SHA1 (su2-1.3.tar.gz) = 0b84a070c0cc95098c0d61566663c89ec2d1189e
 RMD160 (su2-1.3.tar.gz) = 2f5424b6af87508b98f19b9ecdfe12a7cf624c58
 Size (su2-1.3.tar.gz) = 31067 bytes
-SHA1 (patch-aa) = 2d696c6b556e2e79b2073fa87eedc2c1f26770b4
+SHA1 (patch-aa) = 4f8916be4c25a1ac0abd7a561362d85dcf778fac
 SHA1 (patch-ab) = 6a59bf878c2c416d677c4d705f7536ab2350ea94
 SHA1 (patch-ac) = 5f0799f9ed62b656fad7bbde776393700e2407c6
diff -r 18a5594374b3 -r 629979d764dc sysutils/su2/patches/patch-aa
--- a/sysutils/su2/patches/patch-aa     Wed Jan 27 20:05:28 2010 +0000
+++ b/sysutils/su2/patches/patch-aa     Wed Jan 27 20:09:09 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/04/17 04:32:16 ben Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/27 20:15:39 joerg Exp $
 
 --- Makefile.orig      2004-04-16 20:59:06.000000000 -0700
 +++ Makefile
@@ -10,7 +10,7 @@
 +DEST=${PREFIX}
  BINDIR=$(DEST)/bin
 -MANDIR=$(DEST)/man
-+MANDIR=$(DEST)/man/man1
++MANDIR=$(DEST)/${PKGMANDIR}/man1
  
  # OPTIONS:
  # There are a number of DEFINES that can be used to configure su2.  Please
@@ -40,8 +40,8 @@
 +all:  su2 su2.1
 +
 +install: su2 su2.1
-+      install -c -s -m 4711 -o root su2 $(BINDIR)/su2
-+      install -c su2.1 $(MANDIR)/su2.1
++      ${BSD_INSTALL_PROGRAM} su2 ${DESTDIR}$(BINDIR)/su2
++      ${BSD_INSTALL_MAN} su2.1 ${DESTDIR}$(MANDIR)/su2.1
  
  clean:
        rm -f su2 *.o *.a
diff -r 18a5594374b3 -r 629979d764dc sysutils/sux/Makefile
--- a/sysutils/sux/Makefile     Wed Jan 27 20:05:28 2010 +0000
+++ b/sysutils/sux/Makefile     Wed Jan 27 20:09:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/06/06 17:21:42 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/27 20:16:56 joerg Exp $
 #
 
 DISTNAME=              sux-1.0
@@ -8,10 +8,14 @@
 MAINTAINER=            kim%tac.nyc.ny.us@localhost
 COMMENT=               Set user id, preserving shell and environment, checking ssh agent
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=              osname-[0-9]*:../../sysutils/osname
 DEPENDS+=              sshsh-[0-9]*:../../sysutils/sshsh
 
 NO_CONFIGURE=          yes
-MAKE_FLAGS+=           PREFIX=${PREFIX}
+MAKE_FLAGS+=           PREFIX=${DESTDIR}${PREFIX}
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-Class-Accessor-Named Updating devel/p5-Class-...
Next by Date: [pkgsrc/trunk]: pkgsrc Added www/p5-Catalyst-Plugin-Authorization-ACL version...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-Class-Accessor-Named Updating devel/p5-Class-...
Next by Thread: [pkgsrc/trunk]: pkgsrc Added www/p5-Catalyst-Plugin-Authorization-ACL version...
Indexes:
Home | Main Index | Thread Index | Old Index