Sun Mar 11 10:44:43 2012 UTC ()
Pullup ticket #3697 - requested by tron
mk/plist: fix for handling of man pages

Revisions pulled up:
- mk/plist/plist.mk                                             1.41

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Mar  4 08:03:56 UTC 2012

   Modified Files:
   	pkgsrc/mk/plist: plist.mk

   Log Message:
   Don't strip out "cat" manual pages if the package gets built via "imake".
   The settings in "MANINSTALL" don't apply here.

   To generate a diff of this commit:
   cvs rdiff -u -r1.40 -r1.41 pkgsrc/mk/plist/plist.mk


(spz)
diff -r1.40 -r1.40.4.1 pkgsrc/mk/plist/plist.mk
cvs diff -r1.40 -r1.40.4.1 pkgsrc/mk/plist/plist.mk (expand / switch to unified diff)

--- pkgsrc/mk/plist/plist.mk 2011/09/08 20:17:16 1.40
+++ pkgsrc/mk/plist/plist.mk 2012/03/11 10:44:42 1.40.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: plist.mk,v 1.40 2011/09/08 20:17:16 abs Exp $ 1# $NetBSD: plist.mk,v 1.40.4.1 2012/03/11 10:44:42 spz Exp $
2# 2#
3# This Makefile fragment handles the creation of PLISTs for use by 3# This Makefile fragment handles the creation of PLISTs for use by
4# pkg_create(8). 4# pkg_create(8).
5# 5#
6# The following variables affect the PLIST generation: 6# The following variables affect the PLIST generation:
7# 7#
8# PLIST_TYPE specifies whether the generated PLIST is derived 8# PLIST_TYPE specifies whether the generated PLIST is derived
9# automatically from the installed files, or if the PLIST entries 9# automatically from the installed files, or if the PLIST entries
10# are listed in files. Valid values are "dynamic" and "static", 10# are listed in files. Valid values are "dynamic" and "static",
11# and the default value is "static". 11# and the default value is "static".
12# 12#
13# PLIST_VARS is the list of names corresponding to automatic variables 13# PLIST_VARS is the list of names corresponding to automatic variables
14# generated by plist.mk to simplify having conditionally-present 14# generated by plist.mk to simplify having conditionally-present
@@ -86,28 +86,30 @@ PKG_FAIL_REASON+= "Missing PLIST fi @@ -86,28 +86,30 @@ PKG_FAIL_REASON+= "Missing PLIST fi
86. endif 86. endif
87.endif 87.endif
88 88
89PLIST_SRC?= ${PLIST_SRC_DFLT} 89PLIST_SRC?= ${PLIST_SRC_DFLT}
90 90
91# This is the path to the generated PLIST file. 91# This is the path to the generated PLIST file.
92PLIST= ${WRKDIR}/.PLIST 92PLIST= ${WRKDIR}/.PLIST
93_PLIST_NOKEYWORDS=${PLIST}_nokeywords 93_PLIST_NOKEYWORDS=${PLIST}_nokeywords
94 94
95###################################################################### 95######################################################################
96 96
97.if (defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)) 97.if (defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake))
98_IMAKE_MANINSTALL= ${IMAKE_MANINSTALL} 98_IMAKE_MANINSTALL= ${IMAKE_MANINSTALL}
 99_PLIST_MANINSTALL= ${IMAKE_MANINSTALL}
99.else 100.else
100_IMAKE_MANINSTALL= # empty 101_IMAKE_MANINSTALL= # empty
 102_PLIST_MANINSTALL= ${MANINSTALL}
101.endif 103.endif
102 104
103_LIBTOOL_EXPAND= \ 105_LIBTOOL_EXPAND= \
104 ${PKGSRC_SETENV} ECHO=${TOOLS_ECHO:Q} GREP=${TOOLS_GREP:Q} \ 106 ${PKGSRC_SETENV} ECHO=${TOOLS_ECHO:Q} GREP=${TOOLS_GREP:Q} \
105 SORT=${TOOLS_SORT:Q} TEST=${TOOLS_TEST:Q} \ 107 SORT=${TOOLS_SORT:Q} TEST=${TOOLS_TEST:Q} \
106 ${SH} ${.CURDIR}/../../mk/plist/libtool-expand 108 ${SH} ${.CURDIR}/../../mk/plist/libtool-expand
107 109
108.if !defined(_IGNORE_INFO_PATH) 110.if !defined(_IGNORE_INFO_PATH)
109. for _dir_ in ${IGNORE_INFO_DIRS} 111. for _dir_ in ${IGNORE_INFO_DIRS}
110_IGNORE_INFO_PATH:= ${_IGNORE_INFO_PATH}:${_dir_} 112_IGNORE_INFO_PATH:= ${_IGNORE_INFO_PATH}:${_dir_}
111. endfor 113. endfor
112_IGNORE_INFO_PATH:= ${_IGNORE_INFO_PATH:S/^://} 114_IGNORE_INFO_PATH:= ${_IGNORE_INFO_PATH:S/^://}
113.endif 115.endif
@@ -116,27 +118,27 @@ MAKEVARS+= _IGNORE_INFO_PATH @@ -116,27 +118,27 @@ MAKEVARS+= _IGNORE_INFO_PATH
116# _PLIST_AWK_ENV holds the shell environment passed to the awk script 118# _PLIST_AWK_ENV holds the shell environment passed to the awk script
117# that does post-processing of the PLIST. See the individual *.awk 119# that does post-processing of the PLIST. See the individual *.awk
118# scripts for information on each of the variable set in the environment. 120# scripts for information on each of the variable set in the environment.
119# 121#
120_PLIST_AWK_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 122_PLIST_AWK_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
121_PLIST_AWK_ENV+= USE_PKGLOCALEDIR=${USE_PKGLOCALEDIR:Dyes:Uno} 123_PLIST_AWK_ENV+= USE_PKGLOCALEDIR=${USE_PKGLOCALEDIR:Dyes:Uno}
122_PLIST_AWK_ENV+= IMAKE_MANINSTALL=${_IMAKE_MANINSTALL:Q} 124_PLIST_AWK_ENV+= IMAKE_MANINSTALL=${_IMAKE_MANINSTALL:Q}
123_PLIST_AWK_ENV+= IGNORE_INFO_PATH=${_IGNORE_INFO_PATH:Q} 125_PLIST_AWK_ENV+= IGNORE_INFO_PATH=${_IGNORE_INFO_PATH:Q}
124_PLIST_AWK_ENV+= PKGINFODIR=${PKGINFODIR:Q} 126_PLIST_AWK_ENV+= PKGINFODIR=${PKGINFODIR:Q}
125_PLIST_AWK_ENV+= IGNORE_LIBTOOLIZE=${IGNORE_LIBTOOLIZE:Q} 127_PLIST_AWK_ENV+= IGNORE_LIBTOOLIZE=${IGNORE_LIBTOOLIZE:Q}
126_PLIST_AWK_ENV+= LIBTOOLIZE_PLIST=${LIBTOOLIZE_PLIST:Q} 128_PLIST_AWK_ENV+= LIBTOOLIZE_PLIST=${LIBTOOLIZE_PLIST:Q}
127_PLIST_AWK_ENV+= LIBTOOL_EXPAND=${_LIBTOOL_EXPAND:Q} 129_PLIST_AWK_ENV+= LIBTOOL_EXPAND=${_LIBTOOL_EXPAND:Q}
128_PLIST_AWK_ENV+= LS=${TOOLS_LS:Q} 130_PLIST_AWK_ENV+= LS=${TOOLS_LS:Q}
129_PLIST_AWK_ENV+= MANINSTALL=${MANINSTALL:Q} 131_PLIST_AWK_ENV+= MANINSTALL=${_PLIST_MANINSTALL:Q}
130_PLIST_AWK_ENV+= MANZ=${_MANZ:Q} 132_PLIST_AWK_ENV+= MANZ=${_MANZ:Q}
131_PLIST_AWK_ENV+= PKGMANDIR=${PKGMANDIR:Q} 133_PLIST_AWK_ENV+= PKGMANDIR=${PKGMANDIR:Q}
132_PLIST_AWK_ENV+= PREFIX=${DESTDIR:Q}${PREFIX:Q} 134_PLIST_AWK_ENV+= PREFIX=${DESTDIR:Q}${PREFIX:Q}
133_PLIST_AWK_ENV+= TEST=${TOOLS_TEST:Q} 135_PLIST_AWK_ENV+= TEST=${TOOLS_TEST:Q}
134 136
135# PLIST_SUBST contains package-settable "${variable}" to "value" 137# PLIST_SUBST contains package-settable "${variable}" to "value"
136# substitutions for PLISTs 138# substitutions for PLISTs
137# 139#
138PLIST_SUBST+= OPSYS=${OPSYS:Q} \ 140PLIST_SUBST+= OPSYS=${OPSYS:Q} \
139 OS_VERSION=${OS_VERSION:Q} \ 141 OS_VERSION=${OS_VERSION:Q} \
140 MACHINE_ARCH=${MACHINE_ARCH:Q} \ 142 MACHINE_ARCH=${MACHINE_ARCH:Q} \
141 MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH:Q} \ 143 MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH:Q} \
142 MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} \ 144 MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} \