The NetBSD Project

CVS log for pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk / pkgformat / pkg

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.17: download - view: text, markup, annotated - select for diffs
Fri Apr 12 19:56:23 2024 UTC (2 years, 7 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3, pkgsrc-2026Q2-base, pkgsrc-2026Q2, pkgsrc-2026Q1-base, pkgsrc-2026Q1, pkgsrc-2025Q4-base, pkgsrc-2025Q4, pkgsrc-2025Q3-base, pkgsrc-2025Q3, pkgsrc-2025Q2-base, pkgsrc-2025Q2, pkgsrc-2025Q1-base, pkgsrc-2025Q1, pkgsrc-2024Q4-base, pkgsrc-2024Q4, pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, HEAD
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +15 -1 lines
mk/pkgformat/pkg: Make default cross-built PKG_DBDIR nicer.

`bootstrap --prefix /home/user/pkg' will create an mk.conf with
PKG_DBDIR=/home/user/pkg/pkgdb, but if you are using that installation
to cross-build packages, you likely want the default cross-built
PKG_DBDIR to be /usr/pkg/pkgdb just like the default cross-built
LOCALBASE is /usr/pkg.  This change implements that.

You can still override the cross-built PKG_DBDIR by setting
CROSS_PKG_DBDIr in mk.conf.

No change to native builds because the new logic is conditional on
USE_CROSS_COMPILE = yes.

Revision 1.16: download - view: text, markup, annotated - select for diffs
Fri Jan 26 12:40:04 2024 UTC (2 years, 9 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2024Q1-base, pkgsrc-2024Q1
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +2 -2 lines
pkg_install: Fix mistake in previous: this is strchr, not strchrnul.

Either

	if ((q = strchr(p, '/')) == NULL)

or

	if (*(q = strchrnul(p, '/')) == '\0')

will work, but not

	if (*(q = strchr(p, '/')) == '\0')

which will crash with a null pointer dereference.  Let's get the
right version of this committed, not the wrong one!  Oops.

While here, reset PKGREVISION like I meant to do yesterday.

Revision 1.15: download - view: text, markup, annotated - select for diffs
Fri Jan 26 03:24:58 2024 UTC (2 years, 9 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +4 -2 lines
mk/pkgformat/pkg: Use extended `-m "OS/ARCH VER"' syntax.

Requires pkg_install>=20240125.

No change to native builds, not even the pkg_install requirement,
because this is conditional on cross builds.

Proposed on tech-pkg:
https://mail-index.netbsd.org/tech-pkg/2024/01/13/msg028825.html

Revision 1.14: download - view: text, markup, annotated - select for diffs
Tue Jun 27 14:36:29 2023 UTC (3 years, 4 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +2 -1 lines
mk: Provide default NATIVE_PKG_TOOLS_BIN on non-NetBSD platforms.

I only defined it in platform/NetBSD.mk.  Other platforms that
support cross-building could take advantage of this too, but let's
not just break platforms that don't support it yet!

Revision 1.13: download - view: text, markup, annotated - select for diffs
Tue Jun 27 10:27:21 2023 UTC (3 years, 4 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +22 -15 lines
Split native and cross LOCALBASE for cross-compilation.

This way, you can use an unprivileged prefix of ~/cross/pkg to
cross-compile packages that, when installed, will go in /usr/pkg.

In mk.conf:

- Set CROSS_LOCALBASE to determine the installation prefix of
  packages that you cross-compile.

- Set LOCALBASE to determine the installation prefix of native
  packages needed for cross compilation.

Both default to /usr/pkg.  Note: CROSS_LOCALBASE defaults to /usr/pkg
even if you set LOCALBASE.  Of course, if you're not cross-compiling,
this has no effect.

When cross-compiling a package:

- LOCALBASE is where cross-compiled packages will be installed.

  (`make install' will put it in ${CROSS_DESTDIR}${LOCALBASE}, of
  course, but when you later use pkg_add to install the binary
  package on the system you're compiling it for, it will go in
  ${LOCALBASE}.  And you can still set PREFIX for an individual
  package, but LOCALBASE refers to where cross-compiled packages are
  generally installed, other than the specific ones that override
  PREFIX.)

- TOOLBASE is where tool dependencies are installed and available to
  be executed at build-time.

  For example, if you have TOOL_DEPENDS on a program that is
  installed in (say) foo/bin/xyz which is not in PATH so you have to
  refer ot its full pathname, you can execute ${TOOLBASE}/foo/bin/xyz
  instead of ${LOCALBASE}/foo/bin/xyz.

I chose this split, rather than the other way around, because I
expect that references that are baked into installed packages to be
more common than references that are executed at build-time, but I
didn't do an extensive study of the matter.  I chose the name
TOOLBASE because it's where TOOL_DEPENDS go.

Revision 1.12: download - view: text, markup, annotated - select for diffs
Thu Dec 24 01:31:19 2020 UTC (5 years, 10 months ago) by gdt
Branches: MAIN
CVS tags: pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +6 -2 lines
pkgformat-vars.mk: Revert requirement for new PKGTOOLS

As part of the pkgdb migration (NetBSD only), PGKTOOLS_REQD was set to
a recent value (20200828).  However, that results in a cyclic
dependency of pkg_install on cwrappers on pkg_install.  Once people
set PKG_DBDIR in pkg_install.conf and mk.conf to match their setup,
there is no need -- because of the migration -- to force newer tools.

Testing on TNF's pkgbuild machine indicates this revert works well,
and I received two positive comments and none against.

Revision 1.11: download - view: text, markup, annotated - select for diffs
Fri Dec 18 17:14:58 2020 UTC (5 years, 10 months ago) by maya
Branches: MAIN
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +1 -5 lines
Move the pkgdb compatibility error to a NetBSD-specific file to avoid
breakage for users who have other package managers that use /var/db/pkg
(Reported by Frederic Cambus on FreeBSD, OpenBSD)

Adjust warning: specifying PKGDB_DIR in mk.conf should be sufficient
for building packages for the compatibility pkgdb location.

This is still an error message, because:
- While we can handle the existing references of PKGDB_DIR, new ones
might be created.
- It is a minor inconvenience to people building packages from source.

Revision 1.10: download - view: text, markup, annotated - select for diffs
Thu Dec 3 10:04:48 2020 UTC (5 years, 11 months ago) by wiz
Branches: MAIN
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +2 -2 lines
mk: use LOCALBASE instead of PREFIX

I don't understand why this fixes problems, but it does fix the build
of mail/neomutt for me.

From ryoon.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Wed Dec 2 10:22:39 2020 UTC (5 years, 11 months ago) by wiz
Branches: MAIN
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +7 -7 lines
*: move default database directory from /var/db/pkg to ${PREFIX}/pkgdb

As discussed in August 2020 and previously on pkgsrcCon 2019.

Ok pkgsrc-pmc@

Revision 1.8: download - view: text, markup, annotated - select for diffs
Sun Jan 12 23:38:42 2020 UTC (6 years, 10 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +5 -2 lines
Add USE_PKG_ADMIN_DIGEST flag for switching between $NetBSD$ and SHA256
digests to identify file versions. Defaults to no for now. For digest
mode, recursive into FILESDIR, so that e.g. the majority of pkg_install
itself is recorded as well SMF manifests.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Sat Aug 19 00:30:19 2017 UTC (9 years, 3 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +6 -1 lines
Run pkg_add(1) and pkg_delete(1) using ${SETENV} ${PKGTOOLS_ENV}.

PKGTOOLS_ENV allows for passing environment variables to the
package install and deinstall scripts.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Sun Apr 10 15:20:26 2016 UTC (10 years, 7 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +1 -5 lines
Always require the 2010 version of pkg_install to simplify things a bit.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Tue Dec 30 15:13:20 2014 UTC (11 years, 10 months ago) by wiz
Branches: MAIN
CVS tags: pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +1 -16 lines
Remove pkg_views support, second part: infrastructure.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Mon Dec 8 02:43:25 2014 UTC (11 years, 11 months ago) by agc
Branches: MAIN
CVS tags: pkgsrc-2014Q4-base, pkgsrc-2014Q4
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +2 -2 lines
Fix a typo. No functional change.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Thu May 9 23:37:26 2013 UTC (13 years, 6 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +15 -2 lines
Split BUILD_DEPENDS into TOOL_DEPENDS and BUILD_DEPENDS in mk/.

Build depends are target packages that are needed at build-time for,
e.g., static libraries to link against, header files to include, &c.
Tool depends are native packages that are needed at build-time for,
e.g., compilers/linkers/&c. to run.

ok agc

Revision 1.2: download - view: text, markup, annotated - select for diffs
Tue Dec 13 16:35:48 2011 UTC (14 years, 11 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +4 -1 lines
Be a bit less aggressive in the required version of pkg_install encoded
into binary packages.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Sat Oct 15 00:23:09 2011 UTC (15 years, 1 month ago) by reed
Branches: MAIN
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.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>