pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11 user-destdir support



details:   https://anonhg.NetBSD.org/pkgsrc/rev/12d8034b92d1
branches:  trunk
changeset: 395196:12d8034b92d1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 18:10:38 2009 +0000

description:
user-destdir support

diffstat:

 x11/numlockx/Makefile |   9 ++++++---
 x11/qt3-docs/Makefile |  26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diffs (81 lines):

diff -r f5677cd8f83e -r 12d8034b92d1 x11/numlockx/Makefile
--- a/x11/numlockx/Makefile     Tue Jul 07 18:10:37 2009 +0000
+++ b/x11/numlockx/Makefile     Tue Jul 07 18:10:38 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/20 01:04:27 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 18:10:38 joerg Exp $
 #
 
 DISTNAME=              numlockx-1.1
@@ -10,11 +10,14 @@
 HOMEPAGE=              http://ktown.kde.org/~seli/numlockx/
 COMMENT=               Allows you to start X with numlock turned on
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 
+INSTALLATION_DIRS=     share/doc/numlockx
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/numlockx
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/numlockx
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/numlockx
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r f5677cd8f83e -r 12d8034b92d1 x11/qt3-docs/Makefile
--- a/x11/qt3-docs/Makefile     Tue Jul 07 18:10:37 2009 +0000
+++ b/x11/qt3-docs/Makefile     Tue Jul 07 18:10:38 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2006/10/23 14:54:11 adam Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/07 18:10:58 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../x11/qt3-libs/Makefile.common"
 
@@ -10,33 +12,31 @@
 NO_CONFIGURE=  yes
 NO_BUILD=      yes
 
+INSTALLATION_DIRS=     ${QTPREFIX}/doc/html ${QTPREFIX}/man/man3
+
 do-install:
-       ${INSTALL_DATA_DIR} ${QTPREFIX}/doc
-       ${INSTALL_DATA_DIR} ${QTPREFIX}/man
-       ${INSTALL_MAN_DIR}  ${QTPREFIX}/man/man3
        @cd ${WRKSRC}/doc/man/man3; PAGES="`ls -1 | ${SED} -e 's,3qt$$,3,'`"; \
        (for PAGE in $$PAGES; do \
-           ${ECHO} installing ${QTPREFIX}/man/man3/$${PAGE}; \
+           ${ECHO} installing ${DESTDIR}${QTPREFIX}/man/man3/$${PAGE}; \
            set - X `head -1 $${PAGE}qt`; \
            if [ $$# -eq 3 ] && [ "$$2" = .so ]; then \
                ${LN} -fs `basename $$3 | ${SED} s/qt$$//` \
-                 ${QTPREFIX}/man/man3/$${PAGE}; \
+                 ${DESTDIR}${QTPREFIX}/man/man3/$${PAGE}; \
            else \
-               ${INSTALL_MAN} $${PAGE}qt ${QTPREFIX}/man/man3/$${PAGE}; \
+               ${INSTALL_MAN} $${PAGE}qt ${DESTDIR}${QTPREFIX}/man/man3/$${PAGE}; \
            fi; \
         done)
-       ${INSTALL_DATA_DIR} ${QTPREFIX}/doc/html
-       ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-QT.TXT ${QTPREFIX}/doc/html
+       ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/README-QT.TXT ${DESTDIR}${QTPREFIX}/doc/html
        cd ${WRKSRC};  \
        DOCDIRS="`${FIND} doc/html -type d -print | ${SORT}`"; \
        (for d in $${DOCDIRS}; do \
-           ${ECHO} installing ${QTPREFIX}/$${d}; \
-           ${INSTALL_DATA_DIR} ${QTPREFIX}/$${d}; \
+           ${ECHO} installing ${DESTDIR}${QTPREFIX}/$${d}; \
+           ${INSTALL_DATA_DIR} ${DESTDIR}${QTPREFIX}/$${d}; \
        done) ; \
        DOCFILES="`${FIND} doc/html -type f -print | ${SORT}`"; \
        (for f in $${DOCFILES}; do \
-           ${ECHO} installing ${QTPREFIX}/$${f}; \
-           ${INSTALL_DATA} $${f} ${QTPREFIX}/$${f}; \
+           ${ECHO} installing ${DESTDIR}${QTPREFIX}/$${f}; \
+           ${INSTALL_DATA} $${f} ${DESTDIR}${QTPREFIX}/$${f}; \
        done)
 
 .include "../../x11/qt3-libs/buildlink3.mk"



Home | Main Index | Thread Index | Old Index