Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk Pass 1 of SYSPKG changes to automatically add tags=...
details: https://anonhg.NetBSD.org/src/rev/4207f20fbfec
branches: trunk
changeset: 538564:4207f20fbfec
user: perry <perry%NetBSD.org@localhost>
date: Tue Oct 22 18:48:27 2002 +0000
description:
Pass 1 of SYSPKG changes to automatically add tags=pkgname_pkg to METALOG.
Not quite ready for prime time yet.
diffstat:
share/mk/bsd.doc.mk | 4 ++--
share/mk/bsd.files.mk | 4 ++--
share/mk/bsd.inc.mk | 6 +++---
share/mk/bsd.info.mk | 4 ++--
share/mk/bsd.kinc.mk | 11 ++++++-----
share/mk/bsd.kmod.mk | 4 ++--
share/mk/bsd.lib.mk | 35 ++++++++++++++++++++---------------
share/mk/bsd.links.mk | 6 +++---
share/mk/bsd.man.mk | 10 +++++-----
share/mk/bsd.nls.mk | 4 ++--
share/mk/bsd.own.mk | 4 +++-
share/mk/bsd.prog.mk | 6 +++---
12 files changed, 53 insertions(+), 45 deletions(-)
diffs (truncated from 336 to 300 lines):
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.doc.mk
--- a/share/mk/bsd.doc.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.doc.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.doc.mk,v 1.57 2002/02/11 21:14:58 mycroft Exp $
+# $NetBSD: bsd.doc.mk,v 1.58 2002/10/22 18:48:27 perry Exp $
# @(#)bsd.doc.mk 8.1 (Berkeley) 8/14/93
.include <bsd.init.mk>
@@ -34,7 +34,7 @@
.if ${MKDOC} != "no"
__docinstall: .USE
- ${INSTALL_FILE} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
+ ${INSTALL_FILE} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} ${SYSPKGTAG} \
${.ALLSRC} ${.TARGET}
FILES?= ${SRCS}
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.files.mk
--- a/share/mk/bsd.files.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.files.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.files.mk,v 1.19 2002/04/24 08:18:52 lukem Exp $
+# $NetBSD: bsd.files.mk,v 1.20 2002/10/22 18:48:27 perry Exp $
.if !target(__fileinstall)
##### Basic targets
@@ -19,7 +19,7 @@
-o ${FILESOWN_${.ALLSRC:T}:U${FILESOWN}} \
-g ${FILESGRP_${.ALLSRC:T}:U${FILESGRP}} \
-m ${FILESMODE_${.ALLSRC:T}:U${FILESMODE}} \
- ${.ALLSRC} ${.TARGET}
+ ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
.endif # !target(__fileinstall)
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.inc.mk
--- a/share/mk/bsd.inc.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.inc.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.inc.mk,v 1.22 2002/02/11 21:14:58 mycroft Exp $
+# $NetBSD: bsd.inc.mk,v 1.23 2002/10/22 18:48:27 perry Exp $
##### Basic targets
.PHONY: incinstall
@@ -11,9 +11,9 @@
__incinstall: .USE
@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
(echo "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
- -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}" && \
+ -m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
- -m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
+ -m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET})
.for F in ${INCS:O:u}
_FDIR:= ${INCSDIR_${F:C,/,_,g}:U${INCSDIR}} # dir override
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.info.mk
--- a/share/mk/bsd.info.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.info.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.info.mk,v 1.26 2002/03/01 15:42:10 pk Exp $
+# $NetBSD: bsd.info.mk,v 1.27 2002/10/22 18:48:27 perry Exp $
.include <bsd.init.mk>
@@ -41,7 +41,7 @@
-o ${INFOOWN_${.ALLSRC:T}:U${INFOOWN}} \
-g ${INFOGRP_${.ALLSRC:T}:U${INFOGRP}} \
-m ${INFOMODE_${.ALLSRC:T}:U${INFOMODE}} \
- ${.ALLSRC} ${.TARGET}
+ ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
@[ -f ${INFODIRFILE} ] && \
while ! ln ${INFODIRFILE} ${INFODIRFILE}.lock 2> /dev/null; \
do sleep 1; done; \
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.kinc.mk
--- a/share/mk/bsd.kinc.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.kinc.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kinc.mk,v 1.23 2002/08/24 13:12:38 lukem Exp $
+# $NetBSD: bsd.kinc.mk,v 1.24 2002/10/22 18:48:27 perry Exp $
# System configuration variables:
#
@@ -66,16 +66,17 @@
@if [ ! -d ${.TARGET} ] || [ -h ${.TARGET} ] ; then \
echo creating ${.TARGET}; \
/bin/rm -rf ${.TARGET}; \
- ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 ${.TARGET}; \
+ ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${SYSPKGTAG} ${.TARGET}; \
fi
# -c is forced on here, in order to preserve modtimes for "make depend"
__incinstall: .USE
@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
(echo "${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
- -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}" && \
+ -m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
${INSTALL_FILE:N-c} -c -o ${BINOWN} -g ${BINGRP} \
- -m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
+ -m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET})
.for F in ${INCS:O:u} ${DEPINCS:O:u}
_F:= ${DESTDIR}${INCSDIR}/${F} # installed path
@@ -107,7 +108,7 @@
fi; \
fi; \
echo "$$t -> $$l"; \
- ${INSTALL_SYMLINK} $$l $$t; \
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
done; )
.endif
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.kmod.mk
--- a/share/mk/bsd.kmod.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.kmod.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmod.mk,v 1.55 2002/07/29 07:42:52 jdolecek Exp $
+# $NetBSD: bsd.kmod.mk,v 1.56 2002/10/22 18:48:28 perry Exp $
.include <bsd.init.mk>
@@ -74,7 +74,7 @@
.endif
.endif
${INSTALL_FILE} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
- ${.ALLSRC} ${.TARGET}
+ ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
kmodinstall:: ${_PROG}
.PRECIOUS: ${_PROG} # keep if install fails
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.lib.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.207 2002/09/27 21:37:56 thorpej Exp $
+# $NetBSD: bsd.lib.mk,v 1.208 2002/10/22 18:48:28 perry Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -379,10 +379,10 @@
__archiveinstall: .USE
${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${UPDATE:D:U-a "${RANLIB} -t"} ${.ALLSRC} ${.TARGET}
+ ${UPDATE:D:U-a "${RANLIB} -t"} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
__archivesymlinkpic: .USE
- ${INSTALL_SYMLINK} ${.ALLSRC} ${.TARGET}
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
DPSRCS+= ${SRCS:M*.[ly]:C/\..$/.c/}
CLEANFILES+= ${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
@@ -530,27 +530,32 @@
${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_FULLVERSION}
.endif
${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${.ALLSRC} ${.TARGET}
+ ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
.if ${_LIBSODIR} != ${LIBDIR}
- ${INSTALL_SYMLINK} ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
- ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} \
+ ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
.endif
.if ${OBJECT_FMT} == "a.out" && !defined(DESTDIR)
/sbin/ldconfig -m ${_LIBSODIR} ${LIBDIR}
.endif
.if ${OBJECT_FMT} == "ELF"
- ${INSTALL_SYMLINK} lib${LIB}.so.${SHLIB_FULLVERSION} \
- ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} \
+ lib${LIB}.so.${SHLIB_FULLVERSION} \
+ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
.if ${_LIBSODIR} != ${LIBDIR}
- ${INSTALL_SYMLINK} ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
- ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} \
+ ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+ ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
.endif
.if ${MKLINKLIB} != "no"
- ${INSTALL_SYMLINK} lib${LIB}.so.${SHLIB_FULLVERSION} \
- ${DESTDIR}${_LIBSODIR}/lib${LIB}.so
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} \
+ lib${LIB}.so.${SHLIB_FULLVERSION} \
+ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so
.if ${_LIBSODIR} != ${LIBDIR}
- ${INSTALL_SYMLINK} ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
- ${DESTDIR}${LIBDIR}/lib${LIB}.so
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} \
+ ${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
+ ${DESTDIR}${LIBDIR}/lib${LIB}.so
.endif
.endif
.endif
@@ -572,7 +577,7 @@
${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
.endif
${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
+ ${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
.endif
.endif
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.links.mk
--- a/share/mk/bsd.links.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.links.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.links.mk,v 1.20 2002/08/24 13:12:38 lukem Exp $
+# $NetBSD: bsd.links.mk,v 1.21 2002/10/22 18:48:28 perry Exp $
##### Basic targets
.PHONY: linksinstall
@@ -22,7 +22,7 @@
fi; \
fi; \
echo "$$t -> $$l"; \
- ${INSTALL_SYMLINK} $$l $$t; \
+ ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
done; )
.endif
.if !empty(LINKS)
@@ -34,7 +34,7 @@
echo "realall: $$t"; \
echo "$$t!"; \
echo " @echo \"$$t -> $$l\""; \
- echo " @${INSTALL_LINK} $$l $$t"; \
+ echo " @${INSTALL_LINK} ${SYSPKGTAG} $$l $$t"; \
done; \
) | ${MAKE} -f- all
.endif
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.man.mk
--- a/share/mk/bsd.man.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.man.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.man.mk,v 1.78 2002/02/11 21:15:00 mycroft Exp $
+# $NetBSD: bsd.man.mk,v 1.79 2002/10/22 18:48:28 perry Exp $
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
.include <bsd.init.mk>
@@ -45,9 +45,9 @@
__installpage: .USE
@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
(echo "${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
- ${.ALLSRC} ${.TARGET}" && \
+ ${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET}" && \
${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
- ${.ALLSRC} ${.TARGET})
+ ${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET})
##### Build and install rules (source form pages)
@@ -96,7 +96,7 @@
t=$${dir}${MANSUBDIR}/$${name}${MANSUFFIX}; \
if test $$l -nt $$t -o ! -f $$t; then \
echo $$t -\> $$l; \
- ${INSTALL_LINK} $$l $$t; \
+ ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
fi; \
done
.endif
@@ -153,7 +153,7 @@
t=$${dir}${MANSUBDIR}/$${name%.*}.0${MANSUFFIX}; \
if test $$l -nt $$t -o ! -f $$t; then \
echo $$t -\> $$l; \
- ${INSTALL_LINK} $$l $$t; \
+ ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
fi; \
done
.endif
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.nls.mk
--- a/share/mk/bsd.nls.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.nls.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.nls.mk,v 1.37 2002/02/11 21:15:01 mycroft Exp $
+# $NetBSD: bsd.nls.mk,v 1.38 2002/10/22 18:48:29 perry Exp $
.include <bsd.init.mk>
@@ -35,7 +35,7 @@
__nlsinstall: .USE
${INSTALL_FILE} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} \
- ${.ALLSRC} ${.TARGET}
+ ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
.for F in ${NLSALL:O:u}
_F:= ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat # installed path
diff -r c84466168f36 -r 4207f20fbfec share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Tue Oct 22 18:15:52 2002 +0000
+++ b/share/mk/bsd.own.mk Tue Oct 22 18:48:27 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.315 2002/09/27 21:37:57 thorpej Exp $
+# $NetBSD: bsd.own.mk,v 1.316 2002/10/22 18:48:29 perry Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
Home |
Main Index |
Thread Index |
Old Index