[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 09:00:24 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/810bc2fab0c2
branches:  trunk
changeset: 571385:810bc2fab0c2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 11 19:53:03 2010 +0000

description:
DESTDIR support

diffstat:

 mail/jchkmail/Makefile               |   9 +++++++--
 mail/jchkmail/distinfo               |   4 ++--
 mail/jchkmail/patches/patch-ad       |  19 +++++++++----------
 multimedia/dvdview/Makefile          |   9 ++++++---
 multimedia/flashplayer/Makefile      |   6 +++++-
 multimedia/goggles/Makefile          |   6 ++++--
 multimedia/libflash/Makefile         |   6 +++++-
 multimedia/libflash/distinfo         |   6 +++---
 multimedia/libflash/patches/patch-ab |   8 ++++----
 multimedia/libflash/patches/patch-af |   4 ++--
 multimedia/mpeg-lib/Makefile         |  10 +++++++++-
 multimedia/openquicktime/Makefile    |   7 ++++++-
 12 files changed, 62 insertions(+), 32 deletions(-)

diffs (295 lines):

diff -r 968b00605fa5 -r 810bc2fab0c2 mail/jchkmail/Makefile
--- a/mail/jchkmail/Makefile    Thu Feb 11 19:30:01 2010 +0000
+++ b/mail/jchkmail/Makefile    Thu Feb 11 19:53:03 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/03/22 04:53:39 manu Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/11 19:53:03 joerg Exp $
 #
 
 DISTNAME=              jchkmail-1.3.1a
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          http://j-chkmail.ensmp.fr/download/
 
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://j-chkmail.ensmp.fr/
 COMMENT=               Behavior-based virus and spam milter for Sendmail
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
@@ -32,6 +34,9 @@
 
 INSTALLATION_DIRS=     share/examples/rc.d
 
+OWN_DIRS_PERMS+=       /var/spool/jchkmail smmsp smmsp 750 \
+                       /var/jchkmail  smmsp smmsp 755
+
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 968b00605fa5 -r 810bc2fab0c2 mail/jchkmail/distinfo
--- a/mail/jchkmail/distinfo    Thu Feb 11 19:30:01 2010 +0000
+++ b/mail/jchkmail/distinfo    Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/09/04 20:40:43 joerg Exp $
+$NetBSD: distinfo,v 1.6 2010/02/11 19:53:03 joerg Exp $
 
 SHA1 (jchkmail-1.3.1a.tar.gz) = 6cade163151a2c08d42082b971b55a11c33f47c6
 RMD160 (jchkmail-1.3.1a.tar.gz) = b707514f3a04d871f32db660be8b975577e1dbf3
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = 19acb161de38b297d000ae4cc9a96106ff7b3a20
 SHA1 (patch-ab) = c629836b5dbab9282104a3c2731e379c56c5ea81
 SHA1 (patch-ac) = 8be29408b4fb665d3374fb6232b596d028d69e28
-SHA1 (patch-ad) = 2702900d14582a926370b31e88a05e0cbd3d4105
+SHA1 (patch-ad) = 18b8504670010da4d7e75cc3164e74d560d7eba0
diff -r 968b00605fa5 -r 810bc2fab0c2 mail/jchkmail/patches/patch-ad
--- a/mail/jchkmail/patches/patch-ad    Thu Feb 11 19:30:01 2010 +0000
+++ b/mail/jchkmail/patches/patch-ad    Thu Feb 11 19:53:03 2010 +0000
@@ -1,13 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2007/09/04 20:40:43 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2010/02/11 19:53:03 joerg Exp $
 
 --- Makefile.in.orig   2003-07-03 11:54:07.000000000 +0000
 +++ Makefile.in
-@@ -449,8 +449,6 @@ install-data-hook:
-       chmod 755 @WORKDIR@ 
-       chown @USER@ @WORKDIR@ 
-       chgrp @GROUP@ @WORKDIR@ 
--      cp bin/jchkmail.init @RCDIR@/@RCSCRIPT@
--      chmod 755 @RCDIR@/@RCSCRIPT@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+@@ -398,7 +398,6 @@ info-am:
+ 
+ install-data-am:
+       @$(NORMAL_INSTALL)
+-      $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-exec-am:
+ 
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/dvdview/Makefile
--- a/multimedia/dvdview/Makefile       Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/dvdview/Makefile       Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/11 19:55:00 joerg Exp $
 
 DISTNAME=      dvdview-1.2.2
 PKGREVISION=   6
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://rachmaninoff.informatik.uni-mannheim.de/dvdview/
 COMMENT=       Software only MPEG-1/2 video decoder
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= YES
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake
@@ -21,9 +23,10 @@
 MAKE_ENV+=     RTLIB=
 .endif
 
+INSTALLATION_DIRS+=    share/doc/dvdview
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dvdview
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdview
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dvdview
 
 .include "../../graphics/libvideogfx/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/flashplayer/Makefile
--- a/multimedia/flashplayer/Makefile   Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/flashplayer/Makefile   Thu Feb 11 19:53:03 2010 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/11 20:01:50 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../multimedia/libflash/Makefile.common"
 
 PKGNAME=       ${DISTNAME:C/-/player-/}
@@ -18,6 +20,8 @@
 MAKE_ENV+=     LIBSTDCPP=
 .endif
 
+INSTALLATION_DIRS+=    bin
+
 .include "../../multimedia/libflash/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/goggles/Makefile
--- a/multimedia/goggles/Makefile       Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/goggles/Makefile       Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/11 20:12:35 joerg Exp $
 #
 
 DISTNAME=              goggles-0.9.1
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.fifthplanet.net/goggles.html
 COMMENT=               Easy to use frontend for Ogle DVD Player
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES+=                c c++ # c for configure script
 USE_TOOLS+=            gmake bash:run
 
@@ -23,7 +25,7 @@
                --use-config=build/config.generic
 
 do-install:
-       cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} install
+       cd ${WRKSRC} && ${MAKE_ENV} ./gb --package-root=${DESTDIR}${PREFIX} --prefix=${PREFIX} install
 
 .include "../../x11/fox/buildlink3.mk"
 .include "../../multimedia/ogle/buildlink3.mk"
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/libflash/Makefile
--- a/multimedia/libflash/Makefile      Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/libflash/Makefile      Thu Feb 11 19:53:03 2010 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/11 20:01:50 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "Makefile.common"
 
 PKGNAME=       lib${DISTNAME}
@@ -12,6 +14,8 @@
 MAKE_ENV+=     LIBOSSAUDIO=${LIBOSSAUDIO:Q}
 MAKE_ENV+=     LIBSTDCPP=-lstdc++
 
+INSTALLATION_DIRS+=    lib
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/libflash/distinfo
--- a/multimedia/libflash/distinfo      Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/libflash/distinfo      Thu Feb 11 19:53:03 2010 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.5 2006/06/30 21:57:45 tron Exp $
+$NetBSD: distinfo,v 1.6 2010/02/11 20:01:50 joerg Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1
 Size (flash-0.4.10.tgz) = 358995 bytes
 SHA1 (patch-aa) = 0cda07497c07a3a6e4bc13ae099812bab4bc0424
-SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d
+SHA1 (patch-ab) = 12a90daa82e54fc84c4e2033e09a531615c03e08
 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8
 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2
 SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c
-SHA1 (patch-af) = 7e6ab6312cf2d6a9e36abde8d5d94d627fcd9231
+SHA1 (patch-af) = 13dfbc92feada48a0062ff15577b625082dbf6e0
 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637
 SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9
 SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/libflash/patches/patch-ab
--- a/multimedia/libflash/patches/patch-ab      Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/libflash/patches/patch-ab      Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/11 20:01:50 joerg Exp $
 
 --- Lib/Makefile.orig  Sun Jun  4 02:49:23 2000
 +++ Lib/Makefile
@@ -21,10 +21,10 @@
 +all: libflash.la
 +
 +install: libflash.la
-+      ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib
-+      ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${DESTDIR}${PREFIX}/lib
++      ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/flash
 +      for file in ${INCLUDES}; do \
-+              ${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \
++              ${BSD_INSTALL_DATA} $$file ${DESTDIR}${PREFIX}/include/flash; \
 +      done
 +
 +libflash.la: $(SWFOBJS)
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/libflash/patches/patch-af
--- a/multimedia/libflash/patches/patch-af      Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/libflash/patches/patch-af      Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $
+$NetBSD: patch-af,v 1.4 2010/02/11 20:01:50 joerg Exp $
 
 --- Player/Makefile.orig       2000-06-07 19:19:50.000000000 +0100
 +++ Player/Makefile    2006-06-30 22:53:51.000000000 +0100
@@ -19,7 +19,7 @@
 -clean:
 -      rm -f *~ *.o swfplayer core gmon.out
 +install: swfplayer
-+      ${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin
++      ${BSD_INSTALL_PROGRAM} swfplayer ${DESTDIR}${PREFIX}/bin
  
 +swfplayer: main.o
 +      $(CXX) $(LDFLAGS) -o $@ main.o $(LIBS)
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/mpeg-lib/Makefile
--- a/multimedia/mpeg-lib/Makefile      Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/mpeg-lib/Makefile      Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 21:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/11 20:04:28 joerg Exp $
 #
 
 DISTNAME=      mpeg_lib-1.3.1
@@ -13,6 +13,8 @@
 HOMEPAGE=      http://www.gerg.ca/software/mpeglib/
 COMMENT=       Library for decoding MPEG movies
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
 
@@ -21,4 +23,10 @@
 CONFIGURE_ENV+=        OPTIMIZE=${CFLAGS:M*:Q} EXTRA_LDFLAGS=${LDFLAGS:M*:Q}   \
                EXTRA_CPPFLAGS=${CPPFLAGS:M*:Q}
 
+INSTALLATION_DIRS+=    include lib
+
+do-install:
+       ${INSTALL_DATA} ${WRKSRC}/mpeg.h ${DESTDIR}${PREFIX}/include
+       libtool --mode=install ${INSTALL_LIB} ${WRKSRC}/libmpeg_lib.la ${DESTDIR}${PREFIX}/lib
+
 .include "../../mk/bsd.pkg.mk"
diff -r 968b00605fa5 -r 810bc2fab0c2 multimedia/openquicktime/Makefile
--- a/multimedia/openquicktime/Makefile Thu Feb 11 19:30:01 2010 +0000
+++ b/multimedia/openquicktime/Makefile Thu Feb 11 19:53:03 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/11 20:08:00 joerg Exp $
 #
 
 DISTNAME=              ${PKGNAME_NOREV}-src
@@ -12,6 +12,8 @@
 HOMEPAGE=              http://www.openquicktime.org/
 COMMENT=               Portable library for handling QuickTime(TM) media files
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
@@ -27,6 +29,9 @@
 USE_TOOLS+=            gsed
 .endif
 
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
+INSTALLATION_DIRS+=    bin lib
+
 pre-configure:
        ${ECHO} '#!${SH}' > ${BUILDLINK_DIR}/bin/glib-config-2.0
        ${ECHO} '${PREFIX}/bin/pkg-config glib-2.0 "$$@"'               \
Prev by Date: [pkgsrc/trunk]: pkgsrc/misc DESTDIR support
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/python26 Because we unconditionally try to build ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/misc DESTDIR support
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/python26 Because we unconditionally try to build ...
Indexes:
Home | Main Index | Thread Index | Old Index