diff options
| author | obache <obache@pkgsrc.org> | 2015-02-02 12:32:49 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2015-02-02 12:32:49 +0000 |
| commit | e6d695180b48202019160c1f3d33d6eb595caa22 (patch) | |
| tree | 6a00c0349f435b5ef59f2ec3bcbef43339a1acb8 /mk/pkgformat | |
| parent | c0c2d2c34d313de42b9e693508cb3024d9941d13 (diff) | |
| download | pkgsrc-e6d695180b48202019160c1f3d33d6eb595caa22.tar.gz | |
Revert
introduce MESSAGE_SRC_DFLT, same as PLIST_SRC_DFLT for PLIST_SRC.
proposed/discussed is required for such changes.
Diffstat (limited to 'mk/pkgformat')
| -rw-r--r-- | mk/pkgformat/pkg/metadata.mk | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index 07b36d72c88..ee613fcbf00 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.9 2014/11/02 06:17:39 obache Exp $ +# $NetBSD: metadata.mk,v 1.10 2015/02/02 12:32:49 obache Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -207,25 +207,26 @@ ${_DESCR_FILE}: ${DESCR_SRC} ### This file contains important messages which apply to this package, ### and are shown during installation. ### -.if exists(${PKGDIR}/MESSAGE) -MESSAGE_SRC_DFLT= ${PKGDIR}/MESSAGE -.else -. if exists(${PKGDIR}/MESSAGE.common) -MESSAGE_SRC_DFLT= ${PKGDIR}/MESSAGE.common -. endif -. if exists(${PKGDIR}/MESSAGE.${OPSYS}) -MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${OPSYS} -. endif -. if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}) -MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g} -. endif -. if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) -MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} +.if !defined(MESSAGE_SRC) +. if exists(${PKGDIR}/MESSAGE) +MESSAGE_SRC= ${PKGDIR}/MESSAGE +. else +. if exists(${PKGDIR}/MESSAGE.common) +MESSAGE_SRC= ${PKGDIR}/MESSAGE.common +. endif +. if exists(${PKGDIR}/MESSAGE.${OPSYS}) +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS} +. endif +. if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}) +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g} +. endif +. if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}) +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g} +. endif . endif .endif -MESSAGE_SRC?= ${MESSAGE_SRC_DFLT} -.if !empty(MESSAGE_SRC) +.if defined(MESSAGE_SRC) _MESSAGE_FILE= ${PKG_DB_TMPDIR}/+DISPLAY _METADATA_TARGETS+= ${_MESSAGE_FILE} |