diff options
| author | jlam <jlam@pkgsrc.org> | 2006-04-16 04:27:17 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-04-16 04:27:17 +0000 |
| commit | f85023f9daa7baa0150feeba2f6b67e5861991b9 (patch) | |
| tree | fbd3cdc79c5f8b88b5ef6d73bf00635cce04f9b4 /mk | |
| parent | 3167adde68b78cdce11ce302b61480036bdea3b4 (diff) | |
| download | pkgsrc-f85023f9daa7baa0150feeba2f6b67e5861991b9.tar.gz | |
Now that all info file entries have been pushed from INFO_FILES into
the PLISTs, drop support for listing info files in INFO_FILES. The
INFO_FILES variable is now strictly defined/undefined.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 15 | ||||
| -rw-r--r-- | mk/plist/plist.mk | 21 |
2 files changed, 5 insertions, 31 deletions
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index ba4538df970..bb38461922b 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.45 2006/04/06 17:57:34 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.46 2006/04/16 04:27:17 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -488,17 +488,8 @@ FILES_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q} ${_INSTALL_INFO_FILES_DATAFILE}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET} ${.TARGET}.tmp - ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET}.tmp - ${_PKG_SILENT}${_PKG_DEBUG} \ - set -- dummy ${INFO_FILES}; shift; \ - exec 1>>${.TARGET}.tmp; \ - while ${TEST} $$# -gt 0; do \ - file="$$1"; shift; \ - file=${PKGINFODIR:Q}"/$$file"; \ - ${ECHO} "# INFO: $$file"; \ - done - ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET} + ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET} ${_INSTALL_INFO_FILES_FILE}: ${_INSTALL_INFO_FILES_DATAFILE} ${_INSTALL_INFO_FILES_FILE}: ../../mk/install/info-files diff --git a/mk/plist/plist.mk b/mk/plist/plist.mk index e831679bf74..b52c3adac65 100644 --- a/mk/plist/plist.mk +++ b/mk/plist/plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: plist.mk,v 1.8 2006/04/05 05:54:01 jlam Exp $ +# $NetBSD: plist.mk,v 1.9 2006/04/16 04:27:18 jlam Exp $ # # This Makefile fragment handles the creation of PLISTs for use by # pkg_create(8). @@ -173,18 +173,6 @@ _SHLIB_TYPE_cmd= \ # GENERATE_PLIST?= ${TRUE}; -# XXX Generate info page entries for each of the listed INFO_FILES. -# XXX This section should go away after info file listings have been -# XXX pushed into the PLISTs. -# XXX -.if defined(INFO_FILES) && !empty(INFO_FILES) -. for _file_ in ${INFO_FILES} -_INFO_GENERATE_PLIST+= ${ECHO} "info/"${_file_:Q}; -. endfor -.else -_INFO_GENERATE_PLIST= ${TRUE}; -.endif - .if ${PKG_INSTALLATION_TYPE} == "pkgviews" # # _PLIST_IGNORE_FILES basically mirrors the list of ignored files found @@ -224,8 +212,7 @@ _GENERATE_PLIST= \ ${SED} -e "s|^${PREFIX}/|@unexec ${RMDIR} -p %D/|" \ -e "s,$$, 2>/dev/null || ${TRUE},"; .else -_GENERATE_PLIST= { ${_INFO_GENERATE_PLIST} }; \ - ${CAT} ${PLIST_SRC}; \ +_GENERATE_PLIST= ${CAT} ${PLIST_SRC}; \ ${GENERATE_PLIST} .endif @@ -243,12 +230,8 @@ ${PLIST}: > ${.TARGET} .if defined(INFO_FILES) -. if empty(INFO_FILES) INFO_FILES_cmd= \ ${CAT} ${PLIST} | \ ${SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_INFO_AWK} | \ ${AWK} '($$0 !~ "-[0-9]*(\.gz)?$$") { print }' -. else -INFO_FILES_cmd= ${TRUE} -. endif .endif |