pkgsrc-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/275b0bb36f22
branches:  trunk
changeset: 395224:275b0bb36f22
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 18:46:17 2009 +0000

description:
user-destdir support

diffstat:

 www/urlget/Makefile |   8 ++++++--
 www/viewvc/Makefile |  13 ++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diffs (68 lines):

diff -r 6554410b98cf -r 275b0bb36f22 www/urlget/Makefile
--- a/www/urlget/Makefile       Tue Jul 07 18:44:28 2009 +0000
+++ b/www/urlget/Makefile       Tue Jul 07 18:46:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/07 18:46:17 joerg Exp $
 #
 
 DISTNAME=              urlget-1.4
@@ -8,6 +8,7 @@
 MAINTAINER=            kim%tac.nyc.ny.us@localhost
 COMMENT=               Simple command-line tool to retrieve an HTTP URL
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -16,6 +17,9 @@
 .else
 BUILD_TARGET=          bsd
 .endif
-INSTALL_TARGET=                inst-all DEST=${PREFIX}
+INSTALL_TARGET=                inst-all
+INSTALL_MAKE_FLAGS+=   DEST=${DESTDIR}${PREFIX}
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6554410b98cf -r 275b0bb36f22 www/viewvc/Makefile
--- a/www/viewvc/Makefile       Tue Jul 07 18:44:28 2009 +0000
+++ b/www/viewvc/Makefile       Tue Jul 07 18:46:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/02/09 22:56:28 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/07 18:46:37 joerg Exp $
 #
 
 DISTNAME=      viewvc-1.0.7
@@ -10,6 +10,8 @@
 HOMEPAGE=      http://www.viewvc.org/
 COMMENT=       Viewing the content of CVS/SVN repositories with a Webbrowser
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 PYTHON_PATCH_SCRIPTS=  viewvc-install bin/* bin/cgi/*.cgi lib/*.py
 
 .if !exists(/usr/bin/rlog)
@@ -47,16 +49,17 @@
 
 CHECK_PORTABILITY_SKIP=        tools/make-release
 
+INSTALLATION_DIRS=     share/examples/viewvc
+
 do-install:
        (cd ${WRKSRC} && \
                ${PYTHONBIN} \
-               viewvc-install --prefix=${PREFIX}/${VIEWVCDIR} --destdir="")
+               viewvc-install --prefix=${PREFIX}/${VIEWVCDIR} --destdir=${DESTDIR})
 
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/viewvc
        ${INSTALL_DATA} ${WRKSRC}/viewvc.conf.dist \
-               ${PREFIX}/share/examples/viewvc/viewvc.conf
+               ${DESTDIR}${PREFIX}/share/examples/viewvc/viewvc.conf
        ${INSTALL_DATA} ${WRKSRC}/cvsgraph.conf.dist \
-               ${PREFIX}/share/examples/viewvc/cvsgraph.conf
+               ${DESTDIR}${PREFIX}/share/examples/viewvc/cvsgraph.conf
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index