From owner-svn-ports-all@FreeBSD.ORG Fri Jun 13 08:14:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 901C3F7C; Fri, 13 Jun 2014 08:14:50 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7BE6E2E93; Fri, 13 Jun 2014 08:14:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5D8EoBe066331; Fri, 13 Jun 2014 08:14:50 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5D8EoiI066328; Fri, 13 Jun 2014 08:14:50 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201406130814.s5D8EoiI066328@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 13 Jun 2014 08:14:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357657 - head/sysutils/heirloom 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.18 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: Fri, 13 Jun 2014 08:14:50 -0000 Author: gahr Date: Fri Jun 13 08:14:49 2014 New Revision: 357657 URL: http://svnweb.freebsd.org/changeset/ports/357657 QAT: https://qat.redports.org/buildarchive/r357657/ Log: - STAGE-clean - Simplify Makefile Modified: head/sysutils/heirloom/Makefile head/sysutils/heirloom/pkg-plist Modified: head/sysutils/heirloom/Makefile ============================================================================== --- head/sysutils/heirloom/Makefile Fri Jun 13 08:03:24 2014 (r357656) +++ head/sysutils/heirloom/Makefile Fri Jun 13 08:14:49 2014 (r357657) @@ -13,9 +13,8 @@ COMMENT= Collection of standard Unix uti BUILD_DEPENDS= ksh:${PORTSDIR}/shells/pdksh RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_BZIP2= yes -USES= gmake -MAKE_ARGS= CC=${CC} CFLAGS="${CFLAGS}" +USES= gmake tar:bzip2 +MAKE_ARGS= CC=${CC} CFLAGS="${CFLAGS}" ROOT="${STAGEDIR}" MAKEFILE= makefile ALL_TARGET= # DATADIR= ${PREFIX}/${PORTNAME} @@ -23,7 +22,6 @@ REINPLACE_SUB= DATADIR="${DATADIR}" OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include .if ${OSVERSION} >= 900007 @@ -34,57 +32,10 @@ EXTRA_PATCHES= ${FILESDIR}/extra-utmpx BROKEN= does not compile on ${ARCH} .endif -_MANPREFIX= ${DATADIR}/usr/share/man/5man -_MSECS= 1 1b 1m 2 3 4 5 6 7 8 - -_MAN1= apropos.1 awk.1 banner.1 basename.1 bc.1 cal.1 calendar.1 \ - cat.1 chgrp.1 chmod.1 chown.1 cksum.1 cmp.1 col.1 comm.1 \ - copy.1 cp.1 cpio.1 csplit.1 cut.1 date.1 dc.1 dd.1 deroff.1 \ - df.1 diff.1 diff3.1 dirname.1 du.1 ed.1 egrep.1 env.1 \ - expand.1 expr.1 factor.1 fgrep.1 file.1 find.1 fmt.1 fold.1 \ - grep.1 groups.1 hd.1 head.1 hostname.1 id.1 intro.1 join.1 \ - line.1 listusers.1 ln.1 logins.1 logname.1 ls.1 mail.1 man.1 \ - mkdir.1 mkfifo.1 more.1 mt.1 mv.1 nawk.1 newform.1 news.1 \ - nice.1 nl.1 nohup.1 oawk.1 od.1 paste.1 pax.1 pg.1 pgrep.1 \ - pr.1 printenv.1 priocntl.1 ps.1 random.1 renice.1 rm.1 \ - rmdir.1 sdiff.1 sed.1 setpgrp.1 settime.1 sleep.1 sort.1 \ - spell.1 split.1 stty.1 su.1 sum.1 tabs.1 tail.1 tape.1 \ - tapecntl.1 tar.1 tcopy.1 tee.1 time.1 touch.1 tr.1 tsort.1 \ - tty.1 ul.1 uname.1 unexpand.1 uniq.1 units.1 uptime.1 users.1 \ - w.1 wc.1 what.1 whatis.1 who.1 whoami.1 whodo.1 xargs.1 yes.1 \ - bdiff.1 bfs.1 dircmp.1 echo.1 fmtmsg.1 getconf.1 getopt.1 kill.1 \ - mesg.1 mvdir.1 pathchk.1 printf.1 pwd.1 test.1 false.1 true.1 -_MAN1B= basename.1b chown.1b deroff.1b df.1b du.1b groups.1b echo.1b \ - install.1b ln.1b ls.1b ps.1b stty.1b sum.1b tr.1b test.1b -_MAN1M= mknod.1m sync.1m -_MAN5= fspec.5 -_MAN7= man.7 -_MAN8= catman.8 -_M1LINKS= df.1 dfspace.1 \ - ls.1 lc.1 \ - more.1 page.1 \ - pgrep.1 pkill.1 \ - -.if !defined(NO_MANCOMPRESS) -MANEXT= .gz -.endif - -.for sect in ${_MSECS:tu} -. if defined(_MAN${sect}) -_MANPAGES+= ${_MAN${sect}:S%^%${_MANPREFIX}/man${sect:tl}/%} -. endif -. if defined(_M${sect}LINKS) -_MLINKS_PREPEND+=${_M${sect}LINKS:S%^%${_MANPREFIX}/man${sect:tl}/%:S%$%${MANEXT}%} -. endif -.endfor - SH2FIX= maninst.sh genintro.sh crossln.sh DOC_FILES= CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \ LICENSE/README LICENSE/COPYING.LGPL README intro.txt -#NOTE_FILES= cp/NOTES cpio/TODO dd/NOTES grep/NOTES libuxre/NOTES \ -# more/NOTES nawk/NOTES oawk/EXPLAIN oawk/NOTES \ -# oawk/README ps/NOTES shl/NOTES tar/NOTES post-patch: # FreeBSD does not have neither nor system headers @@ -105,17 +56,14 @@ pre-configure: pre-build: ${MAKE} -C ${WRKSRC}/libcommon -f Makefile.mk headers -post-install: compress-man install-doc +post-install: install-doc install-doc: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/LICENSE + @${MKDIR} ${STAGEDIR}${DOCSDIR}/LICENSE . for f in ${DOC_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f} . endfor -#. for file in ${NOTE_FILES} -# @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/${file:T}.${file:H} -#. endfor .endif .include Modified: head/sysutils/heirloom/pkg-plist ============================================================================== --- head/sysutils/heirloom/pkg-plist Fri Jun 13 08:03:24 2014 (r357656) +++ head/sysutils/heirloom/pkg-plist Fri Jun 13 08:14:49 2014 (r357657) @@ -313,8 +313,170 @@ %%DATADIR%%/etc/default/ps %%DATADIR%%/etc/default/su %%DATADIR%%/etc/default/tar +%%DATADIR%%/usr/share/man/5man/man1/apropos.1 +%%DATADIR%%/usr/share/man/5man/man1/awk.1 +%%DATADIR%%/usr/share/man/5man/man1/banner.1 +%%DATADIR%%/usr/share/man/5man/man1/basename.1 +%%DATADIR%%/usr/share/man/5man/man1/bc.1 +%%DATADIR%%/usr/share/man/5man/man1/cal.1 +%%DATADIR%%/usr/share/man/5man/man1/calendar.1 +%%DATADIR%%/usr/share/man/5man/man1/cat.1 +%%DATADIR%%/usr/share/man/5man/man1/chgrp.1 +%%DATADIR%%/usr/share/man/5man/man1/chmod.1 +%%DATADIR%%/usr/share/man/5man/man1/chown.1 +%%DATADIR%%/usr/share/man/5man/man1/cksum.1 +%%DATADIR%%/usr/share/man/5man/man1/cmp.1 +%%DATADIR%%/usr/share/man/5man/man1/col.1 +%%DATADIR%%/usr/share/man/5man/man1/comm.1 +%%DATADIR%%/usr/share/man/5man/man1/copy.1 +%%DATADIR%%/usr/share/man/5man/man1/cp.1 +%%DATADIR%%/usr/share/man/5man/man1/cpio.1 +%%DATADIR%%/usr/share/man/5man/man1/csplit.1 +%%DATADIR%%/usr/share/man/5man/man1/cut.1 +%%DATADIR%%/usr/share/man/5man/man1/date.1 +%%DATADIR%%/usr/share/man/5man/man1/dc.1 +%%DATADIR%%/usr/share/man/5man/man1/dd.1 +%%DATADIR%%/usr/share/man/5man/man1/deroff.1 +%%DATADIR%%/usr/share/man/5man/man1/df.1 +%%DATADIR%%/usr/share/man/5man/man1/dfspace.1 +%%DATADIR%%/usr/share/man/5man/man1/diff.1 +%%DATADIR%%/usr/share/man/5man/man1/diff3.1 +%%DATADIR%%/usr/share/man/5man/man1/dirname.1 +%%DATADIR%%/usr/share/man/5man/man1/du.1 +%%DATADIR%%/usr/share/man/5man/man1/ed.1 +%%DATADIR%%/usr/share/man/5man/man1/egrep.1 +%%DATADIR%%/usr/share/man/5man/man1/env.1 +%%DATADIR%%/usr/share/man/5man/man1/expand.1 +%%DATADIR%%/usr/share/man/5man/man1/expr.1 +%%DATADIR%%/usr/share/man/5man/man1/factor.1 +%%DATADIR%%/usr/share/man/5man/man1/fgrep.1 +%%DATADIR%%/usr/share/man/5man/man1/file.1 +%%DATADIR%%/usr/share/man/5man/man1/find.1 +%%DATADIR%%/usr/share/man/5man/man1/fmt.1 +%%DATADIR%%/usr/share/man/5man/man1/fold.1 +%%DATADIR%%/usr/share/man/5man/man1/grep.1 +%%DATADIR%%/usr/share/man/5man/man1/groups.1 +%%DATADIR%%/usr/share/man/5man/man1/hd.1 +%%DATADIR%%/usr/share/man/5man/man1/head.1 +%%DATADIR%%/usr/share/man/5man/man1/hostname.1 +%%DATADIR%%/usr/share/man/5man/man1/id.1 +%%DATADIR%%/usr/share/man/5man/man1/intro.1 +%%DATADIR%%/usr/share/man/5man/man1/join.1 +%%DATADIR%%/usr/share/man/5man/man1/lc.1 +%%DATADIR%%/usr/share/man/5man/man1/line.1 +%%DATADIR%%/usr/share/man/5man/man1/listusers.1 +%%DATADIR%%/usr/share/man/5man/man1/ln.1 +%%DATADIR%%/usr/share/man/5man/man1/logins.1 +%%DATADIR%%/usr/share/man/5man/man1/logname.1 +%%DATADIR%%/usr/share/man/5man/man1/ls.1 +%%DATADIR%%/usr/share/man/5man/man1/mail.1 +%%DATADIR%%/usr/share/man/5man/man1/man.1 +%%DATADIR%%/usr/share/man/5man/man1/mkdir.1 +%%DATADIR%%/usr/share/man/5man/man1/mkfifo.1 +%%DATADIR%%/usr/share/man/5man/man1/more.1 +%%DATADIR%%/usr/share/man/5man/man1/mt.1 +%%DATADIR%%/usr/share/man/5man/man1/mv.1 +%%DATADIR%%/usr/share/man/5man/man1/nawk.1 +%%DATADIR%%/usr/share/man/5man/man1/newform.1 +%%DATADIR%%/usr/share/man/5man/man1/news.1 +%%DATADIR%%/usr/share/man/5man/man1/nice.1 +%%DATADIR%%/usr/share/man/5man/man1/nl.1 +%%DATADIR%%/usr/share/man/5man/man1/nohup.1 +%%DATADIR%%/usr/share/man/5man/man1/oawk.1 +%%DATADIR%%/usr/share/man/5man/man1/od.1 +%%DATADIR%%/usr/share/man/5man/man1/page.1 +%%DATADIR%%/usr/share/man/5man/man1/paste.1 +%%DATADIR%%/usr/share/man/5man/man1/pax.1 +%%DATADIR%%/usr/share/man/5man/man1/pg.1 +%%DATADIR%%/usr/share/man/5man/man1/pgrep.1 +%%DATADIR%%/usr/share/man/5man/man1/pkill.1 +%%DATADIR%%/usr/share/man/5man/man1/pr.1 +%%DATADIR%%/usr/share/man/5man/man1/printenv.1 +%%DATADIR%%/usr/share/man/5man/man1/priocntl.1 +%%DATADIR%%/usr/share/man/5man/man1/ps.1 +%%DATADIR%%/usr/share/man/5man/man1/random.1 +%%DATADIR%%/usr/share/man/5man/man1/renice.1 +%%DATADIR%%/usr/share/man/5man/man1/rm.1 +%%DATADIR%%/usr/share/man/5man/man1/rmdir.1 +%%DATADIR%%/usr/share/man/5man/man1/sdiff.1 +%%DATADIR%%/usr/share/man/5man/man1/sed.1 +%%DATADIR%%/usr/share/man/5man/man1/setpgrp.1 +%%DATADIR%%/usr/share/man/5man/man1/settime.1 +%%DATADIR%%/usr/share/man/5man/man1/sleep.1 +%%DATADIR%%/usr/share/man/5man/man1/sort.1 +%%DATADIR%%/usr/share/man/5man/man1/spell.1 +%%DATADIR%%/usr/share/man/5man/man1/split.1 +%%DATADIR%%/usr/share/man/5man/man1/stty.1 +%%DATADIR%%/usr/share/man/5man/man1/su.1 +%%DATADIR%%/usr/share/man/5man/man1/sum.1 +%%DATADIR%%/usr/share/man/5man/man1/tabs.1 +%%DATADIR%%/usr/share/man/5man/man1/tail.1 +%%DATADIR%%/usr/share/man/5man/man1/tape.1 +%%DATADIR%%/usr/share/man/5man/man1/tapecntl.1 +%%DATADIR%%/usr/share/man/5man/man1/tar.1 +%%DATADIR%%/usr/share/man/5man/man1/tcopy.1 +%%DATADIR%%/usr/share/man/5man/man1/tee.1 +%%DATADIR%%/usr/share/man/5man/man1/time.1 +%%DATADIR%%/usr/share/man/5man/man1/touch.1 +%%DATADIR%%/usr/share/man/5man/man1/tr.1 +%%DATADIR%%/usr/share/man/5man/man1/tsort.1 +%%DATADIR%%/usr/share/man/5man/man1/tty.1 +%%DATADIR%%/usr/share/man/5man/man1/ul.1 +%%DATADIR%%/usr/share/man/5man/man1/uname.1 +%%DATADIR%%/usr/share/man/5man/man1/unexpand.1 +%%DATADIR%%/usr/share/man/5man/man1/uniq.1 +%%DATADIR%%/usr/share/man/5man/man1/units.1 +%%DATADIR%%/usr/share/man/5man/man1/uptime.1 +%%DATADIR%%/usr/share/man/5man/man1/users.1 +%%DATADIR%%/usr/share/man/5man/man1/w.1 +%%DATADIR%%/usr/share/man/5man/man1/wc.1 +%%DATADIR%%/usr/share/man/5man/man1/what.1 +%%DATADIR%%/usr/share/man/5man/man1/whatis.1 +%%DATADIR%%/usr/share/man/5man/man1/who.1 +%%DATADIR%%/usr/share/man/5man/man1/whoami.1 +%%DATADIR%%/usr/share/man/5man/man1/whodo.1 +%%DATADIR%%/usr/share/man/5man/man1/xargs.1 +%%DATADIR%%/usr/share/man/5man/man1/yes.1 +%%DATADIR%%/usr/share/man/5man/man1/bdiff.1 +%%DATADIR%%/usr/share/man/5man/man1/bfs.1 +%%DATADIR%%/usr/share/man/5man/man1/dircmp.1 +%%DATADIR%%/usr/share/man/5man/man1/echo.1 +%%DATADIR%%/usr/share/man/5man/man1/fmtmsg.1 +%%DATADIR%%/usr/share/man/5man/man1/getconf.1 +%%DATADIR%%/usr/share/man/5man/man1/getopt.1 +%%DATADIR%%/usr/share/man/5man/man1/kill.1 +%%DATADIR%%/usr/share/man/5man/man1/mesg.1 +%%DATADIR%%/usr/share/man/5man/man1/mvdir.1 +%%DATADIR%%/usr/share/man/5man/man1/pathchk.1 +%%DATADIR%%/usr/share/man/5man/man1/printf.1 +%%DATADIR%%/usr/share/man/5man/man1/pwd.1 +%%DATADIR%%/usr/share/man/5man/man1/test.1 +%%DATADIR%%/usr/share/man/5man/man1/false.1 +%%DATADIR%%/usr/share/man/5man/man1/true.1 +%%DATADIR%%/usr/share/man/5man/man1b/basename.1b +%%DATADIR%%/usr/share/man/5man/man1b/chown.1b +%%DATADIR%%/usr/share/man/5man/man1b/deroff.1b +%%DATADIR%%/usr/share/man/5man/man1b/df.1b +%%DATADIR%%/usr/share/man/5man/man1b/du.1b +%%DATADIR%%/usr/share/man/5man/man1b/groups.1b +%%DATADIR%%/usr/share/man/5man/man1b/echo.1b +%%DATADIR%%/usr/share/man/5man/man1b/install.1b +%%DATADIR%%/usr/share/man/5man/man1b/ln.1b +%%DATADIR%%/usr/share/man/5man/man1b/ls.1b +%%DATADIR%%/usr/share/man/5man/man1b/ps.1b +%%DATADIR%%/usr/share/man/5man/man1b/stty.1b +%%DATADIR%%/usr/share/man/5man/man1b/sum.1b +%%DATADIR%%/usr/share/man/5man/man1b/tr.1b +%%DATADIR%%/usr/share/man/5man/man1b/test.1b +%%DATADIR%%/usr/share/man/5man/man1m/mknod.1m +%%DATADIR%%/usr/share/man/5man/man1m/sync.1m +%%DATADIR%%/usr/share/man/5man/man5/fspec.5 +%%DATADIR%%/usr/share/man/5man/man7/man.7 +%%DATADIR%%/usr/share/man/5man/man8/catman.8 @exec umask 000; touch /var/db/spellhist +/var/db/spellhist @exec umask 066; touch /var/log/sulog +/var/log/sulog %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE/COPYING %%PORTDOCS%%%%DOCSDIR%%/LICENSE/COPYING.LGPL @@ -328,26 +490,26 @@ @dirrm %%DATADIR%%/usr/ucb @dirrm %%DATADIR%%/usr/share/man/5man/man8 @dirrm %%DATADIR%%/usr/share/man/5man/man7 -@dirrmtry %%DATADIR%%/usr/share/man/5man/man6 +@dirrm %%DATADIR%%/usr/share/man/5man/man6 @dirrm %%DATADIR%%/usr/share/man/5man/man5 -@dirrmtry %%DATADIR%%/usr/share/man/5man/man4 -@dirrmtry %%DATADIR%%/usr/share/man/5man/man3 -@dirrmtry %%DATADIR%%/usr/share/man/5man/man2 +@dirrm %%DATADIR%%/usr/share/man/5man/man4 +@dirrm %%DATADIR%%/usr/share/man/5man/man3 +@dirrm %%DATADIR%%/usr/share/man/5man/man2 @dirrm %%DATADIR%%/usr/share/man/5man/man1m @dirrm %%DATADIR%%/usr/share/man/5man/man1b @dirrm %%DATADIR%%/usr/share/man/5man/man1 @dirrm %%DATADIR%%/usr/share/man/5man @dirrm %%DATADIR%%/usr/share/man @dirrm %%DATADIR%%/usr/share +@dirrm %%DATADIR%%/usr/ccs/bin +@dirrm %%DATADIR%%/usr/ccs @dirrm %%DATADIR%%/usr/5lib/tmac @dirrm %%DATADIR%%/usr/5lib/spell @dirrm %%DATADIR%%/usr/5lib @dirrm %%DATADIR%%/usr/5bin/s42 -@dirrm %%DATADIR%%/usr/5bin/posix @dirrm %%DATADIR%%/usr/5bin/posix2001 +@dirrm %%DATADIR%%/usr/5bin/posix @dirrm %%DATADIR%%/usr/5bin -@dirrm %%DATADIR%%/usr/ccs/bin -@dirrm %%DATADIR%%/usr/ccs @dirrm %%DATADIR%%/usr @dirrm %%DATADIR%%/etc/default @dirrm %%DATADIR%%/etc