[pkgsrc/trunk]: pkgsrc DESTDIR support.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc DESTDIR support.
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:11:01 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5dd93f5c95c2
branches:  trunk
changeset: 520931:5dd93f5c95c2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Nov 03 06:46:21 2006 +0000

description:
DESTDIR support.

diffstat:

 lang/lua/Makefile             |  21 +++++++++++----------
 lang/lua/distinfo             |   4 ++--
 lang/lua/patches/patch-aa     |  20 +++++++++++---------
 multimedia/libdvdcss/Makefile |   4 +++-
 multimedia/libogg/Makefile    |   3 ++-
 5 files changed, 29 insertions(+), 23 deletions(-)

diffs (143 lines):

diff -r 34b2ecc60c3a -r 5dd93f5c95c2 lang/lua/Makefile
--- a/lang/lua/Makefile Fri Nov 03 06:12:27 2006 +0000
+++ b/lang/lua/Makefile Fri Nov 03 06:46:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/09/06 14:58:00 abs Exp $
+# $NetBSD: Makefile,v 1.32 2006/11/03 06:46:21 joerg Exp $
 
 DISTNAME=      lua-5.1.1
 PKGREVISION=   1
@@ -21,6 +21,7 @@
 COMMENT=       Powerful light-weight language for extending applications
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake
@@ -49,27 +50,27 @@
 SUBST_STAGE.pc-prefix+=        post-build
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
        set -e; \
        cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do             \
-               ${INSTALL_DATA} "$$f" ${DOCDIR};                        \
+               ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR};              \
        done
        set -e; \
        cd ${WRKSRC}/doc; for f in *.html *.gif; do                     \
-               ${INSTALL_DATA} "$$f" ${DOCDIR};                        \
+               ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR};              \
        done
-       ${INSTALL_DATA_DIR} ${EGDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
        set -e; \
        cd ${WRKSRC}/test; for f in README *.lua; do                    \
-               ${INSTALL_DATA} "$$f" ${EGDIR};                         \
+               ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR};               \
        done
-       ${INSTALL_DATA_DIR} ${EGDIR}/etc
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc
        set -e; \
        cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
-               ${INSTALL_DATA} "$$f" ${EGDIR}/etc;                     \
+               ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc;           \
        done
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
-       ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff -r 34b2ecc60c3a -r 5dd93f5c95c2 lang/lua/distinfo
--- a/lang/lua/distinfo Fri Nov 03 06:12:27 2006 +0000
+++ b/lang/lua/distinfo Fri Nov 03 06:46:21 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2006/09/06 14:58:00 abs Exp $
+$NetBSD: distinfo,v 1.18 2006/11/03 06:46:21 joerg Exp $
 
 SHA1 (lua-5.1.1.tar.gz) = be13878ceef8e1ee7a4201261f0adf09f89f1005
 RMD160 (lua-5.1.1.tar.gz) = 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c
 Size (lua-5.1.1.tar.gz) = 207810 bytes
-SHA1 (patch-aa) = 089b2f33ec8263a18ec823fd8d75d6e734003b06
+SHA1 (patch-aa) = 9440cceaf69d0db3883b08c857879631a915e93e
 SHA1 (patch-ab) = 2ea6ab36420c886b73ce3ad7494b34a2100eee4d
diff -r 34b2ecc60c3a -r 5dd93f5c95c2 lang/lua/patches/patch-aa
--- a/lang/lua/patches/patch-aa Fri Nov 03 06:12:27 2006 +0000
+++ b/lang/lua/patches/patch-aa Fri Nov 03 06:46:21 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.13 2006/09/02 19:22:32 rillig Exp $
+$NetBSD: patch-aa,v 1.14 2006/11/03 06:46:21 joerg Exp $
 
---- Makefile.orig      2006-06-02 12:53:38.000000000 +0200
-+++ Makefile   2006-09-02 21:07:17.000000000 +0200
+--- Makefile.orig      2006-06-02 10:53:38.000000000 +0000
++++ Makefile
 @@ -11,11 +11,11 @@ PLAT= none
  # if INSTALL_TOP is not an absolute path. (Man pages are installed from the
  # doc directory.)
@@ -25,18 +25,20 @@
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -59,10 +59,10 @@ test:      dummy
+@@ -58,11 +58,11 @@ test:      dummy
+       src/lua test/hello.lua
  
  install: dummy
-       cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+-      cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
 -      cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
 -      cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
 -      cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
 -      cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(INSTALL_BIN)
-+      cd src && $(BSD_INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(INSTALL_LIB)
-+      cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) $(INSTALL_MAN)
++      cd src && $(MKDIR) -p ${DESTDIR}$(INSTALL_BIN) ${DESTDIR}$(INSTALL_INC) ${DESTDIR}$(INSTALL_LIB) ${DESTDIR}$(INSTALL_MAN) ${DESTDIR}$(INSTALL_LMOD) ${DESTDIR}$(INSTALL_CMOD)
++      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) ${DESTDIR}$(INSTALL_BIN)
++      cd src && $(BSD_INSTALL_DATA) $(TO_INC) ${DESTDIR}$(INSTALL_INC)
++      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) ${DESTDIR}$(INSTALL_LIB)
++      cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) ${DESTDIR}$(INSTALL_MAN)
  #     $(RANLIB) $(INSTALL_LIB)/$(TO_LIB)
  
  local:
diff -r 34b2ecc60c3a -r 5dd93f5c95c2 multimedia/libdvdcss/Makefile
--- a/multimedia/libdvdcss/Makefile     Fri Nov 03 06:12:27 2006 +0000
+++ b/multimedia/libdvdcss/Makefile     Fri Nov 03 06:46:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/11 16:47:44 dillo Exp $
+# $NetBSD: Makefile,v 1.15 2006/11/03 06:55:40 joerg Exp $
 #
 # In order to ensure compliance with U.S. and international law, please
 # do not modify this file to provide pointers to the source or homepage
@@ -14,6 +14,8 @@
 HOMEPAGE=      ${LIBDVDCSS_HOMEPAGE}
 COMMENT=       Simple library designed for accessing DVDs
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 RESTRICTED=    Legal problems due to CSS code
 
 # no source because of the CSS source code in it
diff -r 34b2ecc60c3a -r 5dd93f5c95c2 multimedia/libogg/Makefile
--- a/multimedia/libogg/Makefile        Fri Nov 03 06:12:27 2006 +0000
+++ b/multimedia/libogg/Makefile        Fri Nov 03 06:46:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/15 13:38:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/11/03 06:55:40 joerg Exp $
 #
 
 DISTNAME=      libogg-1.1.3
@@ -10,6 +10,7 @@
 COMMENT=       Ogg project codecs library
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_TOOLS+=    pkg-config
 GNU_CONFIGURE= YES
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Remove needless `]'.
Next by Date: [pkgsrc/trunk]: pkgsrc/graphics/netpbm Added some patches for Tru64 support, ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Remove needless `]'.
Next by Thread: [pkgsrc/trunk]: pkgsrc/graphics/netpbm Added some patches for Tru64 support, ...
Indexes:
Home | Main Index | Thread Index | Old Index