[pkgsrc/trunk]: pkgsrc Support DESTDIR and PKGMANDIR

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Support DESTDIR and PKGMANDIR
From: tnn <tnn%pkgsrc.org@localhost>
Date: Mon, 16 Jan 2023 19:55:58 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fa5f99ec8aa
branches:  trunk
changeset: 400899:1fa5f99ec8aa
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Oct 29 21:53:10 2009 +0000

description:
Support DESTDIR and PKGMANDIR

diffstat:

 chat/zephyr/Makefile            |  16 ++++++++++++----
 chat/zephyr/distinfo            |   4 ++--
 chat/zephyr/patches/patch-ai    |  11 +----------
 sysutils/wtail/Makefile         |   3 ++-
 sysutils/wtail/distinfo         |   4 ++--
 sysutils/wtail/patches/patch-aa |  20 +++++++++++---------
 6 files changed, 30 insertions(+), 28 deletions(-)

diffs (154 lines):

diff -r 427925f31d0e -r 1fa5f99ec8aa chat/zephyr/Makefile
--- a/chat/zephyr/Makefile      Thu Oct 29 21:34:12 2009 +0000
+++ b/chat/zephyr/Makefile      Thu Oct 29 21:53:10 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/20 00:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/10/29 21:53:10 tnn Exp $
 #
 
 DISTNAME=      zephyr-20010518
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://web.mit.edu/olh/Zephyr/index.html
 COMMENT=       Project Athena's original Instant Messaging system
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/zephyr
 GNU_CONFIGURE= YES
 
@@ -33,11 +35,17 @@
 
 RCD_SCRIPTS=           zhm
 
+SUBST_CLASSES+=                mandir
+SUBST_STAGE.mandir=    pre-configure
+SUBST_MESSAGE.mandir=  Fixing mandir in Makefile.in
+SUBST_FILES.mandir=    */*/Makefile.in */Makefile.in Makefile.in
+SUBST_SED.mandir=      -e 's,$${prefix}/man,@mandir@,g'
+
 pre-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA_DIR} ${ZEPHYR_DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${ZEPHYR_DOCDIR}
 .for f in ${ZEPHYR_DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/${f} ${ZEPHYR_DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${ZEPHYR_DOCDIR}
 .endfor
 
 .include "../../devel/readline/buildlink3.mk"
diff -r 427925f31d0e -r 1fa5f99ec8aa chat/zephyr/distinfo
--- a/chat/zephyr/distinfo      Thu Oct 29 21:34:12 2009 +0000
+++ b/chat/zephyr/distinfo      Thu Oct 29 21:53:10 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/09/23 13:31:31 tnn Exp $
+$NetBSD: distinfo,v 1.6 2009/10/29 21:53:10 tnn Exp $
 
 SHA1 (zephyr-20010518.tar.gz) = cd2fca9c2f0bfaa8e69c94813bedc87d66d3ac1c
 RMD160 (zephyr-20010518.tar.gz) = 1082db0df40e4ac1007e4b2b4f8adc15cf8a8ab0
@@ -10,7 +10,7 @@
 SHA1 (patch-af) = 4ebb22fa3c1b2ed351ee267be737d34d8292129c
 SHA1 (patch-ag) = 2c756da1e62613333cca2b68ca9b5f6c96e0f147
 SHA1 (patch-ah) = 8282d416d24eafcb40ead93d4c376f1e8e80b207
-SHA1 (patch-ai) = 2e6a35f15cca8912ddbda5c2aad73102be01be4a
+SHA1 (patch-ai) = bfa2d01d20884d31e58bd12a171938504d929e28
 SHA1 (patch-aj) = 3ec4b1624e2eecefe129ac53e870ce2fb2bce236
 SHA1 (patch-ak) = 7c2084aac1e4b30124c380fbc369cb6a6b41eb17
 SHA1 (patch-al) = d61151a84bb9a55c21b2d757650064390127f8c8
diff -r 427925f31d0e -r 1fa5f99ec8aa chat/zephyr/patches/patch-ai
--- a/chat/zephyr/patches/patch-ai      Thu Oct 29 21:34:12 2009 +0000
+++ b/chat/zephyr/patches/patch-ai      Thu Oct 29 21:53:10 2009 +0000
@@ -1,16 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2009/09/23 13:31:32 tnn Exp $
+$NetBSD: patch-ai,v 1.3 2009/10/29 21:53:10 tnn Exp $
 
 --- Makefile.in.orig   1998-06-11 21:10:02.000000000 +0200
 +++ Makefile.in
-@@ -7,7 +7,7 @@ sysconfdir=@sysconfdir@
- sbindir=@sbindir@
- 
- includedir=${prefix}/include
--mandir=${prefix}/man
-+mandir=${prefix}/${PKGMANDIR}
- bindir=${exec_prefix}/bin
- libdir=${exec_prefix}/lib
- 
 @@ -31,8 +31,6 @@ install:
        ${ENSUREDIR} ${DESTDIR}${libdir} 755
        ${ENSUREDIR} ${DESTDIR}${datadir} 755
diff -r 427925f31d0e -r 1fa5f99ec8aa sysutils/wtail/Makefile
--- a/sysutils/wtail/Makefile   Thu Oct 29 21:34:12 2009 +0000
+++ b/sysutils/wtail/Makefile   Thu Oct 29 21:53:10 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2009/10/29 21:58:38 tnn Exp $
 #
 
 DISTNAME=      wtail-0.2.2
@@ -10,6 +10,7 @@
 HOMEPAGE=      http://www.teaser.fr/~amajorel/wtail/
 COMMENT=       Watch multiple files at once
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_ENV+=     SED=${SED:Q}
 
diff -r 427925f31d0e -r 1fa5f99ec8aa sysutils/wtail/distinfo
--- a/sysutils/wtail/distinfo   Thu Oct 29 21:34:12 2009 +0000
+++ b/sysutils/wtail/distinfo   Thu Oct 29 21:53:10 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/10/29 21:58:38 tnn Exp $
 
 SHA1 (wtail-0.2.2.tar.gz) = 609f4ebe064c155829e96f865bee93e727b692e8
 RMD160 (wtail-0.2.2.tar.gz) = cb118254ef80c2a26d0ce2b482ca6b64d0401417
 Size (wtail-0.2.2.tar.gz) = 13633 bytes
-SHA1 (patch-aa) = 1605c1836fddce4c3fef589e3cf5a11d6bab33d6
+SHA1 (patch-aa) = b37d9383f512c3e14fb590d6f07b8e2fbb12ad00
diff -r 427925f31d0e -r 1fa5f99ec8aa sysutils/wtail/patches/patch-aa
--- a/sysutils/wtail/patches/patch-aa   Thu Oct 29 21:34:12 2009 +0000
+++ b/sysutils/wtail/patches/patch-aa   Thu Oct 29 21:53:10 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $
+$NetBSD: patch-aa,v 1.2 2009/10/29 21:58:38 tnn Exp $
 
---- Makefile.orig      Tue Jan 14 00:12:57 2003
-+++ Makefile   Sun Feb 16 01:09:18 2003
+--- Makefile.orig      2003-01-14 00:12:57.000000000 +0100
++++ Makefile
 @@ -5,7 +5,7 @@
  
  
@@ -11,7 +11,7 @@
  TMPDIR  = ~/tmp
  
  # Variables that you probably don't want to modify
-@@ -22,12 +22,12 @@
+@@ -22,12 +22,14 @@ clean:
        rm -f $(OBJ) wtail
  
  install:
@@ -21,16 +21,18 @@
 -      mkdir -p "$(MAN)"/man1
 -      sed 's/@{VERSION}/'$(VERSION)'/g' wtail.1 >"$(MAN)"/man1/wtail.1
 -      touch -r wtail.1 "$(MAN)"/man1/wtail.1
-+      ${BSD_INSTALL_PROGRAM} wtail $(PREFIX)/bin/
++      ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(PREFIX)/bin
++      ${BSD_INSTALL_PROGRAM} wtail $(DESTDIR)$(PREFIX)/bin
 +      ${SED} 's/@{VERSION}/'$(VERSION)'/g' wtail.1 > wtail.1.fixed
-+      ${BSD_INSTALL_MAN} wtail.1.fixed $(PREFIX)/man/man1/wtail.1
-+      ${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/doc/wtail
++      ${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
++      ${BSD_INSTALL_MAN} wtail.1.fixed $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/wtail.1
++      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(PREFIX)/share/doc/wtail
 +      ${BSD_INSTALL_DATA} README CHANGES COPYING FAQ VERSION          \
-+              $(PREFIX)/share/doc/wtail/
++              $(DESTDIR)$(PREFIX)/share/doc/wtail/
  
  test: chatter
        ./chatter /tmp/wtail.a /tmp/wtail.b /tmp/wtail.c                \
-@@ -51,7 +51,7 @@
+@@ -51,7 +53,7 @@ dist:
        arc=$(ARC); cd $(TMPDIR) && tar -cf - $$arc | gzip >$$arc.tar.gz
  
  wtail: $(OBJ)

Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/awf Support PKGMANDIR
Next by Date: [pkgsrc/trunk]: pkgsrc/security/mirrordir fix broken/incomplete PKG_SYSCONFDI...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/awf Support PKGMANDIR
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/mirrordir fix broken/incomplete PKG_SYSCONFDI...
Indexes:

Home | Main Index | Thread Index | Old Index