Date: Mon, 17 Jun 2013 13:09:20 +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: r321106 - head/emulators/i386-wine-devel Message-ID: <201306171309.r5HD9KTl085985@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Mon Jun 17 13:09:20 2013 New Revision: 321106 URL: http://svnweb.freebsd.org/changeset/ports/321106 Log: Really fix dynamic pkg-plist for emulators/i386-wine-devel. To prevent this problem from happening again the @dirrm section was consolidated and moved to after the files are added. Approved by: eadler,bdrewery (mentors, implicit) Reported by: qat@redports.org, bdrewery Modified: head/emulators/i386-wine-devel/Makefile Modified: head/emulators/i386-wine-devel/Makefile ============================================================================== --- head/emulators/i386-wine-devel/Makefile Mon Jun 17 13:04:08 2013 (r321105) +++ head/emulators/i386-wine-devel/Makefile Mon Jun 17 13:09:20 2013 (r321106) @@ -32,15 +32,12 @@ post-install-script: [ "$${i}" = "wine" ] || ${LN} -f ${PREFIX}/bin/wine ${PREFIX}/bin/$${i} ; \ echo bin32/$${i} >> ${TMPPLIST} ; \ done - echo '@dirrm bin32' >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) ${MKDIR} ${PREFIX}/lib32/.libGL/dri for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${PREFIX}/lib32/.libGL/dri/ ; \ echo lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done - echo '@dirrm lib32/.libGL/dri' >> ${TMPPLIST} - echo '@dirrm lib32/.libGL' >> ${TMPPLIST} # Find all libraries that are linked too (via ldd(1)) grep -v '[@%]' ${TMPPLIST} | sed "s!^!${PREFIX}/!g" | \ xargs -n1 file -F' ' | grep ELF | cut -f1 -d' ' | \ @@ -66,11 +63,14 @@ post-install-script: echo lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done + echo '@dirrm lib32/.libGL/dri' >> ${TMPPLIST} + echo '@dirrm lib32/.libGL' >> ${TMPPLIST} if [ -n "${WITH_PKGNG}" ]; then \ echo '@dirrmtry lib32' >> ${TMPPLIST}; \ else \ echo '@unexec rmdir %D/lib32 2>/dev/null || true' >> ${TMPPLIST}; \ fi + echo '@dirrm bin32' >> ${TMPPLIST} # Install nvidia patching script ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${DATADIR}/patch-nvidia.sh echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306171309.r5HD9KTl085985>