From owner-svn-ports-head@freebsd.org Tue Jan 5 16:05:16 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58C31A628F6; Tue, 5 Jan 2016 16:05:16 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BDBE1155; Tue, 5 Jan 2016 16:05:15 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05G5Fb8081093; Tue, 5 Jan 2016 16:05:15 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05G5Fox081092; Tue, 5 Jan 2016 16:05:15 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201601051605.u05G5Fox081092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Tue, 5 Jan 2016 16:05:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405297 - head/devel/plan9port X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 16:05:16 -0000 Author: jhale Date: Tue Jan 5 16:05:14 2016 New Revision: 405297 URL: https://svnweb.freebsd.org/changeset/ports/405297 Log: - Fix staging after r405099 While here: - Remove @dirrm - Use new method of dealing with permissions and empty dirs - Remove .hgignore and .hgtags - Bump PORTREVISION due to plist change MFH: 2016Q1 Modified: head/devel/plan9port/Makefile Modified: head/devel/plan9port/Makefile ============================================================================== --- head/devel/plan9port/Makefile Tue Jan 5 15:46:38 2016 (r405296) +++ head/devel/plan9port/Makefile Tue Jan 5 16:05:14 2016 (r405297) @@ -3,7 +3,7 @@ PORTNAME= plan9port PORTVERSION= 20140306 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel plan9 MASTER_SITES= https://plan9port.googlecode.com/files/ @@ -41,19 +41,22 @@ SHEBANG_FILES= acid/transcript \ unix/man/fixurls USE_PERL5= build USE_XORG= x11 xt xi xaw -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/plan9 PLIST= ${WRKDIR}/.PLIST SUB_FILES= pkg-message REINPLACE_ARGS= -i "" # necessary since installs via recursive copy PLAN9= ${PREFIX}/plan9 -EMPTY_DIRS= plan9/log \ - plan9/bin/lpbin \ - plan9/dist/troff \ - plan9/mail/queue \ +EMPTY_DIRS= plan9/mail/queue \ + plan9/log \ plan9/dist/debian \ - plan9/dist/pkg + plan9/dist/pkg \ + plan9/dist/troff \ + plan9/bin/lpbin + +post-extract: + ${MV} ${WRKDIR}/plan9port ${WRKDIR}/plan9 post-patch: @${FIND} ${WRKSRC}/man -type f -regex ".*\.[0-9?]$\" \ @@ -75,14 +78,15 @@ do-build: # Dynamic PLIST sucks, but it's over 8K lines, which sucks even more :( post-build: ${RM} -rf `${FIND} ${WRKSRC}/dist -type f ! -regex ".*\.png"` - ${RM} -rf `${FIND} ${WRKSRC} -name .hg -o -name .cvsignore` - ( cd ${WRKDIR} ; \ - ${FIND} plan9 -type f; for D in ${EMPTY_DIRS}; do \ - ${ECHO_CMD} "@exec ${MKDIR} ${PREFIX}/$${D}"; \ + ${RM} -rf `${FIND} ${WRKSRC} -name .hg -o -name .hgignore \ + -o -name .hgtags -o -name .cvsignore` + @( cd ${WRKDIR} ; \ + ${FIND} plan9 -type f; \ + ${ECHO_CMD} "@dir(,,1777) plan9/news"; \ + for D in ${EMPTY_DIRS}; do \ + ${ECHO_CMD} "@dir $${D}"; \ done; \ - ${FIND} plan9 -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm |'; \ - ) | ${PERL} -pe '$$_ =~ s,plan9/bin/auxstats,\@group kmem\n\@mode\ - 2755\n$$&\n\@group\n\@mode,' > ${PLIST} + ) | sed -e '/plan9\/bin\/auxstats/s|^|\@\(,kmem,2755\) |' > ${PLIST} do-install: ${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX} @@ -91,7 +95,6 @@ post-install: cd ${STAGEDIR}${PLAN9} && ${SETENV} PLAN9=${PLAN9} \ PATH=${PATH}:${STAGEDIR}${PLAN9}/bin \ ${SH} lib/moveplan9.sh ${WRKSRC} - ${CHMOD} 01777 ${STAGEDIR}${PLAN9}/news install-user: @${MKDIR} ${HOME}/lib