Date: Sat, 15 Apr 2017 15:54:55 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438587 - in head/emulators: i386-wine i386-wine-devel Message-ID: <201704151554.v3FFstrn000353@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Sat Apr 15 15:54:54 2017 New Revision: 438587 URL: https://svnweb.freebsd.org/changeset/ports/438587 Log: emulators/i386-wine-devel: update to 2.5_1 - fix direct use of commannds Suggested by: danfe@ Modified: head/emulators/i386-wine-devel/Makefile.i386 head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine-devel/distinfo head/emulators/i386-wine-devel/pkg-plist head/emulators/i386-wine/Makefile.i386 Modified: head/emulators/i386-wine-devel/Makefile.i386 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 Sat Apr 15 15:05:32 2017 (r438586) +++ head/emulators/i386-wine-devel/Makefile.i386 Sat Apr 15 15:54:54 2017 (r438587) @@ -37,44 +37,44 @@ post-install-script: ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32-bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine - for i in `grep ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ + for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ - echo bin32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ done # Install libGL ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ - echo lib32/.libGL/libGL.so.1 >> ${TMPPLIST} + ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ - echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all soft dependencies (via strings(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | ${XARGS} strings | \ - grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs - for i in `cat ${WRKDIR}/winesoftlibs` ; do \ - if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ]; then \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | ${XARGS} strings | \ + ${GREP} '^lib.*\.so' | ${SORT} -u > ${WRKDIR}/winesoftlibs + for i in `${CAT} ${WRKDIR}/winesoftlibs` ; do \ + if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`${GREP} $${i} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done # Find all libraries that are linked too (via ldd(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \ - | sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ - | grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs - for i in `cat ${WRKDIR}/winelibs` ; do \ - if [ -z "`grep $${i##*/} ${TMPPLIST}`" ]; then \ + | ${SORT} -u | ${GREP} -v '^\(/usr\)\?/lib' | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ + | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs + for i in `${CAT} ${WRKDIR}/winelibs` ; do \ + if [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ fi ; \ done # Install nvidia patching script ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh - echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} + ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} .include "${MASTERDIR}/Makefile" Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Sat Apr 15 15:05:32 2017 (r438586) +++ head/emulators/i386-wine-devel/Makefile.inc Sat Apr 15 15:54:54 2017 (r438587) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= wine -PORTVERSION= 2.4 +PORTVERSION= 2.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/ Modified: head/emulators/i386-wine-devel/distinfo ============================================================================== --- head/emulators/i386-wine-devel/distinfo Sat Apr 15 15:05:32 2017 (r438586) +++ head/emulators/i386-wine-devel/distinfo Sat Apr 15 15:54:54 2017 (r438587) @@ -1,13 +1,13 @@ -TIMESTAMP = 1491023856 -SHA256 (freebsd:10:x86:64/i386-wine-devel-2.4,1.txz) = 8c27bbbd5c8b55af87f40d0afd79dbbfaac2af0d3d797b2daebf6348a053f570 -SIZE (freebsd:10:x86:64/i386-wine-devel-2.4,1.txz) = 53654000 -SHA256 (freebsd:10:x86:64/i386-wine-staging-2.4,1.txz) = 7a447d03d29949f167826ee06dad5a68c8de371f20433f455ae4ca519b23ada7 -SIZE (freebsd:10:x86:64/i386-wine-staging-2.4,1.txz) = 55875184 -SHA256 (freebsd:11:x86:64/i386-wine-devel-2.4,1.txz) = 611ef4030a811a7dc85f16d5545136d95c8262ceba02a698c2037c4855f92f53 -SIZE (freebsd:11:x86:64/i386-wine-devel-2.4,1.txz) = 53355504 -SHA256 (freebsd:11:x86:64/i386-wine-staging-2.4,1.txz) = a0a8baf3a4b182efafd89d99f9362b3e86683f1eb3ff3553d7c7103d309fb00d -SIZE (freebsd:11:x86:64/i386-wine-staging-2.4,1.txz) = 55554216 -SHA256 (freebsd:12:x86:64/i386-wine-devel-2.4,1.txz) = e482234c1dac23abb26bd60cb5a0644c703f853dfde818e49e39390f66ac211d -SIZE (freebsd:12:x86:64/i386-wine-devel-2.4,1.txz) = 52570320 -SHA256 (freebsd:12:x86:64/i386-wine-staging-2.4,1.txz) = 2c474cf482f69f2c1fc84efbbc338109c534491e2fba84dd764fbbad4fbcef7b -SIZE (freebsd:12:x86:64/i386-wine-staging-2.4,1.txz) = 54813420 +TIMESTAMP = 1492269512 +SHA256 (freebsd:10:x86:64/i386-wine-devel-2.5_1,1.txz) = 9b22cdf5f1d675a92bccaf08a8cbaff331a34af99a5c6bfa0c53c07af73e2e8e +SIZE (freebsd:10:x86:64/i386-wine-devel-2.5_1,1.txz) = 44646140 +SHA256 (freebsd:10:x86:64/i386-wine-staging-2.5_1,1.txz) = 0f99e5db67d4a94e2bc5c3d4fb27404b47a4208ca60528619ef36eb421938624 +SIZE (freebsd:10:x86:64/i386-wine-staging-2.5_1,1.txz) = 46863264 +SHA256 (freebsd:11:x86:64/i386-wine-devel-2.5_1,1.txz) = 03067c9a72163494621ad0194fe459766e0abdd55950ad9d3901b09691598241 +SIZE (freebsd:11:x86:64/i386-wine-devel-2.5_1,1.txz) = 44445284 +SHA256 (freebsd:11:x86:64/i386-wine-staging-2.5_1,1.txz) = e2544966b16ec16fe9f4711c94476ecf2a03d6509eb54e490a381f9a231fbd4d +SIZE (freebsd:11:x86:64/i386-wine-staging-2.5_1,1.txz) = 46647680 +SHA256 (freebsd:12:x86:64/i386-wine-devel-2.5_1,1.txz) = b31cb6de7323615e258c935c58195ce5831c25823ff84a72dffe17be3a32bbfa +SIZE (freebsd:12:x86:64/i386-wine-devel-2.5_1,1.txz) = 43972756 +SHA256 (freebsd:12:x86:64/i386-wine-staging-2.5_1,1.txz) = d6e430e5f773db707c9995faabf4d732d44a3a3dc175a7e629939ab48740555b +SIZE (freebsd:12:x86:64/i386-wine-staging-2.5_1,1.txz) = 46179508 Modified: head/emulators/i386-wine-devel/pkg-plist ============================================================================== --- head/emulators/i386-wine-devel/pkg-plist Sat Apr 15 15:05:32 2017 (r438586) +++ head/emulators/i386-wine-devel/pkg-plist Sat Apr 15 15:54:54 2017 (r438587) @@ -114,6 +114,7 @@ include/wine/windows/amstream.h include/wine/windows/amstream.idl include/wine/windows/amvideo.h include/wine/windows/amvideo.idl +%%STAGING%%include/wine/windows/apiset.h include/wine/windows/appcompatapi.h include/wine/windows/appmgmt.h include/wine/windows/asptlb.h @@ -924,8 +925,7 @@ lib32/.libGL/dri/swrast_dri.so lib32/.libGL/dri/vmwgfx_dri.so lib32/.libGL/libGL.so.1 lib32/libGLU.so.1 -lib32/libLLVM-3.9.so -lib32/libLTO.so +lib32/libLLVM-4.0.so lib32/libX11-xcb.so.1 lib32/libX11.so.6 lib32/libXau.so.6 @@ -940,7 +940,6 @@ lib32/libXinerama.so.1 lib32/libXrandr.so.2 lib32/libXrender.so.1 lib32/libXxf86vm.so.1 -lib32/libdevq.so.0 lib32/libdrm.so.2 lib32/libdrm_amdgpu.so.1 lib32/libdrm_intel.so.1 @@ -1057,6 +1056,7 @@ lib32/wine/api-ms-win-core-psapi-obsolet %%STAGING%%lib32/wine/api-ms-win-core-quirks-l1-1-0.dll.so lib32/wine/api-ms-win-core-realtime-l1-1-0.dll.so lib32/wine/api-ms-win-core-registry-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-core-registry-l2-1-0.dll.so lib32/wine/api-ms-win-core-registryuserspecific-l1-1-0.dll.so lib32/wine/api-ms-win-core-rtlsupport-l1-1-0.dll.so lib32/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so @@ -1076,6 +1076,7 @@ lib32/wine/api-ms-win-core-sysinfo-l1-2- lib32/wine/api-ms-win-core-threadpool-l1-1-0.dll.so lib32/wine/api-ms-win-core-threadpool-l1-2-0.dll.so lib32/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-core-threadpool-private-l1-1-0.dll.so lib32/wine/api-ms-win-core-timezone-l1-1-0.dll.so lib32/wine/api-ms-win-core-toolhelp-l1-1-0.dll.so lib32/wine/api-ms-win-core-url-l1-1-0.dll.so @@ -1089,6 +1090,7 @@ lib32/wine/api-ms-win-core-winrt-error-l lib32/wine/api-ms-win-core-winrt-errorprivate-l1-1-1.dll.so lib32/wine/api-ms-win-core-winrt-l1-1-0.dll.so lib32/wine/api-ms-win-core-winrt-registration-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll.so lib32/wine/api-ms-win-core-winrt-string-l1-1-0.dll.so lib32/wine/api-ms-win-core-wow64-l1-1-0.dll.so lib32/wine/api-ms-win-core-xstate-l1-1-0.dll.so @@ -1125,6 +1127,8 @@ lib32/wine/api-ms-win-eventing-consumer- lib32/wine/api-ms-win-eventing-controller-l1-1-0.dll.so lib32/wine/api-ms-win-eventing-provider-l1-1-0.dll.so lib32/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-mm-misc-l1-1-1.dll.so +%%STAGING%%lib32/wine/api-ms-win-mm-mme-l1-1-0.dll.so lib32/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so lib32/wine/api-ms-win-power-base-l1-1-0.dll.so lib32/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -1135,11 +1139,13 @@ lib32/wine/api-ms-win-security-audit-l1- lib32/wine/api-ms-win-security-base-l1-1-0.dll.so lib32/wine/api-ms-win-security-base-l1-2-0.dll.so lib32/wine/api-ms-win-security-base-private-l1-1-1.dll.so +%%STAGING%%lib32/wine/api-ms-win-security-grouppolicy-l1-1-0.dll.so lib32/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so lib32/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so lib32/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so lib32/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so lib32/wine/api-ms-win-security-sddl-l1-1-0.dll.so +%%STAGING%%lib32/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so lib32/wine/api-ms-win-service-core-l1-1-0.dll.so lib32/wine/api-ms-win-service-core-l1-1-1.dll.so lib32/wine/api-ms-win-service-management-l1-1-0.dll.so @@ -1417,6 +1423,7 @@ lib32/wine/fakedlls/api-ms-win-core-psap %%STAGING%%lib32/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-realtime-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll lib32/wine/fakedlls/api-ms-win-core-registryuserspecific-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-rtlsupport-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll @@ -1436,6 +1443,7 @@ lib32/wine/fakedlls/api-ms-win-core-sysi lib32/wine/fakedlls/api-ms-win-core-threadpool-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll lib32/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-core-threadpool-private-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-timezone-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-toolhelp-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-url-l1-1-0.dll @@ -1449,6 +1457,7 @@ lib32/wine/fakedlls/api-ms-win-core-winr lib32/wine/fakedlls/api-ms-win-core-winrt-errorprivate-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-core-winrt-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-winrt-registration-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-winrt-string-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-wow64-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-core-xstate-l1-1-0.dll @@ -1485,6 +1494,8 @@ lib32/wine/fakedlls/api-ms-win-eventing- lib32/wine/fakedlls/api-ms-win-eventing-controller-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -1495,11 +1506,13 @@ lib32/wine/fakedlls/api-ms-win-security- lib32/wine/fakedlls/api-ms-win-security-base-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-base-l1-2-0.dll lib32/wine/fakedlls/api-ms-win-security-base-private-l1-1-1.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-security-grouppolicy-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll lib32/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll +%%STAGING%%lib32/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-service-core-l1-1-0.dll lib32/wine/fakedlls/api-ms-win-service-core-l1-1-1.dll lib32/wine/fakedlls/api-ms-win-service-management-l1-1-0.dll Modified: head/emulators/i386-wine/Makefile.i386 ============================================================================== --- head/emulators/i386-wine/Makefile.i386 Sat Apr 15 15:05:32 2017 (r438586) +++ head/emulators/i386-wine/Makefile.i386 Sat Apr 15 15:54:54 2017 (r438587) @@ -37,44 +37,44 @@ post-install-script: ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32-bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine - for i in `grep ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ + for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ - echo bin32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ done # Install libGL ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ - echo lib32/.libGL/libGL.so.1 >> ${TMPPLIST} + ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ - echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all soft dependencies (via strings(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | ${XARGS} strings | \ - grep '^lib.*\.so' | sort -u > ${WRKDIR}/winesoftlibs - for i in `cat ${WRKDIR}/winesoftlibs` ; do \ - if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`grep $${i} ${TMPPLIST}`" ]; then \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | ${XARGS} strings | \ + ${GREP} '^lib.*\.so' | ${SORT} -u > ${WRKDIR}/winesoftlibs + for i in `${CAT} ${WRKDIR}/winesoftlibs` ; do \ + if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`${GREP} $${i} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done # Find all libraries that are linked too (via ldd(1)) - grep -v '[@%]' ${TMPPLIST} | sed "s!^!${STAGEDIR}${PREFIX}/!g" | \ - ${XARGS} -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \ + ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ + ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \ - | sort -u | grep -v '^\(/usr\)\?/lib' | grep -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ - | grep -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs - for i in `cat ${WRKDIR}/winelibs` ; do \ - if [ -z "`grep $${i##*/} ${TMPPLIST}`" ]; then \ + | ${SORT} -u | ${GREP} -v '^\(/usr\)\?/lib' | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ + | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs + for i in `${CAT} ${WRKDIR}/winelibs` ; do \ + if [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ - echo lib32/$${i##*/} >> ${TMPPLIST} ; \ + ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ fi ; \ done # Install nvidia patching script ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh - echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} + ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704151554.v3FFstrn000353>