[pkgsrc/trunk]: pkgsrc/net Convert to user-destdir.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/65db92d16e91
branches:  trunk
changeset: 554571:65db92d16e91
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Feb 16 13:11:40 2009 +0000

description:
Convert to user-destdir.

diffstat:

 net/mldonkey-gui/Makefile    |  16 +++++++++-------
 net/mldonkey/Makefile        |   7 ++++---
 net/mldonkey/Makefile.common |   6 +++++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diffs (78 lines):

diff -r c784e85de33a -r 65db92d16e91 net/mldonkey-gui/Makefile
--- a/net/mldonkey-gui/Makefile Mon Feb 16 12:46:00 2009 +0000
+++ b/net/mldonkey-gui/Makefile Mon Feb 16 13:11:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/08/12 17:09:01 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2009/02/16 13:11:41 wiz Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
@@ -18,11 +18,13 @@
 .include "options.mk"
 
 do-install:
-       ${RM} -f ${PREFIX}/bin/mlgui
-       cd ${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
-       ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey
-       ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/libexec/mldonkey
-       ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${PREFIX}/libexec/mldonkey
-       ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${PREFIX}/libexec/mldonkey
+       ${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui
+       cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
+       ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/mldonkey
+       ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${DESTDIR}${PREFIX}/libexec/mldonkey
+       ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter \
+               ${DESTDIR}${PREFIX}/libexec/mldonkey
+       ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui \
+               ${DESTDIR}${PREFIX}/libexec/mldonkey
 
 .include "../../mk/bsd.pkg.mk"
diff -r c784e85de33a -r 65db92d16e91 net/mldonkey/Makefile
--- a/net/mldonkey/Makefile     Mon Feb 16 12:46:00 2009 +0000
+++ b/net/mldonkey/Makefile     Mon Feb 16 13:11:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/07/04 20:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2009/02/16 13:11:40 wiz Exp $
 #
 
 .include "Makefile.common"
@@ -10,6 +10,8 @@
 
 BUILD_DEFS+=           MLDONKEY_HOME VARBASE
 
+INSTALLATION_DIRS=     libexec/mldonkey
+
 OWN_DIRS_PERMS=                ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
 OWN_DIRS_PERMS+=       ${VARBASE}/log/mldonkey \
                        ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
@@ -28,8 +30,7 @@
 FILES_SUBST+=          MLDONKEY_USER=${MLDONKEY_USER:Q}
 
 do-install:
-       ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey
-       ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/libexec/mldonkey
+       ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${DESTDIR}${PREFIX}/libexec/mldonkey
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r c784e85de33a -r 65db92d16e91 net/mldonkey/Makefile.common
--- a/net/mldonkey/Makefile.common      Mon Feb 16 12:46:00 2009 +0000
+++ b/net/mldonkey/Makefile.common      Mon Feb 16 13:11:40 2009 +0000
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.common,v 1.34 2009/01/24 12:59:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.35 2009/02/16 13:11:41 wiz Exp $
 #
+# used by net/mldonkey/Makefile
+# used by net/mldonkey-gui/Makefile
 
 DISTNAME=      mldonkey-2.9.7
 CATEGORIES=    net
@@ -17,6 +19,8 @@
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake perl
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFIGURE_ENV+=                WGET=""
 CONFIGURE_ENV+=                ac_cv_prog_WGET="no"
 CONFIGURE_ARGS+=       --enable-directconnect