pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2fed54d73614
branches:  trunk
changeset: 554580:2fed54d73614
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 16 13:59:42 2009 +0000

description:
DESTDIR support.

diffstat:

 net/ppp-lzs/Makefile    |  17 +++++++----------
 textproc/ezxml/Makefile |  10 ++++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diffs (71 lines):

diff -r 657f23ffc12c -r 2fed54d73614 net/ppp-lzs/Makefile
--- a/net/ppp-lzs/Makefile      Mon Feb 16 13:53:45 2009 +0000
+++ b/net/ppp-lzs/Makefile      Mon Feb 16 13:59:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/02/16 13:59:42 joerg Exp $
 
 DISTNAME=      ppp-lzs-1.2
 CATEGORIES=    net
@@ -8,7 +8,7 @@
 HOMEPAGE=      http://homepages.rya-online.net/plunky/lzs.html
 COMMENT=       PPP daemon and LKM with Stac LZS decompression
 
-BROKEN_IN=     pkgsrc-2005Q4 pkgsrc-2006Q1 pkgsrc-2006Q4
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS+=            ppp-* ppp-mppe-*
 ONLY_FOR_PLATFORM=     NetBSD-*-*
@@ -51,17 +51,14 @@
            ${FALSE};                                                   \
        fi
 
-pre-install:
-.if !exists(${PREFIX}/lkm)
-       ${INSTALL_PROGRAM_DIR} ${PREFIX}/lkm
-.endif
+INSTALLATION_DIRS=     lkm sbin ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
 
 do-install:
        ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555 \
-               ${WRKSRC}/pppd/pppd ${PREFIX}/sbin/pppd
-       ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.cat8 ${PREFIX}/${PKGMANDIR}/cat8/pppd.0
-       ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.8 ${PREFIX}/${PKGMANDIR}/man8/pppd.8
+               ${WRKSRC}/pppd/pppd ${DESTDIR}${PREFIX}/sbin/pppd
+       ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.cat8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat8/pppd.0
+       ${INSTALL_MAN} ${WRKSRC}/pppd/pppd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/pppd.8
        ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-               ${WRKSRC}/lkm/lzs.o ${PREFIX}/lkm/lzs.o
+               ${WRKSRC}/lkm/lzs.o ${DESTDIR}${PREFIX}/lkm/lzs.o
 
 .include "../../mk/bsd.pkg.mk"
diff -r 657f23ffc12c -r 2fed54d73614 textproc/ezxml/Makefile
--- a/textproc/ezxml/Makefile   Mon Feb 16 13:53:45 2009 +0000
+++ b/textproc/ezxml/Makefile   Mon Feb 16 13:59:42 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/12/02 11:42:19 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/16 14:06:22 joerg Exp $
 
 DISTNAME=      ezxml-0.8.5
 CATEGORIES=    textproc devel
@@ -8,6 +8,8 @@
 HOMEPAGE=      http://ezxml.sourceforge.net/
 COMMENT=       Easy to use C library for parsing XML documents
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                ${WRKDIR}/ezxml
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
@@ -15,8 +17,8 @@
 INSTALLATION_DIRS+=    lib include share/doc/ezxml
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/libezxml.a ${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/ezxml.h ${PREFIX}/include
-       ${INSTALL_DATA} ${WRKSRC}/ezxml.txt ${PREFIX}/share/doc/ezxml
+       ${INSTALL_DATA} ${WRKSRC}/libezxml.a ${DESTDIR}${PREFIX}/lib
+       ${INSTALL_DATA} ${WRKSRC}/ezxml.h ${DESTDIR}${PREFIX}/include
+       ${INSTALL_DATA} ${WRKSRC}/ezxml.txt ${DESTDIR}${PREFIX}/share/doc/ezxml
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index