From owner-svn-ports-all@FreeBSD.ORG Sun Oct 6 09:08:23 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6A6E845E; Sun, 6 Oct 2013 09:08:23 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 583C32F9E; Sun, 6 Oct 2013 09:08:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9698NRn021442; Sun, 6 Oct 2013 09:08:23 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9698MPm021439; Sun, 6 Oct 2013 09:08:22 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201310060908.r9698MPm021439@svn.freebsd.org> From: Antoine Brodin Date: Sun, 6 Oct 2013 09:08:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329540 - in head: Mk dns/linux-f10-libasyncns emulators/linux_base-f10 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 09:08:23 -0000 Author: antoine Date: Sun Oct 6 09:08:22 2013 New Revision: 329540 URL: http://svnweb.freebsd.org/changeset/ports/329540 Log: Rework linux rpm plist generation/installation Convert linux-f10-libasyncns to STAGEDIR (only user of AUTOMATIC_PLIST) Approved by: portmgr (bapt) Modified: head/Mk/bsd.linux-rpm.mk head/dns/linux-f10-libasyncns/Makefile head/emulators/linux_base-f10/Makefile Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Sun Oct 6 09:07:31 2013 (r329539) +++ head/Mk/bsd.linux-rpm.mk Sun Oct 6 09:08:22 2013 (r329540) @@ -153,8 +153,8 @@ pre-install: linux-rpm-generate-plist . if !target(linux-rpm-generate-plist) linux-rpm-generate-plist: cd ${WRKSRC} && \ - ${FIND} * -path ./stage -prune ! -type d | ${SORT} > ${PLIST} && \ - ${FIND} * | ${GREP} -v "^stage" | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs + ${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} . endif @@ -170,16 +170,16 @@ do-install: . if ${BRANDELF_FILES} @cd ${WRKSRC} && ${BRANDELF} -t Linux ${BRANDELF_FILES} . endif - cd ${WRKSRC} && ${FIND} * -type d | ${GREP} -v "^stage" | ${PAX} -rw ${STAGEDIR}/${PREFIX} - cd ${WRKSRC} && ${FIND} * -path ./stage -prune ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} + 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 -prune ! -type d | ${SORT} > ${PLIST}.new; \ - ${FIND} -d * -path ./stage -prune -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ + ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}.new; \ + ${FIND} -d * ! -path "stage*" -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ done . endif Modified: head/dns/linux-f10-libasyncns/Makefile ============================================================================== --- head/dns/linux-f10-libasyncns/Makefile Sun Oct 6 09:07:31 2013 (r329539) +++ head/dns/linux-f10-libasyncns/Makefile Sun Oct 6 09:08:22 2013 (r329540) @@ -16,5 +16,4 @@ RPMVERSION= 1.fc10 USE_LDCONFIG= yes AUTOMATIC_PLIST=yes -NO_STAGE= yes .include Modified: head/emulators/linux_base-f10/Makefile ============================================================================== --- head/emulators/linux_base-f10/Makefile Sun Oct 6 09:07:31 2013 (r329539) +++ head/emulators/linux_base-f10/Makefile Sun Oct 6 09:08:22 2013 (r329540) @@ -197,8 +197,8 @@ do-install: # # Do install without using linux rpm system # - @cd ${WRKSRC} && ${FIND} * -type d | ${GREP} -v "^stage" | ${PAX} -rw ${STAGEDIR}${PREFIX} - @cd ${WRKSRC} && ${FIND} * -path ./stage -prune ! -type d \ + @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} @${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp