Date: Tue, 5 Jan 2016 16:35:38 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r405302 - branches/2016Q1/devel/plan9port Message-ID: <201601051635.u05GZcxP090736@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Tue Jan 5 16:35:38 2016 New Revision: 405302 URL: https://svnweb.freebsd.org/changeset/ports/405302 Log: MFH: r405099 r405297 --------------- Fix WRKSRC after r404834. The top-level directory in the tarball is now called "plan9port" instead of "plan9". This fixes `make patch': ===> Missing license file for LUCENT in /wrkdirs/usr/ports/devel/plan9port/work/plan9/LICENSE Thanks to antoine for poking me. --------------- - 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 Approved by: portmgr (miwi) Modified: branches/2016Q1/devel/plan9port/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/devel/plan9port/Makefile ============================================================================== --- branches/2016Q1/devel/plan9port/Makefile Tue Jan 5 16:24:36 2016 (r405301) +++ branches/2016Q1/devel/plan9port/Makefile Tue Jan 5 16:35:38 2016 (r405302) @@ -3,7 +3,7 @@ PORTNAME= plan9port PORTVERSION= 20140306 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel plan9 MASTER_SITES= https://plan9port.googlecode.com/files/ @@ -48,12 +48,15 @@ REINPLACE_ARGS= -i "" # necessary since 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601051635.u05GZcxP090736>