Use `cpio' over `tar' in order to force ownership to a sane value.

Submitted by:	Christian Weisgerber <naddy@mips.inka.de>

Dynamically generate the PLIST so I don't have to do the version chase
on every update.

2 files changed, 60 insertions, 192 deletions

diff --git a/lang/compaq-cc/Makefile b/lang/compaq-cc/Makefile
index e167b38dca58..d1cfda17d2dc 100644
--- a/lang/compaq-cc/Makefile
+++ b/lang/compaq-cc/Makefile
@@ -27,7 +27,12 @@ BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 ONLY_FOR_ARCHS=	alpha
 
 PREFIX=		/
-CCC_ROOT=	${PREFIX}/usr/lib/compaq/ccc-6.2.9.506-1
+LIBOTS_REV=	libots-2.2.7
+CPML_REV=	cpml-5.1.0
+CCC_REV=	ccc-6.2.9.506-1
+CCC_DIR=	usr/lib/compaq/${CCC_REV}
+CCC_ROOT=	${PREFIX}/${CCC_DIR}
+PLIST_SUB=	CCC_REV=${CCC_REV} CPML_REV=${CPML_REV} LIBOTS_REV=${LIBOTS_REV}
 EXTRACT_CMD=		rpm2cpio
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|cpio -idum
@@ -49,7 +54,7 @@ do-install:
 		};\
 	fi
 .for F in ${DISTFILES}
-	cd ${PREFIX} ; rpm2cpio ${DISTDIR}/$F |cpio -idum
+	cd ${PREFIX} ; rpm2cpio ${DISTDIR}/$F |cpio -idum -R root:wheel
 .endfor
 .for F in ${CCC_ROOT}/alpha-linux/bin/lnxcc \
 	${CCC_ROOT}/alpha-linux/bin/lnxcc_driver
@@ -87,17 +92,17 @@ do-install:
 	${MKDIR} ${CCC_ROOT}/alpha-freebsd/include
 	${MKDIR} ${CCC_ROOT}/alpha-freebsd/lib
 	cd ${FILESDIR}/include ; \
-		tar  --exclude CVS -cf - . \
-		|(cd ${CCC_ROOT}/alpha-freebsd/include ; tar xpBf -)
+		find . -print0 \
+		| cpio -dump0 -R root:wheel ${CCC_ROOT}/alpha-freebsd/include
 	cd ${CCC_ROOT}/alpha-freebsd/include ; ${LN} -sf machine/stdarg.h .
 
 post-install:
 # fixup PLIST for the FreeBSD bits
 	cd ${PREFIX} ;\
-	    find ${CCC_ROOT}/alpha-freebsd -type f -o -type l \
+	    find ${CCC_DIR}/alpha-freebsd -type f -o -type l \
 	    					>${WRKDIR}/PLIST.alpha-freebsd
 	cd ${PREFIX} ;\
-	    find ${CCC_ROOT}/alpha-freebsd -type d \
+	    find ${CCC_DIR}/alpha-freebsd -type d \
 	    | sed -e 's/^/@dirrm /g' \
 	    | sort -r				>>${WRKDIR}/PLIST.alpha-freebsd
 	${ECHO} "r ${TMPPLIST}"				>  ${WRKDIR}/ex.script
@@ -107,5 +112,35 @@ post-install:
 	${ECHO} "x!"					>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-alpha-freebsd
 	cd ${WRKDIR} ; ex < ex.script
+# fixup PLIST for the AlphaLinux bits
+	cd ${PREFIX} ;\
+	    find ${CCC_DIR}/alpha-linux -type f -o -type l \
+	    					>${WRKDIR}/PLIST.alphalinux
+	cd ${PREFIX} ;\
+	    find ${CCC_DIR}/alpha-linux -type d \
+	    | sed -e 's/^/@dirrm /g' \
+	    | sort -r				>>${WRKDIR}/PLIST.alphalinux
+	${ECHO} "r ${TMPPLIST}"				>  ${WRKDIR}/ex.script2
+	${ECHO} "/Insert PLIST.alphalinux"		>> ${WRKDIR}/ex.script2
+	${ECHO} "d"					>> ${WRKDIR}/ex.script2
+	${ECHO} "r ${WRKDIR}/PLIST.alphalinux"		>> ${WRKDIR}/ex.script2
+	${ECHO} "x!"					>> ${WRKDIR}/ex.script2
+	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-alphalinux
+	cd ${WRKDIR} ; ex < ex.script2
+# fixup PLIST for the docs bits
+	cd ${PREFIX} ;\
+	    find usr/doc/${CCC_REV:C/-1$//} -type f -o -type l \
+	    					>${WRKDIR}/PLIST.docs
+	cd ${PREFIX} ;\
+	    find usr/doc/${CCC_REV:C/-1$//} -type d \
+	    | sed -e 's/^/@dirrm /g' \
+	    | sort -r				>>${WRKDIR}/PLIST.docs
+	${ECHO} "r ${TMPPLIST}"				>  ${WRKDIR}/ex.script3
+	${ECHO} "/Insert PLIST.docs"			>> ${WRKDIR}/ex.script3
+	${ECHO} "d"					>> ${WRKDIR}/ex.script3
+	${ECHO} "r ${WRKDIR}/PLIST.docs"		>> ${WRKDIR}/ex.script3
+	${ECHO} "x!"					>> ${WRKDIR}/ex.script3
+	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-docs
+	cd ${WRKDIR} ; ex < ex.script3
 
 .include <bsd.port.mk>
diff --git a/lang/compaq-cc/pkg-plist b/lang/compaq-cc/pkg-plist
index e56e4032207c..63ca94612a88 100644
--- a/lang/compaq-cc/pkg-plist
+++ b/lang/compaq-cc/pkg-plist
@@ -1,164 +1,13 @@
 @comment $FreeBSD$
 @comment ccc RPM
 usr/bin/ccc
-usr/doc/ccc-6.2.9.504/1_800_at_compaq.gif
-usr/doc/ccc-6.2.9.504/COPYING
-usr/doc/ccc-6.2.9.504/Language_Reference/compaqn2.gif
-usr/doc/ccc-6.2.9.504/Language_Reference/lrm.pdf
-usr/doc/ccc-6.2.9.504/Language_Reference/lrm.txt
-usr/doc/ccc-6.2.9.504/Language_Reference/penguin.gif
-usr/doc/ccc-6.2.9.504/Language_Reference/penguin.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title001.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title002.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title003.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title004.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title005.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title006.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title007.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title008.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title009.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title010.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title011.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title012.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title013.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title014.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title015.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title016.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title017.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title018.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title019.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title020.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title021.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title022.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title023.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title024.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title025.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title026.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title027.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title028.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/title029.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlei01.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlei02.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlei03.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlei04.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlei05.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titleidx.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlet01.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlet02.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titlet03.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/titletoc.htm
-usr/doc/ccc-6.2.9.504/Language_Reference/zk-8422a.gif
-usr/doc/ccc-6.2.9.504/Programmers_Guide/BUTTONS.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/CMPLRCHP.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/CNFGKRNL.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/COMPAQN2.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/DBGGRCHP.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_001.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_004.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_005.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_006.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_007.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_008.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_009.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_010.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_011.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_012.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_013.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_014.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_015.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FIGU_016.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/FOOTNOTE.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/HELP.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/HELP.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/HELP2.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/HELP3.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/HLPSMALL.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/INDEX.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/INDEX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/INDEX2.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/INDEX3.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/LNTCHPXX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/NCH0001X.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/NTRCHPXX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/PENGUIN.GIF
-usr/doc/ccc-6.2.9.504/Programmers_Guide/PNTRPPXX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/PPCHPXXX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/PRFCHPXX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/PRGMCHPX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/PTMZCHPX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/SHLBCHPX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/SYSVPPND.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/THRDDGRC.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/THRDSCHP.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/TITLE.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/TITLETXT.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/TMCHPXXX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/TOC.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/XCPTCHPX.HTM
-usr/doc/ccc-6.2.9.504/Programmers_Guide/prog_guide.pdf
-usr/doc/ccc-6.2.9.504/README
-usr/doc/ccc-6.2.9.504/README.htm
-usr/doc/ccc-6.2.9.504/README.pdf
-usr/doc/ccc-6.2.9.504/README.txt
-usr/doc/ccc-6.2.9.504/arrow.gif
-usr/doc/ccc-6.2.9.504/cinset.gif
-usr/doc/ccc-6.2.9.504/compaq.gif
-usr/doc/ccc-6.2.9.504/compaqn2.gif
-usr/doc/ccc-6.2.9.504/ctitle.gif
-usr/doc/ccc-6.2.9.504/dot.gif
-usr/doc/ccc-6.2.9.504/index.htm
-usr/doc/ccc-6.2.9.504/penguin.gif
-usr/doc/ccc-6.2.9.504/penguin.htm
-usr/doc/ccc-6.2.9.504/readme.htm
-usr/doc/ccc-6.2.9.504/readme_contents.htm
-usr/doc/ccc-6.2.9.504/top_nav.gif
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/__DECC_include_epilogue.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/__DECC_include_prologue.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/as
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/ccc
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/comp.config
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/comp.config.ORIG
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/cpp.Linux-bad
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/cpp
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/create-comp-config.sh
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/crt1.o
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/crtbegin.o
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/crtend.o
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/crti.o
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/crtn.o
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/gcrt1.o
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/ld.Linux-bad
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/ld
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/lnxcc
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/lnxcc_driver
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/lnxcc_driver.Linux
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/probe_linux.sh
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/protect_headers_setup.sh
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/alpha/builtins.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/ansidecl.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/c_asm.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/cvt.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/glob.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/gnu/types.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/libio.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/machine
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/malloc.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/nan.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/resourcebits.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/stdarg.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/stdbool.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/stddef.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/stdio.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/sys/cdefs.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/sys/sysmacros.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/sys/types.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/va_list.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/varargs.h
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man/man1/ccc.1
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man/man8/protect_headers_setup.8
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man/rsml
-usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man/sml
+@comment Insert PLIST.docs here
+@comment -=[ begin PLIST.docs ]=-
+@comment -=[ end PLIST.docs ]=-
+@dirrm usr/doc
+@comment Insert PLIST.alphalinux here
+@comment -=[ begin PLIST.alphalinux ]=-
+@comment -=[ end PLIST.alphalinux ]=-
 usr/man/man1/ccc.1
 usr/man/man8/protect_headers_setup.8
 usr/man/rsml
@@ -166,39 +15,23 @@ usr/man/sml
 @comment Insert PLIST.alpha-freebsd here
 @comment -=[ begin PLIST.alpha-freebsd ]=-
 @comment -=[ end PLIST.alpha-freebsd ]=-
-@unexec rm -f %D/usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/as
-@unexec rm -f %D/usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/cpp
-@unexec rm -f %D/usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin/ld
-@unexec rm -f %D/usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/machine
-@dirrm usr/doc/ccc-6.2.9.504/Language_Reference
-@dirrm usr/doc/ccc-6.2.9.504/Programmers_Guide
-@dirrm usr/doc/ccc-6.2.9.504
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/bin
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/alpha
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/gnu
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include/sys
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/include
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man/man1
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man/man8
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux/man
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2/alpha-linux
-@dirrm usr/lib/compaq/ccc-6.2.9.504-2
+@dirrm usr/lib/compaq/%%CCC_REV%%
 @comment libots RPM
-usr/lib/compaq/libots-2.2.7/README
-usr/lib/compaq/libots-2.2.7/libots.a
-usr/lib/compaq/libots-2.2.7/libots.so
+usr/lib/compaq/%%LIBOTS_REV%%/README
+usr/lib/compaq/%%LIBOTS_REV%%/libots.a
+usr/lib/compaq/%%LIBOTS_REV%%/libots.so
 usr/lib/libots.a
 @comment usr/lib/libots.so
-@dirrm usr/lib/compaq/libots-2.2.7
+@dirrm usr/lib/compaq/%%LIBOTS_REV%%
 @comment cpml RPM
-usr/doc/cpml-5.1.0/README
-usr/doc/cpml-5.1.0/Release_Notes-5.1.0
+usr/doc/%%CPML_REV%%/README
+usr/doc/%%CPML_REV%%/Release_Notes-5.1.0
 usr/include/cpml.h
-usr/lib/compaq/cpml-5.1.0/cpml.h
-usr/lib/compaq/cpml-5.1.0/libcpml_ev5.a
-usr/lib/compaq/cpml-5.1.0/libcpml_ev5.so
+usr/lib/compaq/%%CPML_REV%%/cpml.h
+usr/lib/compaq/%%CPML_REV%%/libcpml_ev5.a
+usr/lib/compaq/%%CPML_REV%%/libcpml_ev5.so
 usr/lib/libcpml.a
 @comment usr/lib/libcpml.so
-@dirrm usr/doc/cpml-5.1.0
-@dirrm usr/lib/compaq/cpml-5.1.0
+@dirrm usr/doc/%%CPML_REV%%
+@dirrm usr/lib/compaq/%%CPML_REV%%
 @dirrm usr/lib/compaq