[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:10:56 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/22bbc70aa380
branches:  trunk
changeset: 520916:22bbc70aa380
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Nov 02 17:59:37 2006 +0000

description:
DESTDIR support.

diffstat:

 audio/flac/Makefile                |   3 ++-
 audio/libao/Makefile               |   4 ++--
 audio/libao/Makefile.common        |   4 +++-
 audio/libvorbis/Makefile           |   3 ++-
 audio/speex/Makefile               |   4 +++-
 audio/vorbis-tools/Makefile        |   4 +++-
 devel/autoconf213/Makefile         |   3 ++-
 devel/autoconf213/distinfo         |   4 ++--
 devel/autoconf213/patches/patch-aa |  33 +++++++++++++++++++++------------
 devel/automake/Makefile            |   4 +++-
 devel/bison/Makefile               |   3 ++-
 devel/glib/Makefile                |   3 ++-
 devel/libidn/Makefile              |   3 ++-
 devel/m4/Makefile                  |   9 +++++----
 devel/nasm/Makefile                |   5 ++++-
 devel/pkg-config/Makefile          |   3 ++-
 graphics/jpeg/Makefile             |  11 +++++++----
 graphics/jpeg/distinfo             |   4 ++--
 graphics/jpeg/patches/patch-aa     |   4 ++--
 graphics/png/Makefile              |   3 ++-
 graphics/tiff/Makefile             |   3 ++-
 misc/screen/Makefile               |   9 +++++----
 misc/xdg-dirs/Makefile             |   4 +++-
 pkgtools/createbuildlink/Makefile  |   7 ++++---
 pkgtools/digest/Makefile           |   5 +++--
 pkgtools/pkgdiff/Makefile          |   9 +++++----
 pkgtools/verifypc/Makefile         |   7 ++++---
 www/curl/Makefile                  |  16 +++++++++-------
 28 files changed, 108 insertions(+), 66 deletions(-)

diffs (truncated from 647 to 300 lines):

diff -r 7db532412bde -r 22bbc70aa380 audio/flac/Makefile
--- a/audio/flac/Makefile       Thu Nov 02 17:57:48 2006 +0000
+++ b/audio/flac/Makefile       Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/08/27 03:00:19 ben Exp $
+# $NetBSD: Makefile,v 1.38 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=      flac-1.1.2
 PKGREVISION=   1
@@ -10,6 +10,7 @@
 COMMENT=       Free lossless audio codec
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=           yes
diff -r 7db532412bde -r 22bbc70aa380 audio/libao/Makefile
--- a/audio/libao/Makefile      Thu Nov 02 17:57:48 2006 +0000
+++ b/audio/libao/Makefile      Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/13 21:26:17 reed Exp $
+# $NetBSD: Makefile,v 1.31 2006/11/02 17:59:37 joerg Exp $
 
 PKGREVISION=           4
 
@@ -7,6 +7,6 @@
 .include "Makefile.common"
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/ao/plugins-2
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-2
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7db532412bde -r 22bbc70aa380 audio/libao/Makefile.common
--- a/audio/libao/Makefile.common       Thu Nov 02 17:57:48 2006 +0000
+++ b/audio/libao/Makefile.common       Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2006/04/22 07:32:24 lukem Exp $
+# $NetBSD: Makefile.common,v 1.27 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=      libao-0.8.6
 CATEGORIES=    audio devel
@@ -8,6 +8,8 @@
 HOMEPAGE=      http://www.xiph.org/ao/
 COMMENT=       Cross-platform audio library
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo
 PATCHDIR=      ${.CURDIR}/../../audio/libao/patches
 
diff -r 7db532412bde -r 22bbc70aa380 audio/libvorbis/Makefile
--- a/audio/libvorbis/Makefile  Thu Nov 02 17:57:48 2006 +0000
+++ b/audio/libvorbis/Makefile  Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=      libvorbis-1.1.2
 CATEGORIES=    devel audio
@@ -9,6 +9,7 @@
 COMMENT=       Library for the Ogg Vorbis audio encoding format
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
diff -r 7db532412bde -r 22bbc70aa380 audio/speex/Makefile
--- a/audio/speex/Makefile      Thu Nov 02 17:57:48 2006 +0000
+++ b/audio/speex/Makefile      Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/11 03:15:07 reed Exp $
+# $NetBSD: Makefile,v 1.24 2006/11/02 17:59:37 joerg Exp $
 #
 
 DISTNAME=      speex-1.0.5
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.speex.org/
 COMMENT=       Open-source, patent-free voice codec
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
 PKGCONFIG_OVERRIDE=    speex.pc.in
diff -r 7db532412bde -r 22bbc70aa380 audio/vorbis-tools/Makefile
--- a/audio/vorbis-tools/Makefile       Thu Nov 02 17:57:48 2006 +0000
+++ b/audio/vorbis-tools/Makefile       Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/06/15 13:38:51 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/11/02 17:59:37 joerg Exp $
 
 DISTNAME=      vorbis-tools-1.1.1
 PKGREVISION=   1
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.vorbis.com/
 COMMENT=       Ogg Vorbis encoder and player
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # list it into IPv6-ready packages
 BUILD_DEFS+=   USE_INET6
 
diff -r 7db532412bde -r 22bbc70aa380 devel/autoconf213/Makefile
--- a/devel/autoconf213/Makefile        Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/autoconf213/Makefile        Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=       autoconf-2.13
 PKGNAME=       autoconf213-2.13
@@ -16,6 +16,7 @@
 CONFLICTS=             autoconf<2.50
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --program-transform-name='s/$$/-2.13/'
diff -r 7db532412bde -r 22bbc70aa380 devel/autoconf213/distinfo
--- a/devel/autoconf213/distinfo        Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/autoconf213/distinfo        Thu Nov 02 17:59:37 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/11/02 18:17:22 joerg Exp $
 
 SHA1 (autoconf-2.13.tar.gz) = e4826c8bd85325067818f19b2b2ad2b625da66fc
 RMD160 (autoconf-2.13.tar.gz) = 0d1fa0992280ed71c0d72487a5a4c246d1c1b18a
 Size (autoconf-2.13.tar.gz) = 443844 bytes
-SHA1 (patch-aa) = fb21f3f36130023699898ee439b2f233a6be45bf
+SHA1 (patch-aa) = 82b3c0f421f8c5c34b68c625eccff516a4c8cb0c
 SHA1 (patch-ab) = eeb90d28fdd78b39426023110f56df0ab14acd73
 SHA1 (patch-ac) = 4351aecfbfe8f992144b1f6f536cbef3ac9d0e19
 SHA1 (patch-ad) = 640b838fed5e04586e940a5dad543903e4f8be9a
diff -r 7db532412bde -r 22bbc70aa380 devel/autoconf213/patches/patch-aa
--- a/devel/autoconf213/patches/patch-aa        Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/autoconf213/patches/patch-aa        Thu Nov 02 17:59:37 2006 +0000
@@ -1,41 +1,50 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/03 19:25:04 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/11/02 18:17:22 joerg Exp $
 
---- Makefile.in.orig   Tue Jan  5 14:27:16 1999
+--- Makefile.in.orig   1999-01-05 13:27:16.000000000 +0000
 +++ Makefile.in
-@@ -141,7 +141,7 @@ installdirs:
+@@ -137,36 +137,32 @@ installcheck: all install
+       cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
+ 
+ installdirs:
+-      $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir)
++      $(SHELL) ${srcdir}/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(infodir) ${DESTDIR}$(acdatadir)
  
  install: all $(M4FILES) acconfig.h installdirs install-info
        for p in $(ASCRIPTS); do \
 -        $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+        $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++        $(INSTALL) $$p ${DESTDIR}$(bindir)/`echo $$p|sed '$(transform)'`; \
        done
        for i in $(M4FROZEN); do \
-         $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
-@@ -150,9 +150,9 @@ install: all $(M4FILES) acconfig.h insta
-         $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
+-        $(INSTALL_DATA) $$i $(acdatadir)/$$i; \
++        $(INSTALL_DATA) $$i ${DESTDIR}$(acdatadir)/$$i; \
+       done
+       for i in $(M4FILES) acconfig.h; do \
+-        $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
++        $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
        done
        -if test -f autoscan; then \
 -      $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
-+      $(INSTALL) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \
++      $(INSTALL) autoscan ${DESTDIR}$(bindir)/`echo autoscan|sed '$(transform)'`; \
        for i in acfunctions acheaders acidentifiers acprograms \
 -        acmakevars; do \
+-      $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
 +        acmakevars config.guess config.sub; do \
-       $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \
++      $(INSTALL_DATA) $(srcdir)/$$i ${DESTDIR}$(acdatadir)/$$i; \
        done; \
        else :; fi
-@@ -160,13 +160,9 @@ install: all $(M4FILES) acconfig.h insta
+ 
  # Don't cd, to avoid breaking install-sh references.
  install-info: info installdirs
        if test -f autoconf.info; then \
 -        for i in *.info*; do \
 -          $(INSTALL_DATA) $$i $(infodir)/$$i; \
 -        done; \
-+        $(INSTALL_DATA) autoconf.info $(infodir)/autoconf213.info; \
++        $(INSTALL_DATA) autoconf.info ${DESTDIR}$(infodir)/autoconf213.info; \
        else \
 -        for i in $(srcdir)/*.info*; do \
 -          $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
 -        done; \
-+        $(INSTALL_DATA) $(srcdir)/autoconf.info $(infodir)/autoconf213.info; \
++        $(INSTALL_DATA) $(srcdir)/autoconf.info ${DESTDIR}$(infodir)/autoconf213.info; \
        fi
  
  uninstall:
diff -r 7db532412bde -r 22bbc70aa380 devel/automake/Makefile
--- a/devel/automake/Makefile   Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/automake/Makefile   Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/10/26 14:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2006/11/02 18:17:22 joerg Exp $
 #
 
 DISTNAME=      automake-1.10
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://www.gnu.org/software/automake/automake.html
 COMMENT=       GNU Standards-compliant Makefile generator
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      autoconf>=2.60:../../devel/autoconf
 
 USE_TOOLS+=    gm4:run perl:run
diff -r 7db532412bde -r 22bbc70aa380 devel/bison/Makefile
--- a/devel/bison/Makefile      Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/bison/Makefile      Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/06/11 13:59:56 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=              bison-2.3
 CATEGORIES=            devel
@@ -10,6 +10,7 @@
 COMMENT=               GNU yacc(1) replacement
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         YES
 USE_LANGUAGES=         c c++
diff -r 7db532412bde -r 22bbc70aa380 devel/glib/Makefile
--- a/devel/glib/Makefile       Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/glib/Makefile       Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2006/07/19 19:14:38 jlam Exp $
+# $NetBSD: Makefile,v 1.83 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=              glib-1.2.10
 PKGREVISION=           10
@@ -14,6 +14,7 @@
 CONFLICTS=             gtk+-1.0.*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
diff -r 7db532412bde -r 22bbc70aa380 devel/libidn/Makefile
--- a/devel/libidn/Makefile     Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/libidn/Makefile     Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/10/23 22:58:17 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=      libidn-0.6.8
 CATEGORIES=    devel
@@ -10,6 +10,7 @@
 COMMENT=       Internationalized Domain Names command line tool
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
diff -r 7db532412bde -r 22bbc70aa380 devel/m4/Makefile
--- a/devel/m4/Makefile Thu Nov 02 17:57:48 2006 +0000
+++ b/devel/m4/Makefile Thu Nov 02 17:59:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2006/11/02 18:17:22 joerg Exp $
 
 DISTNAME=      m4-1.4.7
 CATEGORIES=    devel
@@ -9,6 +9,7 @@
 COMMENT=       GNU version of UNIX m4 macro language processor
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes
 INFO_FILES=            # PLIST
@@ -30,10 +31,10 @@
 .endif
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/m4
-       ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/share/examples/m4
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/m4
+       ${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${DESTDIR}${PREFIX}/share/examples/m4
 .if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-       ${LN} -sf ${GNU_PROGRAM_PREFIX}m4 ${PREFIX}/bin/gm4
+       ${LN} -sf ${GNU_PROGRAM_PREFIX}m4 ${DESTDIR}${PREFIX}/bin/gm4
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated checkperms to 1.4.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/mono Does not compile on x86_64 -- add to NOT_FOR...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated checkperms to 1.4.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/mono Does not compile on x86_64 -- add to NOT_FOR...
Indexes:
Home | Main Index | Thread Index | Old Index