Index: head/graphics/lightzone/Makefile =================================================================== --- head/graphics/lightzone/Makefile (revision 397294) +++ head/graphics/lightzone/Makefile (revision 397295) @@ -1,59 +1,58 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= lightzone -DISTVERSION= 4.1.1 -PORTREVISION= 1 +DISTVERSION= 4.1.2 CATEGORIES= graphics java DIST_SUBDIR= ${PORTNAME} MAINTAINER= yuri@rawbw.com COMMENT= Professional-level digital darkroom and photo editor LICENSE= BSD3CLAUSE BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ jhindexer:${PORTSDIR}/java/javahelp \ git:${PORTSDIR}/devel/git \ rsync:${PORTSDIR}/net/rsync \ tidy:${PORTSDIR}/www/tidy-lib \ autoconf:${PORTSDIR}/devel/autoconf LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libtiff.so:${PORTSDIR}/graphics/tiff USE_GITHUB= yes GH_ACCOUNT= ktgw0316 GH_PROJECT= LightZone USES= desktop-file-utils gmake jpeg pkgconfig USE_ANT= yes USE_JAVA= yes USE_GCC= yes USE_LDCONFIG= yes USE_XORG= x11 JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ JAVA_BUILD= yes JAVA_RUN= yes INSTALLS_ICONS= yes 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}${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/ .include Index: head/graphics/lightzone/distinfo =================================================================== --- head/graphics/lightzone/distinfo (revision 397294) +++ head/graphics/lightzone/distinfo (revision 397295) @@ -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 Index: head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java =================================================================== --- head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java (revision 397294) +++ head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java (nonexistent) @@ -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: "); - } Property changes on: head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/lightzone/files/patch-products_lightzone =================================================================== --- head/graphics/lightzone/files/patch-products_lightzone (revision 397294) +++ head/graphics/lightzone/files/patch-products_lightzone (revision 397295) @@ -1,26 +1,17 @@ ---- 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 -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/*' Index: head/graphics/lightzone/pkg-plist =================================================================== --- head/graphics/lightzone/pkg-plist (revision 397294) +++ head/graphics/lightzone/pkg-plist (revision 397295) @@ -1,30 +1,29 @@ bin/lightzone %%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 share/icons/hicolor/256x256/apps/lightzone.png share/icons/hicolor/32x32/apps/lightzone.png share/icons/hicolor/48x48/apps/lightzone.png share/icons/hicolor/64x64/apps/lightzone.png %%JAVASHAREDIR%%/lightzone/lcjai.jar %%JAVASHAREDIR%%/lightzone/lightcrafts-linux.jar %%JAVASHAREDIR%%/lightzone/lightcrafts.jar %%JAVASHAREDIR%%/lightzone/lightzonehelp.jar %%JAVASHAREDIR%%/lightzone/mlibwrapper_jai.jar %%JAVASHAREDIR%%/lightzone/substance-lite.jar