diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-07-02 18:28:42 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-07-02 18:28:42 +0000 |
commit | 5ae77fa04e8b2a534db5722170d39585ef55cdf7 (patch) | |
tree | 79c3c1719a65654c867fc2d5dbcc3049ee26690a /net | |
parent | 28629470fa4df343433ebd3cec05b69b15142430 (diff) | |
download | pkgsrc-5ae77fa04e8b2a534db5722170d39585ef55cdf7.tar.gz |
Avoid hardcoding /usr/pkg in patch files.
Diffstat (limited to 'net')
-rw-r--r-- | net/xnap/Makefile | 9 | ||||
-rw-r--r-- | net/xnap/distinfo | 4 | ||||
-rw-r--r-- | net/xnap/patches/patch-aa | 20 |
3 files changed, 20 insertions, 13 deletions
diff --git a/net/xnap/Makefile b/net/xnap/Makefile index c91221e1e07..e651f568c3d 100644 --- a/net/xnap/Makefile +++ b/net/xnap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/12/31 15:44:29 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2003/07/02 18:28:42 jmmv Exp $ # DISTNAME= xnap-2.0 @@ -11,6 +11,13 @@ COMMENT= Java filesharing client with support for OpenNap NO_BUILD= yes +post-extract: + cd ${WRKSRC} && ${MV} xnap.sh xnap.sh.in + +pre-configure: + cd ${WRKSRC} && ${SED} \ + -e 's|@PREFIX@|${PREFIX}|g' < xnap.sh.in > xnap.sh + do-install: ${CP} ${WRKSRC}/xnap.sh ${PREFIX}/bin/xnap ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/xnap diff --git a/net/xnap/distinfo b/net/xnap/distinfo index 3988e607272..1bc39a1d99d 100644 --- a/net/xnap/distinfo +++ b/net/xnap/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2002/06/19 09:06:54 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/07/02 18:28:42 jmmv Exp $ SHA1 (xnap-2.0.tar.gz) = e4b5a8eeb28d0f777029c57de4f9372601d734f6 Size (xnap-2.0.tar.gz) = 773640 bytes -SHA1 (patch-aa) = 8b9edd3868ea5c1a888726b65c44af0bcf3f42c9 +SHA1 (patch-aa) = bd1db64bbed7e02d3af8c9ad8598660b3e333588 diff --git a/net/xnap/patches/patch-aa b/net/xnap/patches/patch-aa index 3a043cded19..1245b834353 100644 --- a/net/xnap/patches/patch-aa +++ b/net/xnap/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/04/28 22:15:14 hubertf Exp $ +$NetBSD: patch-aa,v 1.2 2003/07/02 18:28:43 jmmv Exp $ ---- xnap.sh.orig Sun Dec 23 07:36:23 2001 -+++ xnap.sh -@@ -10,6 +10,8 @@ +--- xnap.sh.in.orig 2002-03-09 01:22:14.000000000 +0100 ++++ xnap.sh.in +@@ -6,6 +6,8 @@ if [ -f "${APP}" ]; then + APPHOME="." + elif [ -f "`dirname "$0"`/${APP}" ]; then + APPHOME="`dirname "$0"`" ++elif [ "`dirname $0`" = "@PREFIX@/bin" ]; then ++ APPHOME="@PREFIX@/share/xnap/" + elif [ "`dirname $0`" = "/usr/local/bin" ]; then APPHOME="/usr/local/share/xnap/" elif [ "`dirname $0`" = "/usr/bin" ]; then - APPHOME="/usr/share/java" -+elif [ "`dirname $0`" = "/usr/pkg/bin" ]; then -+ APPHOME="/usr/pkg/share/xnap/" - else - echo "xnap.jar could not be found" - exit 1 |