Date: Wed, 24 Jun 2015 14:52:24 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390484 - in head/graphics/lightzone: . files Message-ID: <201506241452.t5OEqOEt091385@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Jun 24 14:52:24 2015 New Revision: 390484 URL: https://svnweb.freebsd.org/changeset/ports/390484 Log: 1: remove MASTER_SITES. 2: rename DATADIR to LIBDIR. Submitted by: mat@ Modified: head/graphics/lightzone/Makefile head/graphics/lightzone/files/patch-products_lightzone head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java head/graphics/lightzone/pkg-plist Modified: head/graphics/lightzone/Makefile ============================================================================== --- head/graphics/lightzone/Makefile Wed Jun 24 14:29:25 2015 (r390483) +++ head/graphics/lightzone/Makefile Wed Jun 24 14:52:24 2015 (r390484) @@ -3,8 +3,8 @@ PORTNAME= lightzone DISTVERSION= 4.1.1 +PORTREVISION= 1 CATEGORIES= graphics java -MASTER_SITES= GH DIST_SUBDIR= ${PORTNAME} MAINTAINER= yuri@rawbw.com @@ -38,20 +38,22 @@ JAVA_BUILD= yes JAVA_RUN= yes INSTALLS_ICONS= yes -DATADIR= ${PREFIX}/libexec/${PORTNAME} -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}/linux +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/ @${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/products/*.jar ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} - @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/products/LightZone-forkd ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/products/dcraw_lz ${STAGEDIR}${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${LIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/products/LightZone-forkd ${STAGEDIR}${LIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/products/dcraw_lz ${STAGEDIR}${LIBDIR} + ${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/ Modified: head/graphics/lightzone/files/patch-products_lightzone ============================================================================== --- head/graphics/lightzone/files/patch-products_lightzone Wed Jun 24 14:29:25 2015 (r390483) +++ head/graphics/lightzone/files/patch-products_lightzone Wed Jun 24 14:52:24 2015 (r390484) @@ -1,13 +1,26 @@ ---- products/lightzone.orig 2015-06-23 04:08:58 UTC +--- products/lightzone.orig 2015-06-02 13:25:15 UTC +++ products/lightzone -@@ -15,8 +15,8 @@ elif [ "${PLATFORM}" = "SunOS" ]; then +@@ -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=/usr/local ++ usrdir=%%LOCALBASE%% fi + pkgjavadir=${usrdir}/share/java/lightzone +-if [ -d ${usrdir}/libexec/lightzone ]; then +- pkglibexecdir=${usrdir}/libexec/lightzone +-elif [ -d ${usrdir}/lib64/lightzone ]; then +- pkglibexecdir=${usrdir}/lib64/lightzone +-else +- pkglibexecdir=${usrdir}/lib/lightzone +-fi ++pkglibexecdir=${usrdir}/lib/lightzone + + classdir='/usr/share/java/javahelp/*:/usr/share/java/*:/usr/share/javahelp/lib/*:/usr/local/share/java/classes/*' + Modified: head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java ============================================================================== --- head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java Wed Jun 24 14:29:25 2015 (r390483) +++ head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java Wed Jun 24 14:52:24 2015 (r390484) @@ -1,4 +1,4 @@ ---- src/com/lightcrafts/platform/linux/TestSSE2.java.orig 2015-06-23 04:17:32 UTC +--- 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"; Modified: head/graphics/lightzone/pkg-plist ============================================================================== --- head/graphics/lightzone/pkg-plist Wed Jun 24 14:29:25 2015 (r390483) +++ head/graphics/lightzone/pkg-plist Wed Jun 24 14:52:24 2015 (r390484) @@ -1,20 +1,20 @@ bin/lightzone -%%DATADIR%%/LightZone-forkd -%%DATADIR%%/dcraw_lz -%%DATADIR%%/libDCRaw.so -%%DATADIR%%/libFASTJAI.so -%%DATADIR%%/libJAI.so -%%DATADIR%%/libLCArrays.so -%%DATADIR%%/libLCCache.so -%%DATADIR%%/libLCFileUtil.so -%%DATADIR%%/libLCJNI.so -%%DATADIR%%/libLCJPEG.so -%%DATADIR%%/libLCLCMS.so -%%DATADIR%%/libLCTIFF.so -%%DATADIR%%/libLinux.so -%%DATADIR%%/libSegment.so -%%DATADIR%%/libfbf.so -%%DATADIR%%/libmlib_jai.so +%%LIBDIR%%/LightZone-forkd +%%LIBDIR%%/dcraw_lz +%%LIBDIR%%/libDCRaw.so +%%LIBDIR%%/libFASTJAI.so +%%LIBDIR%%/libJAI.so +%%LIBDIR%%/libLCArrays.so +%%LIBDIR%%/libLCCache.so +%%LIBDIR%%/libLCFileUtil.so +%%LIBDIR%%/libLCJNI.so +%%LIBDIR%%/libLCJPEG.so +%%LIBDIR%%/libLCLCMS.so +%%LIBDIR%%/libLCTIFF.so +%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506241452.t5OEqOEt091385>