Subject: pkg/7545: pkgsrc/INDEX is made with wrong format
To: None <gnats-bugs@gnats.netbsd.org>
From: NAKAJIMA Yoshihiro <nakayosh@kcn.ne.jp>
List: netbsd-bugs
Date: 05/10/1999 07:50:57
>Number: 7545
>Category: pkg
>Synopsis: pkgsrc/INDEX is made with wrong format
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager (NetBSD software packages system bug manager)
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon May 10 07:50:01 1999
>Last-Modified:
>Originator: NAKAJIMA Yoshihiro
>Organization:
>Release: 19990507
>Environment:
System: NetBSD asura 1.4 NetBSD 1.4 (ASURA) #0: Sat May 8 13:19:43 JST 1999 nakayosh@asura:/usr/src/sys/arch/i386/compile/ASURA i386
>Description:
pkgsrc/INDEX is made with wrong format.
1. `===> ...' is contained.
2. package-depends is expressed as multiple line format.
>How-To-Repeat:
% cd /usr/pkgsrc
% make index
% cat INDEX
(snip)
===> package audio/festlex-cmu
festlex-cmu-1.3.1|/usr/pkgsrc/audio/festlex-cmu|/usr/pkg|CMU American English pronounciation dictionary for Festival|/usr/pkgsrc/audio/festlex-cmu/pkg/DESCR|proff@iq.org|audio|festival-1.3.1 gmake-3.77 nas-1.2.5|festival-1.3.1
nas-1.2.5|any|any
(snip)
>Fix:
diff -u pkgsrc/mk/bsd.pkg.mk.ORIG pkgsrc/mk/bsd.pkg.mk
--- pkgsrc/mk/bsd.pkg.mk.ORIG Wed May 5 20:30:20 1999
+++ pkgsrc/mk/bsd.pkg.mk Mon May 10 22:47:24 1999
@@ -2070,7 +2070,7 @@
${ECHO} -n "|"; \
case "A${RUN_DEPENDS}B${DEPENDS}C" in \
ABC) ;; \
- *) cd ${.CURDIR} && ${ECHO} -n "`${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true|sort -u`";; \
+ *) cd ${.CURDIR} && ${ECHO} -n `${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true|sort -u`;; \
esac; \
${ECHO} -n "|"; \
if [ "${ONLY_FOR_ARCHS}" = "" ]; then \
diff -u pkgsrc/mk/bsd.pkg.subdir.mk.ORIG pkgsrc/mk/bsd.pkg.subdir.mk
--- pkgsrc/mk/bsd.pkg.subdir.mk.ORIG Sun Mar 28 21:41:31 1999
+++ pkgsrc/mk/bsd.pkg.subdir.mk Mon May 10 22:22:21 1999
@@ -65,7 +65,7 @@
for dud in ${DUDS}; do \
if [ $${dud} = $${entry} ]; then \
OK="false"; \
- ${ECHO} "===> ${_THISDIR_}$${entry} skipped"; \
+ ${ECHO_MSG} "===> ${_THISDIR_}$${entry} skipped"; \
fi; \
done; \
if [ -d ${.CURDIR}/$${entry}.${MACHINE} ]; then \
@@ -74,16 +74,16 @@
edir=$${entry}; \
else \
OK="false"; \
- ${ECHO} "===> ${_THISDIR_}$${entry} non-existent"; \
+ ${ECHO_MSG} "===> ${_THISDIR_}$${entry} non-existent"; \
fi; \
if [ "$$OK" = "" ]; then \
cd ${.CURDIR}/$${edir}; \
if [ -z "${_THISDIR_}" -a ! -d "files" ]; then \
- ${ECHO} "===> category ${_THISDIR_}$${edir}"; \
+ ${ECHO_MSG} "===> category ${_THISDIR_}$${edir}"; \
${MAKE} ${.TARGET:realinstall=install} \
"_THISDIR_=${_THISDIR_}$${edir}/"; \
else \
- ${ECHO} "===> package ${_THISDIR_}$${edir}"; \
+ ${ECHO_MSG} "===> package ${_THISDIR_}$${edir}"; \
${MAKE} ${.TARGET:realinstall=install} \
"_THISDIR_=${_THISDIR_}$${edir}/" || /usr/bin/true ; \
fi ; \
@@ -173,7 +173,7 @@
${MV} $@.BAK $@ ; \
${RM} $@.tmp4 ; \
else \
- ${ECHO} "===> Creating README.html for ${_THISDIR_}${.CURDIR:T}" ; \
+ ${ECHO_MSG} "===> Creating README.html for ${_THISDIR_}${.CURDIR:T}" ; \
${MV} $@.tmp4 $@ ; \
${RM} -f $@.BAK ; \
fi
>Audit-Trail:
>Unformatted: