diff options
author | frueauf <frueauf> | 1998-03-08 14:25:52 +0000 |
---|---|---|
committer | frueauf <frueauf> | 1998-03-08 14:25:52 +0000 |
commit | 855324ee5ac47e7982f09855af6f9366c6d79ee0 (patch) | |
tree | 4de27759f622536fac3ca7e0f55e841affe672af /mk | |
parent | 3f0a388c859d3596638f5dd179117405ae3e9069 (diff) | |
download | pkgsrc-855324ee5ac47e7982f09855af6f9366c6d79ee0.tar.gz |
Introduce "Arch:" field in INDEX to handle the ONLY_FOR_ARCHS case better.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 12 | ||||
-rw-r--r-- | mk/bsd.port.mk | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 00ef716adc5..3a15eb551b1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.55 1998/03/07 21:19:00 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.56 1998/03/08 14:25:52 frueauf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -934,7 +934,7 @@ package: .if !defined(__ARCH_OK) .MAIN: all -fetch fetch-list extract patch configure build install reinstall package describe checkpatch checksum makesum all: +fetch fetch-list extract patch configure build install reinstall package checkpatch checksum makesum all: @echo "This port is only for ${ONLY_FOR_ARCHS}," @echo "and you are running ${MACHINE_ARCH}." .else @@ -1843,7 +1843,7 @@ depends-list: # a large index. Format is: # # distribution-name|port-path|installation-prefix|comment| \ -# description-file|maintainer|categories|build deps|run deps +# description-file|maintainer|categories|build deps|run deps|for arch # .if !target(describe) describe: @@ -1869,6 +1869,12 @@ describe: ABCD) ;; \ *) cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort -u`;; \ esac; \ + ${ECHO} -n "|"; \ + if [ "${ONLY_FOR_ARCHS}" = "" ]; then \ + ${ECHO} -n "any"; \ + else \ + ${ECHO} -n "${ONLY_FOR_ARCHS}"; \ + fi; \ ${ECHO} "" .endif diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index d341ea97e28..85bd663c7db 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.55 1998/03/07 21:19:00 hubertf Exp $ +# $NetBSD: bsd.port.mk,v 1.56 1998/03/08 14:25:52 frueauf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -934,7 +934,7 @@ package: .if !defined(__ARCH_OK) .MAIN: all -fetch fetch-list extract patch configure build install reinstall package describe checkpatch checksum makesum all: +fetch fetch-list extract patch configure build install reinstall package checkpatch checksum makesum all: @echo "This port is only for ${ONLY_FOR_ARCHS}," @echo "and you are running ${MACHINE_ARCH}." .else @@ -1843,7 +1843,7 @@ depends-list: # a large index. Format is: # # distribution-name|port-path|installation-prefix|comment| \ -# description-file|maintainer|categories|build deps|run deps +# description-file|maintainer|categories|build deps|run deps|for arch # .if !target(describe) describe: @@ -1869,6 +1869,12 @@ describe: ABCD) ;; \ *) cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort -u`;; \ esac; \ + ${ECHO} -n "|"; \ + if [ "${ONLY_FOR_ARCHS}" = "" ]; then \ + ${ECHO} -n "any"; \ + else \ + ${ECHO} -n "${ONLY_FOR_ARCHS}"; \ + fi; \ ${ECHO} "" .endif |