Attachment #171962 for bug #210677




# $FreeBSD$

PORTNAME=	lightzone
DISTVERSION=	4.1.6
PORTREVISION=	1
CATEGORIES=	graphics java
DIST_SUBDIR=	${PORTNAME}



LIBDIR=		${PREFIX}/lib/${PORTNAME}
PLIST_SUB=	LIBDIR="${LIBDIR}"
WRKSRC_SUBDIR=	linux

post-patch:
	@${REINPLACE_CMD} -e 's|gcc|${CC}|' -e 's|g++|${CXX}|' ${WRKSRC}/../lightcrafts/mk/platform.mk
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/products/lightzone

do-install:
	${INSTALL_SCRIPT} ${WRKSRC}/products/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/

	${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${LIBDIR}
	${INSTALL_DATA} ${WRKSRC}/products/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
	@cd ${WRKSRC} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share/
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${STAGEDIR}${PREFIX}/bin/lightzone

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/lightzone/distinfo (-2 / +3 lines)
1	SHA256 (lightzone/ktgw0316-LightZone-4.1.5_GH0.tar.gz) = 6f8203790070329c67eee89171349d48e332aaa3dfd8f87a55ccc4323bddc2d6	1	TIMESTAMP = 1467237053
2	SIZE (lightzone/ktgw0316-LightZone-4.1.5_GH0.tar.gz) = 24209725	2	SHA256 (lightzone/ktgw0316-LightZone-4.1.6_GH0.tar.gz) = 729fad807d5ff06e341d6c677d542b26353934585fefb7d0b0bebc2669b6a1c6
		3	SIZE (lightzone/ktgw0316-LightZone-4.1.6_GH0.tar.gz) = 25255104




--- products/lightzone.orig	2016-06-28 15:00:11 UTC
+++ products/lightzone
@@ -8,18 +8,9 @@ java -version
 
 arch=`getconf LONG_BIT`
 PLATFORM=`uname`
-if [ "${PLATFORM}" = "Linux" ]; then
-  totalmem=`cat /proc/meminfo | grep 'MemTotal: ' | sed -r 's/.* ([0-9]+) .*/\1/'`
-  usrdir=/usr
-elif [ "${PLATFORM}" = "SunOS" ]; then
-  totalmem=`prtconf | grep 'Memory size:' | sed -r 's/.* ([0-9]+) .*/\1/'`
-  totalmem=`expr $totalmem \* 1024`
-  usrdir=/usr
-elif [ "${PLATFORM}" = "FreeBSD" ]; then
-  totalmem=`sysctl -n hw.physmem`
-  totalmem=`expr $totalmem / 1024`
-  usrdir=%%LOCALBASE%%
-fi
+totalmem=`sysctl -n hw.physmem`
+totalmem=`expr $totalmem / 1024`
+usrdir=%%LOCALBASE%%
 
 if [ -d ${usrdir}/share/java/lightzone ]; then
   pkgjavadir=${usrdir}/share/java/lightzone
@@ -28,13 +19,7 @@ else
   pkgjavadir=${usrdir}/share/lightzone/lib
 fi
 

-fi
+pkglibexecdir=${usrdir}/lib/lightzone
 
 if   [ -f ${usrdir}/share/java/jh.jar ]; then        # Debian, Ubuntu
    jhpath=${usrdir}/share/java/jh.ja

Return to bug 210677

Lines 2-9 Link Here

(-)graphics/lightzone/Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lightzone	4	PORTNAME= lightzone
5	DISTVERSION= 4.1.5	5	DISTVERSION= 4.1.6
6	PORTREVISION= 1
7	CATEGORIES= graphics java	6	CATEGORIES= graphics java
8	DIST_SUBDIR= ${PORTNAME}	7	DIST_SUBDIR= ${PORTNAME}
9		8
Lines 39-49 Link Here
39		38
40	LIBDIR= ${PREFIX}/lib/${PORTNAME}	39	LIBDIR= ${PREFIX}/lib/${PORTNAME}
41	PLIST_SUB= LIBDIR="${LIBDIR}"	40	PLIST_SUB= LIBDIR="${LIBDIR}"
42	WRKSRC_SUBDIR= linux	41	WRKSRC_SUBDIR= linux
43		42
44	post-patch:	43	post-patch:
45	@${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' -e 's\|g++\|${CXX}\|' ${WRKSRC}/../lightcrafts/mk/platform.mk	44	@${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' -e 's\|g++\|${CXX}\|' ${WRKSRC}/../lightcrafts/mk/platform.mk
46	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/products/lightzone
47		45
48	do-install:	46	do-install:
49	${INSTALL_SCRIPT} ${WRKSRC}/products/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/	47	${INSTALL_SCRIPT} ${WRKSRC}/products/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
Lines 55-59 Link Here
55	${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${LIBDIR}	53	${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${LIBDIR}
56	${INSTALL_DATA} ${WRKSRC}/products/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/	54	${INSTALL_DATA} ${WRKSRC}/products/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
57	@cd ${WRKSRC} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share/	55	@cd ${WRKSRC} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share/
		56	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${STAGEDIR}${PREFIX}/bin/lightzone
58		57
59	.include <bsd.port.mk>	58	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)graphics/lightzone/files/patch-products_lightzone (-4 / +26 lines)
1	--- products/lightzone.orig 2016-01-10 14:20:56 UTC	1	--- products/lightzone.orig 2016-06-28 15:00:11 UTC
2	+++ products/lightzone	2	+++ products/lightzone
3	@@ -28,13 +28,7 @@ else	3	@@ -8,18 +8,9 @@ java -version
		4
		5	arch=`getconf LONG_BIT`
		6	PLATFORM=`uname`
		7	-if [ "${PLATFORM}" = "Linux" ]; then
		8	- totalmem=`cat /proc/meminfo \| grep 'MemTotal: ' \| sed -r 's/.* ([0-9]+) .*/\1/'`
		9	- usrdir=/usr
		10	-elif [ "${PLATFORM}" = "SunOS" ]; then
		11	- totalmem=`prtconf \| grep 'Memory size:' \| sed -r 's/.* ([0-9]+) .*/\1/'`
		12	- totalmem=`expr $totalmem \* 1024`
		13	- usrdir=/usr
		14	-elif [ "${PLATFORM}" = "FreeBSD" ]; then
		15	- totalmem=`sysctl -n hw.physmem`
		16	- totalmem=`expr $totalmem / 1024`
		17	- usrdir=%%LOCALBASE%%
		18	-fi
		19	+totalmem=`sysctl -n hw.physmem`
		20	+totalmem=`expr $totalmem / 1024`
		21	+usrdir=%%LOCALBASE%%
		22
		23	if [ -d ${usrdir}/share/java/lightzone ]; then
		24	pkgjavadir=${usrdir}/share/java/lightzone
		25	@@ -28,13 +19,7 @@ else
4	pkgjavadir=${usrdir}/share/lightzone/lib	26	pkgjavadir=${usrdir}/share/lightzone/lib
5	fi	27	fi
6		28
Lines 13-17 Link Here
13	-fi	35	-fi
14	+pkglibexecdir=${usrdir}/lib/lightzone	36	+pkglibexecdir=${usrdir}/lib/lightzone
15		37
16	classdir='/usr/share/java/javahelp/:/usr/share/java/:/usr/share/javahelp/lib/:/usr/local/share/java/classes/'	38	if [ -f ${usrdir}/share/java/jh.jar ]; then # Debian, Ubuntu
17		39	jhpath=${usrdir}/share/java/jh.ja