diff options
| author | wiz <wiz@pkgsrc.org> | 2009-02-16 13:11:40 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-02-16 13:11:40 +0000 |
| commit | 891359da3a785bfeecc396a774ad6a633d5b954c (patch) | |
| tree | c74918525ead3a9fdcbdc2d913874e29ea799b91 | |
| parent | a57017c92dd7fa137e2839bf9a7e91a884188fa4 (diff) | |
| download | pkgsrc-891359da3a785bfeecc396a774ad6a633d5b954c.tar.gz | |
Convert to user-destdir.
| -rw-r--r-- | net/mldonkey-gui/Makefile | 16 | ||||
| -rw-r--r-- | net/mldonkey/Makefile | 7 | ||||
| -rw-r--r-- | net/mldonkey/Makefile.common | 6 |
3 files changed, 18 insertions, 11 deletions
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile index ec937d7f127..264b1084537 100644 --- a/net/mldonkey-gui/Makefile +++ b/net/mldonkey-gui/Makefile @@ -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 @@ INSTALLATION_DIRS= bin .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 --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile index 6b1d3d3c722..a309d540d6e 100644 --- a/net/mldonkey/Makefile +++ b/net/mldonkey/Makefile @@ -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 @@ PKG_USERS_VARS+= MLDONKEY_USER 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_HOME=${MLDONKEY_HOME:Q} 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 --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common index 010fce43eec..4716f1f30ac 100644 --- a/net/mldonkey/Makefile.common +++ b/net/mldonkey/Makefile.common @@ -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 @@ GNU_CONFIGURE= yes 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 |