Attachment 171928 Details for Bug 210677 – patch

[patch] patch

lightzone.patch (text/plain), 3.41 KB, created by Yuri Victorovich on 2016-06-29 00:26:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2016-06-29 00:26:36 UTC

Size: 3.41 KB

patch

obsolete

>Index: graphics/lightzone/Makefile
>===================================================================
>--- graphics/lightzone/Makefile	(revision 417750)
>+++ graphics/lightzone/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	lightzone
>-DISTVERSION=	4.1.5
>-PORTREVISION=	1
>+DISTVERSION=	4.1.6e
> CATEGORIES=	graphics java
> DIST_SUBDIR=	${PORTNAME}
> 
>@@ -24,6 +23,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	ktgw0316
> GH_PROJECT=	LightZone
>+GH_TAGNAME=	25959f1
> 
> USES=		desktop-file-utils gmake jpeg pkgconfig
> USE_ANT=	yes
>@@ -39,11 +39,10 @@
> 
> LIBDIR=		${PREFIX}/lib/${PORTNAME}
> PLIST_SUB=	LIBDIR="${LIBDIR}"
>-WRKSRC_SUBDIR=		linux
>+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/
>@@ -55,5 +54,6 @@
> 	${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>
>Index: graphics/lightzone/distinfo
>===================================================================
>--- graphics/lightzone/distinfo	(revision 417750)
>+++ graphics/lightzone/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (lightzone/ktgw0316-LightZone-4.1.5_GH0.tar.gz) = 6f8203790070329c67eee89171349d48e332aaa3dfd8f87a55ccc4323bddc2d6
>-SIZE (lightzone/ktgw0316-LightZone-4.1.5_GH0.tar.gz) = 24209725
>+TIMESTAMP = 1467152949
>+SHA256 (lightzone/ktgw0316-LightZone-4.1.6e-25959f1_GH0.tar.gz) = 3f4e8119dcba7d3c3a62f201124d2edc886dfc846364b873e81fc7da6f595371
>+SIZE (lightzone/ktgw0316-LightZone-4.1.6e-25959f1_GH0.tar.gz) = 25256856
>Index: graphics/lightzone/files/patch-products_lightzone
>===================================================================
>--- graphics/lightzone/files/patch-products_lightzone	(revision 417750)
>+++ graphics/lightzone/files/patch-products_lightzone	(working copy)
>@@ -1,6 +1,28 @@
>---- products/lightzone.orig	2016-01-10 14:20:56 UTC
>+--- products/lightzone.orig	2016-06-28 15:00:11 UTC
> +++ products/lightzone
>-@@ -28,13 +28,7 @@ else
>+@@ -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
>  
>@@ -13,5 +35,5 @@
> -fi
> +pkglibexecdir=${usrdir}/lib/lightzone
>  
>- classdir='/usr/share/java/javahelp/*:/usr/share/java/*:/usr/share/javahelp/lib/*:/usr/local/share/java/classes/*'
>- 
>+ if   [ -f ${usrdir}/share/java/jh.jar ]; then        # Debian, Ubuntu
>+    jhpath=${usrdir}/share/java/jh.ja

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 210677: 171928 | 171962 | 172116