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

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca4a19db225a
branches:  trunk
changeset: 561082:ca4a19db225a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jul 07 18:54:07 2009 +0000

description:
user-destdir support

diffstat:

 www/squirm/Makefile    |   8 +++++---
 www/swiftsurf/Makefile |  14 +++++++-------
 www/swill/Makefile     |   6 +++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diffs (94 lines):

diff -r 14b5d479ccec -r ca4a19db225a www/squirm/Makefile
--- a/www/squirm/Makefile       Tue Jul 07 18:53:57 2009 +0000
+++ b/www/squirm/Makefile       Tue Jul 07 18:54:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 11:02:26 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/07 18:55:44 joerg Exp $
 #
 
 DISTNAME=              squirm-1.0betaB
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://squirm.foote.com.au/
 COMMENT=               Redirector for the Squid Internet Object Cache
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 CONFIGURE_DIRS=                regex-0.12
@@ -32,7 +34,7 @@
 CONF_FILES+=           ${EGDIR}/squirm.patterns.dist ${PKG_SYSCONFDIR}/squirm.patterns.dist
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/squirm ${PREFIX}/bin/
-       cd ${WRKSRC} && ${INSTALL_DATA} squirm.local.dist squirm.patterns.dist ${EGDIR}/
+       ${INSTALL_PROGRAM} ${WRKSRC}/squirm ${DESTDIR}${PREFIX}/bin/
+       cd ${WRKSRC} && ${INSTALL_DATA} squirm.local.dist squirm.patterns.dist ${DESTDIR}${EGDIR}/
 
 .include "../../mk/bsd.pkg.mk"
diff -r 14b5d479ccec -r ca4a19db225a www/swiftsurf/Makefile
--- a/www/swiftsurf/Makefile    Tue Jul 07 18:53:57 2009 +0000
+++ b/www/swiftsurf/Makefile    Tue Jul 07 18:54:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/07 18:54:07 joerg Exp $
 
 DISTNAME=              swiftsurf-1.2.5
 PKGREVISION=           3
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://swiftsurf.sourceforge.net/
 COMMENT=               Web proxy that can handle http and https
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            gmake
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
@@ -19,7 +21,7 @@
 SWIFT=         swift
 .endif
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/doc/swiftsurf share/examples/swiftsurf
 
 do-configure:
        for f in ${WRKSRC}/src/conf.ml; do \
@@ -31,11 +33,9 @@
        cd ${WRKSRC}/src && ${GMAKE} ${BUILD_TARGET}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/src/${SWIFT} ${PREFIX}/bin/swiftsurf
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/swiftsurf
-       ${INSTALL_DATA} ${WRKSRC}/swiftsurf.* ${PREFIX}/share/examples/swiftsurf
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/swiftsurf
-       ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/swiftsurf
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/${SWIFT} ${DESTDIR}${PREFIX}/bin/swiftsurf
+       ${INSTALL_DATA} ${WRKSRC}/swiftsurf.* ${DESTDIR}${PREFIX}/share/examples/swiftsurf
+       ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/swiftsurf
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 14b5d479ccec -r ca4a19db225a www/swill/Makefile
--- a/www/swill/Makefile        Tue Jul 07 18:53:57 2009 +0000
+++ b/www/swill/Makefile        Tue Jul 07 18:54:07 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/30 00:07:24 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/07/07 18:55:03 joerg Exp $
 
 DISTNAME=              swill-0.1
 CATEGORIES=            www devel
@@ -8,10 +8,14 @@
 HOMEPAGE=              http://systems.cs.uchicago.edu/swill/
 COMMENT=               The Simple Web Interface Link Library
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/SWILL-0.1
 GNU_CONFIGURE=         yes
 INSTALLATION_DIRS=     include lib
 
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
+
 MAKE_JOBS_SAFE=                no
 
 .include "../../mk/bsd.pkg.mk"