[pkgsrc/trunk]: pkgsrc DESTDIR support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4f684ffb956
branches:  trunk
changeset: 554601:b4f684ffb956
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 16 19:03:18 2009 +0000

description:
DESTDIR support

diffstat:

 net/polsms/Makefile         |  23 +++++++++++------------
 net/polsms/distinfo         |   3 ++-
 net/polsms/patches/patch-aa |  14 ++++++++++++++
 sysutils/qlogtools/Makefile |  10 +++++++++-
 textproc/rtfm/Makefile      |   8 +++++---
 www/squidGuard/Makefile     |   4 +++-
 6 files changed, 44 insertions(+), 18 deletions(-)

diffs (146 lines):

diff -r 3ca61820475b -r b4f684ffb956 net/polsms/Makefile
--- a/net/polsms/Makefile       Mon Feb 16 18:44:40 2009 +0000
+++ b/net/polsms/Makefile       Mon Feb 16 19:03:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/01/18 05:08:48 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2009/02/16 19:06:00 joerg Exp $
 #
 
 DISTNAME=      sms-2.0.3
@@ -11,22 +11,21 @@
 HOMEPAGE=      http://www.ceti.pl/~miki/komputery/sms.html
 COMMENT=       Send SMS to cellular phones in Poland (Plus, Idea, Era)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES= c++
 USE_TOOLS+=    gmake
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/sms/contrib share/sms/doc
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/sms ${PREFIX}/bin
-       ${LN} -sf ${PREFIX}/bin/sms ${PREFIX}/bin/smsaddr
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/sms
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/sms/doc
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/sms/contrib
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/sms/doc
-       ${INSTALL_DATA} ${WRKSRC}/README.smsrc ${PREFIX}/share/sms/doc
-       ${INSTALL_DATA} ${WRKSRC}/doc/readme.html ${PREFIX}/share/sms/doc
-       ${INSTALL_DATA} ${WRKSRC}/contrib/mimecut ${PREFIX}/share/sms/contrib
-       ${INSTALL_DATA} ${WRKSRC}/contrib/procmailrc ${PREFIX}/share/sms/contrib
+       ${INSTALL_PROGRAM} ${WRKSRC}/sms ${DESTDIR}${PREFIX}/bin
+       ${LN} -sf sms ${DESTDIR}${PREFIX}/bin/smsaddr
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/sms/doc
+       ${INSTALL_DATA} ${WRKSRC}/README.smsrc ${DESTDIR}${PREFIX}/share/sms/doc
+       ${INSTALL_DATA} ${WRKSRC}/doc/readme.html ${DESTDIR}${PREFIX}/share/sms/doc
+       ${INSTALL_DATA} ${WRKSRC}/contrib/mimecut ${DESTDIR}${PREFIX}/share/sms/contrib
+       ${INSTALL_DATA} ${WRKSRC}/contrib/procmailrc ${DESTDIR}${PREFIX}/share/sms/contrib
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff -r 3ca61820475b -r b4f684ffb956 net/polsms/distinfo
--- a/net/polsms/distinfo       Mon Feb 16 18:44:40 2009 +0000
+++ b/net/polsms/distinfo       Mon Feb 16 19:03:18 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/07/15 16:02:31 zuntum Exp $
+$NetBSD: distinfo,v 1.13 2009/02/16 19:06:00 joerg Exp $
 
 SHA1 (sms-2.0.3.tar.gz) = 7f8bc2591306524e70d205ba47f4cddb18f213c4
 RMD160 (sms-2.0.3.tar.gz) = 20adede9e00fe844141e1dfb6c2e462433c46626
 Size (sms-2.0.3.tar.gz) = 48450 bytes
+SHA1 (patch-aa) = 3742c7ef2bcddab9ab56999973be223541cbae16
diff -r 3ca61820475b -r b4f684ffb956 net/polsms/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/polsms/patches/patch-aa       Mon Feb 16 19:03:18 2009 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.8 2009/02/16 19:06:00 joerg Exp $
+
+--- lib/mr_curl/mr_curl.cc.orig        2009-02-16 20:02:29.000000000 +0100
++++ lib/mr_curl/mr_curl.cc
+@@ -4,6 +4,9 @@
+ 
+ using namespace std;
+ 
++size_t Curl_write_data(const void *ptr, size_t size, size_t nmemb, Curl *curl);
++size_t Curl_write_header(const void *ptr, size_t size, size_t nmemb, Curl *curl);
++
+ void FormParser::SetPage(const std::string &new_html)
+ {
+       action = "";
diff -r 3ca61820475b -r b4f684ffb956 sysutils/qlogtools/Makefile
--- a/sysutils/qlogtools/Makefile       Mon Feb 16 18:44:40 2009 +0000
+++ b/sysutils/qlogtools/Makefile       Mon Feb 16 19:03:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/01/13 18:58:58 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/16 19:03:18 joerg Exp $
 #
 
 DISTNAME=              qlogtools-3.1
@@ -9,11 +9,19 @@
 HOMEPAGE=              http://untroubled.org/qlogtools/
 COMMENT=               Tools useful in analyzing logs from qmail and other pkgs
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DJB_RESTRICTED=                NO
 DJB_MAKE_TARGETS=      NO
 
 SUBST_FILES.djbware+=  qfilelog.c
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
+post-configure:
+       ${ECHO} ${DESTDIR}${DJB_CONFIG_PREFIX}/bin > ${WRKSRC}/conf-bin
+       ${ECHO} ${DESTDIR}${DJB_CONFIG_PREFIX}/${PKGMANDIR} > ${WRKSRC}/conf-man
+
 do-install:
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
        ./installer;                                                    \
diff -r 3ca61820475b -r b4f684ffb956 textproc/rtfm/Makefile
--- a/textproc/rtfm/Makefile    Mon Feb 16 18:44:40 2009 +0000
+++ b/textproc/rtfm/Makefile    Mon Feb 16 19:03:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:14 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2009/02/16 19:07:09 joerg Exp $
 
 DISTNAME=      rtfm-1.0
 CATEGORIES=    textproc
@@ -8,6 +8,8 @@
 MAINTAINER=    zuntum%NetBSD.org@localhost
 COMMENT=       NetBSD documentation and GNU Texinfo files search mechanism
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 post-patch:
@@ -16,7 +18,7 @@
        ${MV} ${WRKSRC}/rtfm.c.done ${WRKSRC}/rtfm.c
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/rtfm ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/rtfm.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/rtfm ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/rtfm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3ca61820475b -r b4f684ffb956 www/squidGuard/Makefile
--- a/www/squidGuard/Makefile   Mon Feb 16 18:44:40 2009 +0000
+++ b/www/squidGuard/Makefile   Mon Feb 16 19:03:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/09/15 17:34:48 taca Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/16 19:06:51 joerg Exp $
 #
 
 DISTNAME=      squidGuard-1.3
@@ -13,6 +13,8 @@
 HOMEPAGE=      http://www.squidguard.org/
 COMMENT=       Ultrafast and free filter, redirector and access controller for Squid
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BDB_ACCEPTED=  db4
 GNU_CONFIGURE= YES
 USE_TOOLS+=    lex yacc perl