diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-01-01 20:06:34 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-01-01 20:06:34 +0000 |
| commit | 34801ba260ba0b7e9e704ba751f84dacc51d8304 (patch) | |
| tree | 95f5f2e33f2b3a8a334d73e2dafa76ef457a9447 /net | |
| parent | 22c3e707d8dabb16850e7dacef936a10a6fecfe4 (diff) | |
| download | pkgsrc-34801ba260ba0b7e9e704ba751f84dacc51d8304.tar.gz | |
* Convert to use SUBST framework.
* Remove dependency to x11/swing.
* Drop lang/kaffe support, because x11/swing had been removed.
* Bump PKGREVISION.
Diffstat (limited to 'net')
| -rw-r--r-- | net/xnap/Makefile | 24 | ||||
| -rw-r--r-- | net/xnap/distinfo | 4 | ||||
| -rw-r--r-- | net/xnap/patches/patch-aa | 12 |
3 files changed, 22 insertions, 18 deletions
diff --git a/net/xnap/Makefile b/net/xnap/Makefile index f4940c88373..3295dbc1834 100644 --- a/net/xnap/Makefile +++ b/net/xnap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2010/02/15 17:27:16 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2012/01/01 20:06:34 ryoon Exp $ # DISTNAME= xnap-2.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xnap/} @@ -12,16 +12,19 @@ COMMENT= Java filesharing client with support for OpenNap PKG_DESTDIR_SUPPORT= user-destdir +USE_JAVA= run +PKG_JVMS_ACCEPTED= 1.4 + NO_BUILD= yes INSTALLATION_DIRS= bin share/xnap share/doc/xnap -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 +SUBST_CLASSES+= path +SUBST_STAGE.path= pre-configure +SUBST_MESSAGE.path= fixing java path +SUBST_FILES.path= xnap.sh +SUBST_SED.path= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME}/,g' +SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' do-install: ${INSTALL_SCRIPT} ${WRKSRC}/xnap.sh ${DESTDIR}${PREFIX}/bin/xnap @@ -29,9 +32,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xnap .include "../../mk/java-vm.mk" - -.if ${PKG_JVM} == "jdk" || ${PKG_JVM} == "kaffe" -DEPENDS+= swing-[0-9]*:../../x11/swing -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/net/xnap/distinfo b/net/xnap/distinfo index 00d457c5d70..29bf91efa12 100644 --- a/net/xnap/distinfo +++ b/net/xnap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 12:14:07 agc Exp $ +$NetBSD: distinfo,v 1.5 2012/01/01 20:06:34 ryoon Exp $ SHA1 (xnap-2.0.tar.gz) = e4b5a8eeb28d0f777029c57de4f9372601d734f6 RMD160 (xnap-2.0.tar.gz) = b1069cd50ac6d014b63ea5f8e2e523207cf369fb Size (xnap-2.0.tar.gz) = 773640 bytes -SHA1 (patch-aa) = bd1db64bbed7e02d3af8c9ad8598660b3e333588 +SHA1 (patch-aa) = c0e25cec360fc75908fb9734c47d2e0c055b8f9d diff --git a/net/xnap/patches/patch-aa b/net/xnap/patches/patch-aa index 1245b834353..5c4d57bcff3 100644 --- a/net/xnap/patches/patch-aa +++ b/net/xnap/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2003/07/02 18:28:43 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2012/01/01 20:06:34 ryoon Exp $ ---- xnap.sh.in.orig 2002-03-09 01:22:14.000000000 +0100 -+++ xnap.sh.in +--- xnap.sh.orig 2002-03-09 00:22:14.000000000 +0000 ++++ xnap.sh @@ -6,6 +6,8 @@ if [ -f "${APP}" ]; then APPHOME="." elif [ -f "`dirname "$0"`/${APP}" ]; then @@ -11,3 +11,9 @@ $NetBSD: patch-aa,v 1.2 2003/07/02 18:28:43 jmmv Exp $ elif [ "`dirname $0`" = "/usr/local/bin" ]; then APPHOME="/usr/local/share/xnap/" elif [ "`dirname $0`" = "/usr/bin" ]; then +@@ -15,4 +17,4 @@ else + exit 1 + fi + +-java -jar "${APPHOME}/${APP}" $* ++@JAVA_HOME@/bin/java -jar "${APPHOME}/${APP}" $* |