[pkgsrc/trunk]: pkgsrc/misc DESTDIR support

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/misc DESTDIR support
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 08:57:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c3d084c01fe
branches:  trunk
changeset: 570900:8c3d084c01fe
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 04 17:29:59 2010 +0000

description:
DESTDIR support

diffstat:

 misc/open2300-mysql/Makefile   |   7 ++++---
 misc/open2300/Makefile         |   6 +++++-
 misc/open2300/Makefile.common  |   5 ++++-
 misc/open2300/distinfo         |   4 ++--
 misc/open2300/patches/patch-aa |  30 +++++++++++++++---------------
 misc/sci/Makefile              |  11 +++++++----
 6 files changed, 37 insertions(+), 26 deletions(-)

diffs (149 lines):

diff -r 0a507de5db35 -r 8c3d084c01fe misc/open2300-mysql/Makefile
--- a/misc/open2300-mysql/Makefile      Thu Feb 04 17:19:34 2010 +0000
+++ b/misc/open2300-mysql/Makefile      Thu Feb 04 17:29:59 2010 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:13 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/04 17:37:51 joerg Exp $
 #
 
 PKGNAME=       ${DISTNAME:S/-/-mysql-/}
 PKGREVISION=   2
 COMMENT=       WS 23xx weather station MySQL support
 
-PATCHDIR=      ${.CURDIR}/../open2300/patches
-DISTINFO_FILE= ${.CURDIR}/../open2300/distinfo
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_TARGET=  mysql2300
 INSTALL_TARGET=        install-mysql
@@ -15,5 +14,7 @@
 LIBS.SunOS+=   -lnsl -lsocket
 MAKE_ENV+=     LIBS=${LIBS:M*:Q}
 
+INSTALLATION_DIRS+=    bin
+
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../misc/open2300/Makefile.common"
diff -r 0a507de5db35 -r 8c3d084c01fe misc/open2300/Makefile
--- a/misc/open2300/Makefile    Thu Feb 04 17:19:34 2010 +0000
+++ b/misc/open2300/Makefile    Thu Feb 04 17:29:59 2010 +0000
@@ -1,6 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/10 08:19:46 martin Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/04 17:37:51 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 COMMENT=               WS 23xx weather station support software
 
+INSTALLATION_DIRS+=    bin
+
 .include "Makefile.common"
diff -r 0a507de5db35 -r 8c3d084c01fe misc/open2300/Makefile.common
--- a/misc/open2300/Makefile.common     Thu Feb 04 17:19:34 2010 +0000
+++ b/misc/open2300/Makefile.common     Thu Feb 04 17:29:59 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/07/31 13:35:37 grant Exp $
+# $NetBSD: Makefile.common,v 1.6 2010/02/04 17:37:51 joerg Exp $
 #
 
 DISTNAME=              open2300-1.8
@@ -8,4 +8,7 @@
 MAINTAINER=            martin%NetBSD.org@localhost
 HOMEPAGE=              http://open2300.sourceforge.net/
 
+PATCHDIR=              ${.CURDIR}/../open2300/patches
+DISTINFO_FILE=         ${.CURDIR}/../open2300/distinfo
+
 .include "../../mk/bsd.pkg.mk"
diff -r 0a507de5db35 -r 8c3d084c01fe misc/open2300/distinfo
--- a/misc/open2300/distinfo    Thu Feb 04 17:19:34 2010 +0000
+++ b/misc/open2300/distinfo    Thu Feb 04 17:29:59 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/07/31 14:03:28 grant Exp $
+$NetBSD: distinfo,v 1.8 2010/02/04 17:37:51 joerg Exp $
 
 SHA1 (open2300-1.8.tar.gz) = 86fd2dcdef995498ed17062dd4b8df5db6b3383d
 RMD160 (open2300-1.8.tar.gz) = d0b7618cfa7d0ea92708d949fd4521311627865f
 Size (open2300-1.8.tar.gz) = 330320 bytes
-SHA1 (patch-aa) = 9bdd5011c60b2af676d9f86b96e18d67cad6bf0d
+SHA1 (patch-aa) = b008ae36711b3f0543555d6cc00afa3a03c04d67
 SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9
 SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795
diff -r 0a507de5db35 -r 8c3d084c01fe misc/open2300/patches/patch-aa
--- a/misc/open2300/patches/patch-aa    Thu Feb 04 17:19:34 2010 +0000
+++ b/misc/open2300/patches/patch-aa    Thu Feb 04 17:29:59 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/07/31 14:03:28 grant Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/04 17:37:51 joerg Exp $
 
 --- Makefile.orig      2004-11-13 11:25:31.000000000 +1100
 +++ Makefile
@@ -53,22 +53,22 @@
 -      $(INSTALL) interval2300 $(bindir)
 -      $(INSTALL) minmax2300 $(bindir)
 -      
-+      ${BSD_INSTALL_PROGRAM} open2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} dump2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} log2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} fetch2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} wu2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} cw2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} histlog2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} xml2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} light2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} interval2300 $(bindir)
-+      ${BSD_INSTALL_PROGRAM} minmax2300 $(bindir)
-+      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/open2300
-+      ${BSD_INSTALL_DATA} open2300-dist.conf ${PREFIX}/share/examples/open2300/open2300.conf
++      ${BSD_INSTALL_PROGRAM} open2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} dump2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} log2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} fetch2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} wu2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} cw2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} histlog2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} xml2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} light2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} interval2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_PROGRAM} minmax2300 ${DESTDIR}$(bindir)
++      ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/open2300
++      ${BSD_INSTALL_DATA} open2300-dist.conf ${DESTDIR}${PREFIX}/share/examples/open2300/open2300.conf
 +
 +install-mysql:
-+      ${BSD_INSTALL_PROGRAM} mysql2300 $(bindir)
++      ${BSD_INSTALL_PROGRAM} mysql2300 ${DESTDIR}$(bindir)
 +
  uninstall:
        rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 
$(bindir)/minmax2300
diff -r 0a507de5db35 -r 8c3d084c01fe misc/sci/Makefile
--- a/misc/sci/Makefile Thu Feb 04 17:19:34 2010 +0000
+++ b/misc/sci/Makefile Thu Feb 04 17:29:59 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:13 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/04 17:29:59 joerg Exp $
 #
 
 DISTNAME=      sci-0.5.6
@@ -9,15 +9,18 @@
 HOMEPAGE=      http://linuxparts.com/software.html
 COMMENT=       Curses based data entry via templates
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 
+INSTALLATION_DIRS+=    share/doc/sci share/examples/sci
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sci ${PREFIX}/share/examples/sci
        for i in COPYING README INSTALL NEWS ; do \
-               ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/sci ; \
+               ${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/share/doc/sci ; \
           done
        for i in samples/* ; do \
-               ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/examples/sci ; \
+               ${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/share/examples/sci ; \
           done
 
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-Moose to 0.95
Next by Date: [pkgsrc/trunk]: pkgsrc/misc/xfce4-weather-plugin DESTDIR ready
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/p5-Moose to 0.95
Next by Thread: [pkgsrc/trunk]: pkgsrc/misc/xfce4-weather-plugin DESTDIR ready
Indexes:
Home | Main Index | Thread Index | Old Index