diff options
Diffstat (limited to 'lang/mpd')
| -rw-r--r-- | lang/mpd/Makefile | 16 | ||||
| -rw-r--r-- | lang/mpd/distinfo | 5 | ||||
| -rw-r--r-- | lang/mpd/patches/patch-as | 11 | ||||
| -rw-r--r-- | lang/mpd/patches/patch-bm | 17 |
4 files changed, 40 insertions, 9 deletions
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index 7f3b4865fe1..e4f70ef716f 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2009/06/30 00:07:18 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2010/03/03 13:31:53 is Exp $ # DISTNAME= mpd.1.0.1 @@ -15,6 +15,8 @@ COMMENT= The MPD language compiler and run time system MAKE_JOBS_SAFE= no +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS+= musicpd-[0-9]* ONLY_FOR_PLATFORM= NetBSD-[2-9]*-* @@ -22,6 +24,8 @@ ONLY_FOR_PLATFORM= NetBSD-[2-9]*-* TEST_TARGET= verify +DP= ${DESTDIR}${PREFIX} + SUBST_CLASSES+= mpd SUBST_STAGE.mpd= pre-configure SUBST_MESSAGE.mpd= Filling out path templates. @@ -35,11 +39,11 @@ INSTALLATION_DIRS= bin lib/mpd ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 \ ${PKGMANDIR}/man5 share/doc/mpd post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${PREFIX}/bin/mpd-cstest - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mpd - ${INSTALL_DATA} ${WRKSRC}/doc/cairn.jpg ${PREFIX}/share/doc/mpd - ${INSTALL_DATA} ${WRKSRC}/doc/install.html ${PREFIX}/share/doc/mpd - ${INSTALL_DATA} ${WRKSRC}/doc/release.html ${PREFIX}/share/doc/mpd + ${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${DP}/bin/mpd-cstest + ${INSTALL_DATA} ${WRKSRC}/README ${DP}/share/doc/mpd + ${INSTALL_DATA} ${WRKSRC}/doc/cairn.jpg ${DP}/share/doc/mpd + ${INSTALL_DATA} ${WRKSRC}/doc/install.html ${DP}/share/doc/mpd + ${INSTALL_DATA} ${WRKSRC}/doc/release.html ${DP}/share/doc/mpd .include "../..//x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mpd/distinfo b/lang/mpd/distinfo index d5eaa173cff..21294f6f96d 100644 --- a/lang/mpd/distinfo +++ b/lang/mpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/05/18 12:54:50 is Exp $ +$NetBSD: distinfo,v 1.7 2010/03/03 13:31:53 is Exp $ SHA1 (mpd-language/mpd.1.0.1.tgz) = 797b505935ccc741fdca6010bc0bd53601a6f262 RMD160 (mpd-language/mpd.1.0.1.tgz) = 2862ae9220ec0a546ed4193aeee4dc8dc94610a2 @@ -6,7 +6,7 @@ Size (mpd-language/mpd.1.0.1.tgz) = 581498 bytes SHA1 (patch-aa) = f3c3911afa2596e72d8e3056f93e5277cd41dabc SHA1 (patch-ab) = 2a086280fefb4acddd19cb3cbafd58f8de5b309e SHA1 (patch-ar) = 7b9c76e47a5f5900a2bfd6b9bb4b585dc10da562 -SHA1 (patch-as) = 4a7701f337f64ca4f0e68377ca6f32e5110a5ff0 +SHA1 (patch-as) = 510df56b50ee7c0ab1c64a24e6c9f97317541d3c SHA1 (patch-at) = 6f7be8ba344a1606663f7dfeefa73edd62380721 SHA1 (patch-au) = f694bd75154de25247e9609dc954c9319ab32089 SHA1 (patch-av) = b10aa333ecf77e29933256117a9c4d27792993bd @@ -26,3 +26,4 @@ SHA1 (patch-bi) = 31fc9eb664dd3e73c7fe12ae6e95fd85b67286fc SHA1 (patch-bj) = c5123801140fbfdcbfdabbcd39fe70d2e71355fc SHA1 (patch-bk) = ffbcc49346ea57a3fd0eed51d7bb00f80e25f3a5 SHA1 (patch-bl) = 4739bac6eafea8946394b403081ab3e6612ab39d +SHA1 (patch-bm) = 7e089cf0c69d758f3bcc12b93217554bd26da08c diff --git a/lang/mpd/patches/patch-as b/lang/mpd/patches/patch-as index fe83857e612..ba97f43987b 100644 --- a/lang/mpd/patches/patch-as +++ b/lang/mpd/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.1.1.1 2005/10/17 16:16:48 is Exp $ +$NetBSD: patch-as,v 1.2 2010/03/03 13:31:53 is Exp $ --- Makefile.orig 2001-02-06 19:30:37.000000000 +0100 +++ Makefile @@ -11,6 +11,15 @@ $NetBSD: patch-as,v 1.1.1.1 2005/10/17 16:16:48 is Exp $ MAKE = make SHELL = /bin/sh +@@ -34,7 +34,7 @@ all: config + + ## Install everything. + +-install: paths.sh ; sh install.sh ++install: paths.sh ; sh install.sh ${DESTDIR} + + + @@ -212,6 +212,9 @@ vscripts: ; @cd vsuite; find * -name Sc diff --git a/lang/mpd/patches/patch-bm b/lang/mpd/patches/patch-bm new file mode 100644 index 00000000000..c7b57ba1b7d --- /dev/null +++ b/lang/mpd/patches/patch-bm @@ -0,0 +1,17 @@ +$NetBSD: patch-bm,v 1.1 2010/03/03 13:31:54 is Exp $ + +--- install.sh.orig 2000-10-31 23:53:40.000000000 +0100 ++++ install.sh +@@ -3,6 +3,12 @@ + # Install MPD. + + . ./paths.sh ++ ++for var in MPDCMD MPDLIB MAN1 MAN3 MAN5; do ++ eval val=\$${var} ++ eval ${var}=$1${val} ++done ++ + if [ -z "$MPDCMD" -o -z "$MPDLIB" ]; then + echo 'cannot install -- MPDCMD or MPDLIB is null' 1>&2 + exit 1 |