- Drop 8.x support

- Switch to options helpers
- Drop @dirrm* from plist
- Explicitly mark suid files as such in plist

Approved by:	portmgr blanket

3 files changed, 12 insertions, 47 deletions

diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile
index e37ff9682b13..910aaf1e7bc8 100644
--- a/sysutils/heirloom/Makefile
+++ b/sysutils/heirloom/Makefile
@@ -22,12 +22,6 @@ REINPLACE_SUB=	DATADIR="${DATADIR}"
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 900007
-EXTRA_PATCHES=	${FILESDIR}/extra-utmpx
-.endif
-
 SH2FIX=		maninst.sh genintro.sh crossln.sh
 
 DOC_FILES=	CHANGES LICENSE/COPYING LICENSE/LICENSE LICENSE/LUCENT \
@@ -52,14 +46,10 @@ pre-configure:
 pre-build:
 	${MAKE_CMD} -C ${WRKSRC}/libcommon -f Makefile.mk headers
 
-post-install: install-doc
-
-install-doc:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/LICENSE
-. for f in ${DOC_FILES}
+.for f in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f}
-. endfor
-.endif
+.endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/heirloom/files/extra-utmpx b/sysutils/heirloom/files/patch-utmpx
index a2465cf37063..a2465cf37063 100644
--- a/sysutils/heirloom/files/extra-utmpx
+++ b/sysutils/heirloom/files/patch-utmpx
diff --git a/sysutils/heirloom/pkg-plist b/sysutils/heirloom/pkg-plist
index 9ce2a020d0f3..dfcccb78b8e1 100644
--- a/sysutils/heirloom/pkg-plist
+++ b/sysutils/heirloom/pkg-plist
@@ -5,7 +5,7 @@
 %%DATADIR%%/usr/5bin/s42/expr
 %%DATADIR%%/usr/5bin/s42/nl
 %%DATADIR%%/usr/5bin/s42/priocntl
-%%DATADIR%%/usr/5bin/s42/ps
+@(,,4755) %%DATADIR%%/usr/5bin/s42/ps
 %%DATADIR%%/usr/5bin/s42/sed
 %%DATADIR%%/usr/5bin/s42/wc
 %%DATADIR%%/usr/5bin/s42/csplit
@@ -66,7 +66,7 @@
 %%DATADIR%%/usr/5bin/posix/od
 %%DATADIR%%/usr/5bin/posix/pg
 %%DATADIR%%/usr/5bin/posix/pr
-%%DATADIR%%/usr/5bin/posix/ps
+@(,,4755) %%DATADIR%%/usr/5bin/posix/ps
 %%DATADIR%%/usr/5bin/posix/rm
 %%DATADIR%%/usr/5bin/posix/rmdir
 %%DATADIR%%/usr/5bin/posix/sed
@@ -207,7 +207,7 @@
 %%DATADIR%%/usr/5bin/printenv
 %%DATADIR%%/usr/5bin/printf
 %%DATADIR%%/usr/5bin/priocntl
-%%DATADIR%%/usr/5bin/ps
+@(,,4755) %%DATADIR%%/usr/5bin/ps
 %%DATADIR%%/usr/5bin/pwd
 %%DATADIR%%/usr/5bin/random
 %%DATADIR%%/usr/5bin/renice
@@ -222,7 +222,7 @@
 %%DATADIR%%/usr/5bin/split
 %%DATADIR%%/usr/5bin/stty
 %%DATADIR%%/usr/5bin/STTY
-%%DATADIR%%/usr/5bin/su
+@(,,4755) %%DATADIR%%/usr/5bin/su
 %%DATADIR%%/usr/5bin/sum
 %%DATADIR%%/usr/5bin/sync
 %%DATADIR%%/usr/5bin/tabs
@@ -285,7 +285,7 @@
 %%DATADIR%%/usr/ucb/groups
 %%DATADIR%%/usr/ucb/ln
 %%DATADIR%%/usr/ucb/ls
-%%DATADIR%%/usr/ucb/ps
+@(,,4755) %%DATADIR%%/usr/ucb/ps
 %%DATADIR%%/usr/ucb/stty
 %%DATADIR%%/usr/ucb/sum
 %%DATADIR%%/usr/ucb/test
@@ -485,32 +485,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE/README
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/intro.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/LICENSE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/usr/ucb
-@dirrm %%DATADIR%%/usr/share/man/5man/man8
-@dirrm %%DATADIR%%/usr/share/man/5man/man7
-@dirrm %%DATADIR%%/usr/share/man/5man/man6
-@dirrm %%DATADIR%%/usr/share/man/5man/man5
-@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/posix2001
-@dirrm %%DATADIR%%/usr/5bin/posix
-@dirrm %%DATADIR%%/usr/5bin
-@dirrm %%DATADIR%%/usr
-@dirrm %%DATADIR%%/etc/default
-@dirrm %%DATADIR%%/etc
-@dirrm %%DATADIR%%
+@dir %%DATADIR%%/usr/share/man/5man/man6
+@dir %%DATADIR%%/usr/share/man/5man/man4
+@dir %%DATADIR%%/usr/share/man/5man/man3
+@dir %%DATADIR%%/usr/share/man/5man/man2