diff options
| author | reed <reed> | 2011-10-15 00:23:07 +0000 |
|---|---|---|
| committer | reed <reed> | 2011-10-15 00:23:07 +0000 |
| commit | 0803dd1082219527156198e8f3da504c579fccd1 (patch) | |
| tree | 731a20742fd50dda526dd72d589e7a647e8b369d /mk/depends | |
| parent | ef3c360cb8733d54010557bea6ea76d70181852c (diff) | |
| download | pkgsrc-0803dd1082219527156198e8f3da504c579fccd1.tar.gz | |
Rename "flavor" to "pkgformat".
This is from Anton Panev's GSoC 2011 project to add RPM and DPKG
support to pkgsrc. (I am not adding that further support in this
commit.)
This is just a rename of the existing functionality. Now it will
be easy to test the GSoC work by simply putting in a single
directory (such as "rpm" or "deb"). See
http://addpackageforma.sourceforge.net/ for some details.
This is from Anton's CVS, but I made some minor changes:
- changed plural pkgformats to singular pkgformat (to be consistent)
- fixed a few places (in comments) that were missed
- catch up on some additions to flavor not in the pkgforma cvs:
PKGSRC_SETENV and _flavor-destdir-undo-replace and
undo-destdir-replace-install.
Diffstat (limited to 'mk/depends')
| -rw-r--r-- | mk/depends/bsd.depends.mk | 6 | ||||
| -rw-r--r-- | mk/depends/depends.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index 6ddd2b1c992..9e29c1d4774 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.depends.mk,v 1.21 2011/05/04 09:49:34 obache Exp $ +# $NetBSD: bsd.depends.mk,v 1.22 2011/10/15 00:23:08 reed Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to dependencies. @@ -95,7 +95,7 @@ depends-clean: ### depends-cookie (PRIVATE, override) ###################################################################### ### depends-cookie creates the depends "cookie" state file. This should -### be overridden per package system flavor. +### be overridden per package system format. ### .PHONY: depends-cookie depends-cookie: @@ -111,4 +111,4 @@ depends-cookie: # VARNAME # Either DEPENDS or BUILD_DEPENDS. # -show-depends: .PHONY _flavor-show-depends +show-depends: .PHONY _pkgformat-show-depends diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk index c983fe0eceb..6bf5e4c4ba1 100644 --- a/mk/depends/depends.mk +++ b/mk/depends/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.15 2008/04/03 14:07:51 joerg Exp $ +# $NetBSD: depends.mk,v 1.16 2011/10/15 00:23:08 reed Exp $ ###################################################################### ### depends (PUBLIC) @@ -41,8 +41,8 @@ _REAL_DEPENDS_TARGETS+= ${_PKG_INSTALL_DEPENDS:Dpkg_install-depends} _REAL_DEPENDS_TARGETS+= bootstrap-depends _REAL_DEPENDS_TARGETS+= depends-message _REAL_DEPENDS_TARGETS+= pre-depends-hook -_REAL_DEPENDS_TARGETS+= _flavor-install-dependencies -_REAL_DEPENDS_TARGETS+= _flavor-post-install-dependencies +_REAL_DEPENDS_TARGETS+= _pkgformat-install-dependencies +_REAL_DEPENDS_TARGETS+= _pkgformat-post-install-dependencies _REAL_DEPENDS_TARGETS+= depends-cookie _REAL_DEPENDS_TARGETS+= error-check @@ -57,7 +57,7 @@ depends-message: ### pre-depends-hook (PRIVATE, override, hook) ###################################################################### ### pre-depends-hook is a generic hook target that is run just before -### dependencies are installed for _flavor-install-dependencies. +### dependencies are installed for _pkgformat-install-dependencies. ### .PHONY: pre-depends-hook pre-depends-hook: |