Update to 4.1.2

PR:		203034
Submitted by:	yuri@rawbw.com (maintainer)
MFH:		2015Q3
Security:	Fixes 57325ecf-facc-11e4-968f-b888e347c638
This commit is contained in:
Carlo Strub 2015-09-18 21:03:25 +00:00
parent bf65c25262
commit e65770e262
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=397295
5 changed files with 5 additions and 45 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lightzone
DISTVERSION= 4.1.1
PORTREVISION= 1
DISTVERSION= 4.1.2
CATEGORIES= graphics java
DIST_SUBDIR= ${PORTNAME}

View file

@ -1,2 +1,2 @@
SHA256 (lightzone/ktgw0316-LightZone-4.1.1_GH0.tar.gz) = 30ba265ceb101cc89a12c44849cadfffa0458445c92d20678904c4fbced3be3d
SIZE (lightzone/ktgw0316-LightZone-4.1.1_GH0.tar.gz) = 26478012
SHA256 (lightzone/ktgw0316-LightZone-4.1.2_GH0.tar.gz) = 46d9a849e500eaa403fd7c8f03220828a9283ec96a45b2d51aa2adff5da5ecce
SIZE (lightzone/ktgw0316-LightZone-4.1.2_GH0.tar.gz) = 23686103

View file

@ -1,15 +1,6 @@
--- products/lightzone.orig 2015-06-02 13:25:15 UTC
--- products/lightzone.orig 2015-08-04 13:37:11 UTC
+++ products/lightzone
@@ -15,19 +15,13 @@ elif [ "${PLATFORM}" = "SunOS" ]; then
totalmem=`expr $totalmem \* 1024`
usrdir=/usr
elif [ "${PLATFORM}" = "FreeBSD" ]; then
- totalmem=`dmesg | grep 'real memory' | sed -r 's/.* ([0-9]+) .*/\1/'`
- totalmem=`expr $totalmem / 1024`
- usrdir=/usr/local
+ totalmem=`sysctl -n hw.physmem`
+ totalmem=$(($totalmem / 1024))
+ usrdir=%%LOCALBASE%%
@@ -21,13 +21,7 @@ elif [ "${PLATFORM}" = "FreeBSD" ]; then
fi
pkgjavadir=${usrdir}/share/java/lightzone

View file

@ -1,29 +0,0 @@
--- src/com/lightcrafts/platform/linux/TestSSE2.java.orig 2015-06-02 13:25:15 UTC
+++ src/com/lightcrafts/platform/linux/TestSSE2.java
@@ -29,6 +29,8 @@ class TestSSE2 {
regex = "^flags\t\t:.*sse2";
} else if (osname.indexOf("SunOS") >= 0) {
regex = "^\t.*sse2";
+ } else if (osname.indexOf("FreeBSD") >= 0) {
+ regex = "^hw.instruction_sse: 1";
} else {
regex = "^ Features=.*SSE2";
}
@@ -42,6 +44,8 @@ class TestSSE2 {
cmd = new String[] {"cat", "/proc/cpuinfo"};
} else if (osname.indexOf("SunOS") >= 0) {
cmd = new String[] {"sh", "-c", "isainfo -nv ; psrinfo -pv"};
+ } else if (osname.indexOf("FreeBSD") >= 0) {
+ cmd = new String[] {"/sbin/sysctl", "hw"};
} else {
cmd = new String[] {"dmesg"};
}
@@ -68,6 +72,8 @@ class TestSSE2 {
regex = getCpuInfoLine("^model name\t: ");
} else if (osname.indexOf("SunOS") >= 0) {
regex = getCpuInfoLine("^\t");
+ } else if (osname.indexOf("FreeBSD") >= 0) {
+ regex = getCpuInfoLine("^hw.model: ");
} else {
regex = getCpuInfoLine("^CPU: ");
}

View file

@ -14,7 +14,6 @@ bin/lightzone
%%LIBDIR%%/libLinux.so
%%LIBDIR%%/libSegment.so
%%LIBDIR%%/libfbf.so
%%LIBDIR%%/libmlib_jai.so
share/applications/lightzone.desktop
share/icons/hicolor/128x128/apps/lightzone.png
share/icons/hicolor/16x16/apps/lightzone.png