Index: head/graphics/lightzone/Makefile =================================================================== --- head/graphics/lightzone/Makefile (revision 390483) +++ head/graphics/lightzone/Makefile (revision 390484) @@ -1,58 +1,60 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= lightzone DISTVERSION= 4.1.1 +PORTREVISION= 1 CATEGORIES= graphics java -MASTER_SITES= GH 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= libjpeg.so:${PORTSDIR}/graphics/jpeg \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libtiff.so:${PORTSDIR}/graphics/tiff USE_GITHUB= yes GH_ACCOUNT= ktgw0316 GH_PROJECT= LightZone USES= desktop-file-utils gmake 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 -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/ .include Index: head/graphics/lightzone/files/patch-products_lightzone =================================================================== --- head/graphics/lightzone/files/patch-products_lightzone (revision 390483) +++ head/graphics/lightzone/files/patch-products_lightzone (revision 390484) @@ -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/*' 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 390483) +++ head/graphics/lightzone/files/patch-src_com_lightcrafts_platform_linux_TestSSE2.java (revision 390484) @@ -1,29 +1,29 @@ ---- 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"; } 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: "); } Index: head/graphics/lightzone/pkg-plist =================================================================== --- head/graphics/lightzone/pkg-plist (revision 390483) +++ head/graphics/lightzone/pkg-plist (revision 390484) @@ -1,30 +1,30 @@ 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 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