[pkgsrc/trunk]: pkgsrc/net DESTDIR support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net DESTDIR support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 09:00:34 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/71d357479a89
branches:  trunk
changeset: 571415:71d357479a89
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 11 22:46:18 2010 +0000

description:
DESTDIR support

diffstat:

 net/openwbem/Makefile         |   4 +++-
 net/openwbem/distinfo         |   4 ++--
 net/openwbem/patches/patch-ad |   4 ++--
 net/sitescooper/Makefile      |  24 ++++++++++++------------
 net/slurm/Makefile            |  16 +++++++++-------
 net/sniffit/Makefile          |  10 ++++++----
 net/speedtouch/Makefile       |   6 +++++-
 net/stripes/Makefile          |   8 +++++++-
 net/sup/Makefile              |   6 ++++--
 net/sup/distinfo              |   4 ++--
 net/sup/patches/patch-aa      |   8 ++++----
 net/tcpdmerge/Makefile        |   9 +++++++--
 12 files changed, 63 insertions(+), 40 deletions(-)

diffs (truncated from 304 to 300 lines):

diff -r e2c441514f1d -r 71d357479a89 net/openwbem/Makefile
--- a/net/openwbem/Makefile     Thu Feb 11 22:35:09 2010 +0000
+++ b/net/openwbem/Makefile     Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/12/27 18:54:18 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/11 22:46:18 joerg Exp $
 
 DISTNAME=      openwbem-3.2.2
 CATEGORIES=    net devel
@@ -8,6 +8,8 @@
 HOMEPAGE=      http://www.openwbem.org/
 COMMENT=       Web-based Enterprise Management software
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS+=       ac_cv_path_TRUE_PATHNAME=true ac_cv_path_FALSE_PATHNAME=false
 USE_TOOLS+=    gmake
diff -r e2c441514f1d -r 71d357479a89 net/openwbem/distinfo
--- a/net/openwbem/distinfo     Thu Feb 11 22:35:09 2010 +0000
+++ b/net/openwbem/distinfo     Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2007/12/27 18:54:18 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/02/11 22:46:18 joerg Exp $
 
 SHA1 (openwbem-3.2.2.tar.gz) = 3272e5cbcfb2a864cccf71e15e0da0f6623420bb
 RMD160 (openwbem-3.2.2.tar.gz) = 31ce8c80d47ff7539315e3978b8c1c493bd17f35
@@ -6,5 +6,5 @@
 SHA1 (patch-aa) = 33cd8d21ed698b511fc662686a7bf7abbf85c232
 SHA1 (patch-ab) = c83f632376f12d7378b1f013a0db5d4ae63f15bf
 SHA1 (patch-ac) = ea2f928b13eaef464e133b0e510fa4b8cfee95b9
-SHA1 (patch-ad) = 52d05017718446076417c140b14ef6296ae2e8e4
+SHA1 (patch-ad) = e8b7c3a3b7fbab6052a9e866c8a1c9f1653db590
 SHA1 (patch-ae) = a9d923bdf6e52acff83588605f2913b196c92038
diff -r e2c441514f1d -r 71d357479a89 net/openwbem/patches/patch-ad
--- a/net/openwbem/patches/patch-ad     Thu Feb 11 22:35:09 2010 +0000
+++ b/net/openwbem/patches/patch-ad     Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/10/29 15:05:21 agc Exp $
+$NetBSD: patch-ad,v 1.2 2010/02/11 22:46:18 joerg Exp $
 
 --- etc/Makefile.in    2007/10/29 14:15:16     1.1
 +++ etc/Makefile.in    2007/10/29 14:17:27
@@ -7,7 +7,7 @@
  SUBDIRS = init sysconfig pam.d
  openwbemconf_DATA = openwbem.conf ssleay.cnf owgencert
 -openwbemconfdir = $(sysconfdir)/openwbem
-+openwbemconfdir = ${DESTDIR}$(prefix)/share/examples/openwbem
++openwbemconfdir = $(prefix)/share/examples/openwbem
  EXTRA_DIST = openwbem.conf.sh owgencert.sh ssleay.cnf
  CLEANFILES = openwbem.conf owgencert
  SUFFIXES = .sh
diff -r e2c441514f1d -r 71d357479a89 net/sitescooper/Makefile
--- a/net/sitescooper/Makefile  Thu Feb 11 22:35:09 2010 +0000
+++ b/net/sitescooper/Makefile  Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:06 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/11 22:46:38 joerg Exp $
 #
 
 DISTNAME=      sitescooper-2.2.8
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://sitescooper.cx/
 COMMENT=       Retrieve stories from websites and convert to Palm readable format
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      p5-libwww>=5.46:../../www/p5-libwww
 DEPENDS+=      pilotmgr-[0-9]*:../../comms/pilotmgr
 
@@ -19,7 +21,8 @@
 CONF_FILES+=   ${PREFIX}/share/examples/sitescooper/sitescooper.cf \
                ${PREFIX}/etc/sitescooper.cf \
 
-INSTALLATION_DIRS=     bin etc ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin etc ${PKGMANDIR}/man1 share/doc/sitescooper \
+                       share/examples/sitescooper share/sitescooper/lib
 
 do-configure:
 .for file in sitescooper rss-to-site subs-to-site
@@ -37,19 +40,16 @@
 
 do-install:
 .for file in sitescooper rss-to-site subs-to-site
-       ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${PREFIX}/${PKGMANDIR}/man1/${file}.1
+       ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${file}.1
 .endfor
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/sitescooper/lib
-       ${CP} -R ${WRKSRC}/site_samples ${PREFIX}/share/sitescooper
-       ${CP} -R ${WRKSRC}/lib/* ${PREFIX}/share/sitescooper/lib
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sitescooper
-       ${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/sitescooper
+       ${CP} -R ${WRKSRC}/site_samples ${DESTDIR}${PREFIX}/share/sitescooper
+       ${CP} -R ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/share/sitescooper/lib
+       ${CP} -R ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/sitescooper
 .for file in CHANGES.txt README.txt sitescooper.spec
-       ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/sitescooper
+       ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/doc/sitescooper
 .endfor
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sitescooper
        ${INSTALL_DATA} ${WRKSRC}/sitescooper.cf \
-               ${PREFIX}/share/examples/sitescooper/sitescooper.cf
+           ${DESTDIR}${PREFIX}/share/examples/sitescooper/sitescooper.cf
 
 .include "../../mk/bsd.pkg.mk"
diff -r e2c441514f1d -r 71d357479a89 net/slurm/Makefile
--- a/net/slurm/Makefile        Thu Feb 11 22:35:09 2010 +0000
+++ b/net/slurm/Makefile        Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/19 21:16:27 obache Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/11 22:47:52 joerg Exp $
 #
 
 DISTNAME=      slurm-0.3.3
@@ -9,16 +9,18 @@
 HOMEPAGE=      http://www.raisdorf.net/projects/slurm/
 COMMENT=       Realtime traffic statistics
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= YES
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/slurm
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/slurm
-       for theme in black blue cyan foo; do                                                            \
-               ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme ${PREFIX}/share/slurm ;        \
+       ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       for theme in black blue cyan foo; do                     \
+               ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme \
+                   ${DESTDIR}${PREFIX}/share/slurm ;            \
        done
 
 .include "../../devel/ncurses/buildlink3.mk"
diff -r e2c441514f1d -r 71d357479a89 net/sniffit/Makefile
--- a/net/sniffit/Makefile      Thu Feb 11 22:35:09 2010 +0000
+++ b/net/sniffit/Makefile      Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:06 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2010/02/11 22:47:49 joerg Exp $
 #
 
 DISTNAME=              sniffit.0.3.5
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://reptile.rug.ac.be/~coder/sniffit/sniffit.html
 COMMENT=               Packet sniffer program
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 NOT_FOR_PLATFORM=      *-*-alpha       # severe LP64 loss
 
 GNU_CONFIGURE=         YES
@@ -18,9 +20,9 @@
 INSTALLATION_DIRS=     ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin/sniffit
-       ${INSTALL_MAN}     ${WRKSRC}/sniffit.5 ${PREFIX}/${PKGMANDIR}/man5
-       ${INSTALL_MAN}     ${WRKSRC}/sniffit.8 ${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${DESTDIR}${PREFIX}/sbin/sniffit
+       ${INSTALL_MAN}     ${WRKSRC}/sniffit.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+       ${INSTALL_MAN}     ${WRKSRC}/sniffit.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e2c441514f1d -r 71d357479a89 net/speedtouch/Makefile
--- a/net/speedtouch/Makefile   Thu Feb 11 22:35:09 2010 +0000
+++ b/net/speedtouch/Makefile   Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/08/25 11:57:45 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/02/11 22:50:54 joerg Exp $
 
 DISTNAME=              speedtouch-1.3.1
 PKGREVISION=           4
@@ -6,6 +6,8 @@
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=speedtouch/}
 DISTFILES=             ${DISTNAME}.tar.bz2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 #
 # Firmware license and link from:
 #      http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm
@@ -45,6 +47,8 @@
 SAMPLECONF=    ${WRKSRC}/doc-bsd/ppp.conf.sample
 
 INSTALLATION_DIRS=     libdata/speedtouch
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} \
+                       mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 post-build:
        ${CP} ${SAMPLECONF} ${SAMPLECONF}.pre
diff -r e2c441514f1d -r 71d357479a89 net/stripes/Makefile
--- a/net/stripes/Makefile      Thu Feb 11 22:35:09 2010 +0000
+++ b/net/stripes/Makefile      Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/17 07:00:19 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/11 22:50:43 joerg Exp $
 #
 
 DISTNAME=              stripes-2.1
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://www.gw.com/sw/stripes/
 COMMENT=               Looking Glass for Zebra and Cisco Routers
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=              {p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI
 DEPENDS+=              p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet
 
@@ -23,4 +25,8 @@
 
 INSTALLATION_DIRS=     libexec/cgi-bin ${PKGMANDIR}/man8
 
+do-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/lg ${DESTDIR}${PREFIX}/libexec/cgi-bin
+       ${INSTALL_MAN} ${WRKSRC}/lg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+
 .include "../../mk/bsd.pkg.mk"
diff -r e2c441514f1d -r 71d357479a89 net/sup/Makefile
--- a/net/sup/Makefile  Thu Feb 11 22:35:09 2010 +0000
+++ b/net/sup/Makefile  Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/05/30 14:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/11 22:52:52 joerg Exp $
 #
 
 DISTNAME=      sup-0.3
@@ -8,6 +8,8 @@
 MAINTAINER=    christos%NetBSD.org@localhost
 COMMENT=       Network file distribution/synchronisation utility
 
-AUTO_MKDIRS=           yes
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+INSTALLATION_DIRS+=    sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff -r e2c441514f1d -r 71d357479a89 net/sup/distinfo
--- a/net/sup/distinfo  Thu Feb 11 22:35:09 2010 +0000
+++ b/net/sup/distinfo  Thu Feb 11 22:46:18 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/07/20 18:19:25 hasso Exp $
+$NetBSD: distinfo,v 1.9 2010/02/11 22:52:52 joerg Exp $
 
 SHA1 (sup-0.3.tar.gz) = 4672de4c7ab2b7b382acfd1b39efb83536b485ae
 RMD160 (sup-0.3.tar.gz) = 81a0c200a0c82bf57e5f258a2b99ccad5db56c65
 Size (sup-0.3.tar.gz) = 95124 bytes
-SHA1 (patch-aa) = 75aa0c905c7dc72832cc2a6861bdef66f000fa34
+SHA1 (patch-aa) = 2281eec2a4c2ff3501b3507caf9161cc45e73330
 SHA1 (patch-ab) = 94801c8650bd6920a1b58d07abf24445ac9245f7
diff -r e2c441514f1d -r 71d357479a89 net/sup/patches/patch-aa
--- a/net/sup/patches/patch-aa  Thu Feb 11 22:35:09 2010 +0000
+++ b/net/sup/patches/patch-aa  Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2007/12/20 20:29:37 christos Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/11 22:52:52 joerg Exp $
 
 --- Makefile.orig      2007-12-20 15:16:34.000000000 -0500
 +++ Makefile   2007-12-20 15:21:40.000000000 -0500
@@ -20,9 +20,9 @@
 -      install -cs -m 555 -o bin -g bin ${PROGRAMS} ${NETBSD_BINDIR}
 -      install -c -m 444 -o bin -g bin ${MAN1} ${NETBSD_MAN1}
 -      install -c -m 444 -o bin -g bin ${MAN8} ${NETBSD_MAN8}
-+      ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${NETBSD_BINDIR}
-+      ${BSD_INSTALL_MAN} ${MAN1} ${NETBSD_MAN1}
-+      ${BSD_INSTALL_MAN} ${MAN8} ${NETBSD_MAN8}
++      ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${DESTDIR}${NETBSD_BINDIR}
++      ${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${NETBSD_MAN1}
++      ${BSD_INSTALL_MAN} ${MAN8} ${DESTDIR}${NETBSD_MAN8}
  
  netcrypt.c:
        @echo "[ Using netcryptvoid.c ]"
diff -r e2c441514f1d -r 71d357479a89 net/tcpdmerge/Makefile
--- a/net/tcpdmerge/Makefile    Thu Feb 11 22:35:09 2010 +0000
+++ b/net/tcpdmerge/Makefile    Thu Feb 11 22:46:18 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/11/09 09:36:41 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/11 22:54:36 joerg Exp $
 
 DISTNAME=      tcpdmerge-1.0
 CATEGORIES=    net
@@ -9,8 +9,13 @@
 HOMEPAGE=      http://phantom.nemoto.ecei.tohoku.ac.jp/~akiraka/tcpdmerge/
 COMMENT=       Merge two tcpdump output files
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_BSD_MAKEFILE=      yes
+
 WRKSRC=                ${WRKDIR}
-MAKE_ENV+=     ${BSD_MAKE_ENV}
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/net DESTDIR support. XXX 600 on the example config is ...
Next by Date: [pkgsrc/trunk]: pkgsrc/archivers/file-roller g/c stale BUILDLINK_API_DEPENDS ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net DESTDIR support. XXX 600 on the example config is ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/archivers/file-roller g/c stale BUILDLINK_API_DEPENDS ...
Indexes:
Home | Main Index | Thread Index | Old Index