diff options
| author | brooks <brooks@FreeBSD.org> | 2008-06-22 01:38:13 +0800 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2008-06-22 01:38:13 +0800 |
| commit | e92c6543495a9b6520a97aa3b2503aff20340075 (patch) | |
| tree | 707c46a57d04e4452d29e96e87c1679c8bde7158 /audio | |
| parent | 49bc570f77df5cff0bf06fe61f76c24ac4e40a31 (diff) | |
| download | freebsd-ports-gnome-e92c6543495a9b6520a97aa3b2503aff20340075.tar.gz freebsd-ports-gnome-e92c6543495a9b6520a97aa3b2503aff20340075.tar.zst freebsd-ports-gnome-e92c6543495a9b6520a97aa3b2503aff20340075.zip | |
Fix the softsqueeze wrapper script. The path was wrong in general and more
wrong when PREFIX was set to something other than /usr/local.
Also, invoke the Java VM wrapper as java instead of javavm.
Reported by: Tim Bishop <tim at bishnet dot net> (path issue)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/squeezeboxserver/Makefile | 2 | ||||
| -rw-r--r-- | audio/squeezeboxserver/files/softsqueeze.sh.in | 2 | ||||
| -rw-r--r-- | audio/squeezecenter/Makefile | 2 | ||||
| -rw-r--r-- | audio/squeezecenter/files/softsqueeze.sh.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile index acd520a54a3b..e77ab376f6f4 100644 --- a/audio/squeezeboxserver/Makefile +++ b/audio/squeezeboxserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= squeezecenter PORTVERSION= 7.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.slimdevices.com/downloads/SqueezeCenter_v${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-noCPAN diff --git a/audio/squeezeboxserver/files/softsqueeze.sh.in b/audio/squeezeboxserver/files/softsqueeze.sh.in index c33b7161cc82..c83c5564e0df 100644 --- a/audio/squeezeboxserver/files/softsqueeze.sh.in +++ b/audio/squeezeboxserver/files/softsqueeze.sh.in @@ -7,4 +7,4 @@ # will release the JDK under a license that makes dependencies on the # JDK reasionable. # -%%LOCALBASE%%/bin/javavm -jar /usr/local/slimserver/HTML/EN/html/softsqueeze/SoftSqueeze.jar +%%LOCALBASE%%/bin/java -jar %%PREFIX%%/%%SLIMDIR%%/HTML/EN/html/softsqueeze/SoftSqueeze.jar diff --git a/audio/squeezecenter/Makefile b/audio/squeezecenter/Makefile index acd520a54a3b..e77ab376f6f4 100644 --- a/audio/squeezecenter/Makefile +++ b/audio/squeezecenter/Makefile @@ -7,7 +7,7 @@ PORTNAME= squeezecenter PORTVERSION= 7.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.slimdevices.com/downloads/SqueezeCenter_v${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-noCPAN diff --git a/audio/squeezecenter/files/softsqueeze.sh.in b/audio/squeezecenter/files/softsqueeze.sh.in index c33b7161cc82..c83c5564e0df 100644 --- a/audio/squeezecenter/files/softsqueeze.sh.in +++ b/audio/squeezecenter/files/softsqueeze.sh.in @@ -7,4 +7,4 @@ # will release the JDK under a license that makes dependencies on the # JDK reasionable. # -%%LOCALBASE%%/bin/javavm -jar /usr/local/slimserver/HTML/EN/html/softsqueeze/SoftSqueeze.jar +%%LOCALBASE%%/bin/java -jar %%PREFIX%%/%%SLIMDIR%%/HTML/EN/html/softsqueeze/SoftSqueeze.jar |