summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2011-10-15 00:23:07 +0000
committerreed <reed@pkgsrc.org>2011-10-15 00:23:07 +0000
commitea2d218ae31ff3fdee3fc7183e3aaac49a89c90c (patch)
tree731a20742fd50dda526dd72d589e7a647e8b369d /mk/bsd.pkg.mk
parent644e4c16dd1e20413b813484f8233f83f2e86145 (diff)
downloadpkgsrc-ea2d218ae31ff3fdee3fc7183e3aaac49a89c90c.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/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9f7f23ab822..39b568a02e3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1978 2011/09/08 20:17:15 abs Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1979 2011/10/15 00:23:07 reed Exp $
#
# This file is in the public domain.
#
@@ -61,7 +61,7 @@ PKG_FAIL_REASON+= "Circular dependency detected"
.include "features/features.mk"
-.include "flavor/bsd.flavor-vars.mk"
+.include "pkgformat/bsd.pkgformat-vars.mk"
.include "check/bsd.check-vars.mk"
.include "depends/bsd.depends-vars.mk"
.include "fetch/bsd.fetch-vars.mk"
@@ -576,7 +576,7 @@ ${.CURDIR}/${WRKDIR_BASENAME}:
fi
.endif
-.include "flavor/bsd.flavor.mk"
+.include "pkgformat/bsd.pkgformat.mk"
.include "depends/bsd.depends.mk"
.include "check/bsd.check.mk"