Date: Mon, 20 Oct 2014 20:36:40 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371301 - head/Mk Message-ID: <201410202036.s9KKaeOs088294@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Oct 20 20:36:39 2014 New Revision: 371301 URL: https://svnweb.freebsd.org/changeset/ports/371301 QAT: https://qat.redports.org/buildarchive/r371301/ Log: Remove unused and broken new-plist target Modify the automatic plist to not generate the @dirrm Modified: head/Mk/bsd.linux-rpm.mk Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Mon Oct 20 20:29:30 2014 (r371300) +++ head/Mk/bsd.linux-rpm.mk Mon Oct 20 20:36:39 2014 (r371301) @@ -189,10 +189,7 @@ pre-install: linux-rpm-generate-plist . if !target(linux-rpm-generate-plist) linux-rpm-generate-plist: cd ${WRKSRC} && \ - ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} && \ - ${FIND} * ! -path "stage*" -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs - @${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs - @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST} + ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} . endif . endif @@ -209,14 +206,4 @@ do-install: cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} . endif - -. if !target(new-plist) -new-plist: build - @${RM} -f ${PLIST}.new - @cd ${WRKSRC} && \ - ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}.new; \ - ${FIND} -d * ! -path "stage*" -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ - done -. endif - .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410202036.s9KKaeOs088294>