Attachment #160918 for bug #203034

View | Details | Raw Unified | Return to bug 203034
Collapse All | Expand All

Lines 2-9 Link Here

(-)graphics/lightzone.new/Makefile (-2 / +1 lines)
2	# $FreeBSD: head/graphics/lightzone/Makefile 390585 2015-06-25 16:49:13Z antoine $	2	# $FreeBSD: head/graphics/lightzone/Makefile 390585 2015-06-25 16:49:13Z antoine $
3		3
4	PORTNAME= lightzone	4	PORTNAME= lightzone
5	DISTVERSION= 4.1.1	5	DISTVERSION= 4.1.2
6	PORTREVISION= 1
7	CATEGORIES= graphics java	6	CATEGORIES= graphics java
8	DIST_SUBDIR= ${PORTNAME}	7	DIST_SUBDIR= ${PORTNAME}
9		8

Lines 1-2 Link Here

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




--- products/lightzone.orig	2015-08-04 13:37:11 UTC
+++ products/lightzone
@@ -21,13 +21,7 @@ elif [ "${PLATFORM}" = "FreeBSD" ]; 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%%
 fi
 
 pkgjavadir=${usrdir}/share/java/lightzone




--- 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: ");
         }

Lines 14-20 Link Here

(-)graphics/lightzone.new/pkg-plist (-1 lines)
14	%%LIBDIR%%/libLinux.so	14	%%LIBDIR%%/libLinux.so
15	%%LIBDIR%%/libSegment.so	15	%%LIBDIR%%/libSegment.so
16	%%LIBDIR%%/libfbf.so	16	%%LIBDIR%%/libfbf.so
17	%%LIBDIR%%/libmlib_jai.so
18	share/applications/lightzone.desktop	17	share/applications/lightzone.desktop
19	share/icons/hicolor/128x128/apps/lightzone.png	18	share/icons/hicolor/128x128/apps/lightzone.png
20	share/icons/hicolor/16x16/apps/lightzone.png	19	share/icons/hicolor/16x16/apps/lightzone.png

Return to bug 203034

Lines 1-15 Link Here

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

Lines 1-29 Link Here

(-)graphics/lightzone.new/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java (-29 lines)
1	--- src/com/lightcrafts/platform/linux/TestSSE2.java.orig 2015-06-02 13:25:15 UTC
2	+++ src/com/lightcrafts/platform/linux/TestSSE2.java
3	@@ -29,6 +29,8 @@ class TestSSE2 {
4	regex = "^flags\t\t:.*sse2";
5	} else if (osname.indexOf("SunOS") >= 0) {
6	regex = "^\t.*sse2";
7	+ } else if (osname.indexOf("FreeBSD") >= 0) {
8	+ regex = "^hw.instruction_sse: 1";
9	} else {
10	regex = "^ Features=.*SSE2";
11	}
12	@@ -42,6 +44,8 @@ class TestSSE2 {
13	cmd = new String[] {"cat", "/proc/cpuinfo"};
14	} else if (osname.indexOf("SunOS") >= 0) {
15	cmd = new String[] {"sh", "-c", "isainfo -nv ; psrinfo -pv"};
16	+ } else if (osname.indexOf("FreeBSD") >= 0) {
17	+ cmd = new String[] {"/sbin/sysctl", "hw"};
18	} else {
19	cmd = new String[] {"dmesg"};
20	}
21	@@ -68,6 +72,8 @@ class TestSSE2 {
22	regex = getCpuInfoLine("^model name\t: ");
23	} else if (osname.indexOf("SunOS") >= 0) {
24	regex = getCpuInfoLine("^\t");
25	+ } else if (osname.indexOf("FreeBSD") >= 0) {
26	+ regex = getCpuInfoLine("^hw.model: ");
27	} else {
28	regex = getCpuInfoLine("^CPU: ");
29	}