CVS log for pkgsrc/mk/bsd.pkg.mk

Up to [cvs.netbsd.org] / pkgsrc / mk

Request diff between arbitrary revisions

Default branch: MAIN

Revision 1.1979 / (download) - annotate - [select for diffs], Sat Oct 15 00:23:07 2011 UTC (3 months, 3 weeks ago) by reed
Branch: MAIN
CVS Tags: pkgsrc-2011Q4-base, pkgsrc-2011Q4, HEAD
Changes since 1.1978: +3 -3 lines
Diff to previous 1.1978 (colored)

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.

Revision 1.1978 / (download) - annotate - [select for diffs], Thu Sep 8 20:17:15 2011 UTC (5 months ago) by abs
Branch: MAIN
CVS Tags: pkgsrc-2011Q3-base, pkgsrc-2011Q3
Changes since 1.1977: +5 -2 lines
Diff to previous 1.1977 (colored)

Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i
to santise environment

Revision 1.1977 / (download) - annotate - [select for diffs], Sat Mar 12 14:07:13 2011 UTC (10 months, 4 weeks ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1
Changes since 1.1976: +8 -1 lines
Diff to previous 1.1976 (colored)

Add MULTI variable, and add it to BUILD_DEFS, to more easily find
variable settings affecting binary packages.

From Aleksey Cheusov in PR 44695.

Revision 1.1976 / (download) - annotate - [select for diffs], Mon Feb 7 10:32:32 2011 UTC (12 months ago) by wiz
Branch: MAIN
Changes since 1.1975: +2 -2 lines
Diff to previous 1.1975 (colored)

Handle '-' in uname output, needed for DragonFly. From Justin Sherrill in PR 44526.

Revision 1.1975 / (download) - annotate - [select for diffs], Wed Nov 3 18:02:40 2010 UTC (15 months ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2010Q4-base, pkgsrc-2010Q4
Changes since 1.1974: +1 -2 lines
Diff to previous 1.1974 (colored)

Removed duplicate PKGVERSION line

Revision 1.1974 / (download) - annotate - [select for diffs], Tue Aug 24 19:08:28 2010 UTC (17 months, 2 weeks ago) by bad
Branch: MAIN
CVS Tags: pkgsrc-2010Q3-base, pkgsrc-2010Q3
Changes since 1.1973: +2 -2 lines
Diff to previous 1.1973 (colored)

I'm fed up with having to waste time because PKG_DEVELOPER is "special" and
can't be disabled by setting it to "no" like the other variables.
Besides, flavor/pkg/metadata.mk has been expecting for a long time that "no"
is a valid value.

Make PKG_DEVELOPER DWIM.

Revision 1.1973 / (download) - annotate - [select for diffs], Sat Jul 3 04:27:00 2010 UTC (19 months, 1 week ago) by darcy
Branch: MAIN
Changes since 1.1972: +1 -2 lines
Diff to previous 1.1972 (colored)

Remove MKDIR line that causes the one following to effectively
be a no-op.  With this line removed the umask will be applied
to the created directories.

As discussed with joerg@.

Revision 1.1972 / (download) - annotate - [select for diffs], Thu May 20 07:57:22 2010 UTC (20 months, 3 weeks ago) by sbd
Branch: MAIN
CVS Tags: pkgsrc-2010Q2-base, pkgsrc-2010Q2
Changes since 1.1971: +5 -1 lines
Diff to previous 1.1971 (colored)

On Linux systems record the glibc version in the build information.

OKed by wiz@

Revision 1.1971 / (download) - annotate - [select for diffs], Wed May 19 09:12:15 2010 UTC (20 months, 3 weeks ago) by sbd
Branch: MAIN
Changes since 1.1970: +12 -1 lines
Diff to previous 1.1970 (colored)

Add BUILTIN_PKGS with the "builtin" package names to the build information.

E.g if readline 6.0 and ncurses 5.7 are part of the system we get:
BUILTIN_PKGS=readline-6.0 ncurses-5.7

Revision 1.1970 / (download) - annotate - [select for diffs], Fri Apr 30 08:14:04 2010 UTC (21 months, 1 week ago) by sbd
Branch: MAIN
Changes since 1.1969: +2 -2 lines
Diff to previous 1.1969 (colored)

Simplify the osabi dependence as suggested by wiz@.

Revision 1.1969 / (download) - annotate - [select for diffs], Fri Apr 30 05:42:12 2010 UTC (21 months, 1 week ago) by sbd
Branch: MAIN
Changes since 1.1968: +2 -2 lines
Diff to previous 1.1968 (colored)

Improve the pattern of the osabi dependence again!

Revision 1.1968 / (download) - annotate - [select for diffs], Fri Apr 30 04:05:16 2010 UTC (21 months, 1 week ago) by sbd
Branch: MAIN
Changes since 1.1967: +2 -2 lines
Diff to previous 1.1967 (colored)

Change the pattern of the osabi dependence to one the actually works!

Revision 1.1967 / (download) - annotate - [select for diffs], Fri Apr 30 03:29:55 2010 UTC (21 months, 1 week ago) by sbd
Branch: MAIN
Changes since 1.1966: +2 -1 lines
Diff to previous 1.1966 (colored)

Make all packages that set OSVERSION_SPECIFIC depends on pkgtools/osabi.

Also include a note about changes to OS_VERSION in bsd.prefs.mk

Revision 1.1966 / (download) - annotate - [select for diffs], Tue Feb 23 17:24:55 2010 UTC (23 months, 2 weeks ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2010Q1-base, pkgsrc-2010Q1
Changes since 1.1965: +1 -6 lines
Diff to previous 1.1965 (colored)

Retire check for ONLY_FOR_ARCHS, NOT_FOR_ARCHS and NOT_FOR_OPSYS.

Revision 1.1965 / (download) - annotate - [select for diffs], Tue Feb 23 17:24:17 2010 UTC (23 months, 2 weeks ago) by joerg
Branch: MAIN
Changes since 1.1964: +1 -9 lines
Diff to previous 1.1964 (colored)

Retire check for MASTER_SITE_SUBDIR and PATCH_SITE_SUBDIR.

Revision 1.1964 / (download) - annotate - [select for diffs], Tue Feb 23 17:22:12 2010 UTC (23 months, 2 weeks ago) by joerg
Branch: MAIN
Changes since 1.1963: +1 -5 lines
Diff to previous 1.1963 (colored)

Retire check for ALL_TARGET. It was added before 2005.

Revision 1.1963 / (download) - annotate - [select for diffs], Tue Feb 23 17:20:53 2010 UTC (23 months, 2 weeks ago) by joerg
Branch: MAIN
Changes since 1.1962: +1 -6 lines
Diff to previous 1.1962 (colored)

Retire check for NO_WRKSUBDIR. It's been deprecated in 2001 and has been
an error almost as long.

Revision 1.1962 / (download) - annotate - [select for diffs], Tue Feb 23 17:16:51 2010 UTC (23 months, 2 weeks ago) by joerg
Branch: MAIN
Changes since 1.1961: +1 -11 lines
Diff to previous 1.1961 (colored)

Remove check for buildlink-x11 -- it's been removed in 2002.

Revision 1.1961 / (download) - annotate - [select for diffs], Sat Feb 20 07:05:52 2010 UTC (23 months, 2 weeks ago) by rillig
Branch: MAIN
Changes since 1.1960: +2 -1 lines
Diff to previous 1.1960 (colored)

Handle MANINSTALL correctly for packages that USE_BSD_MAKEFILE.

Fixes PR 42714.

Revision 1.1960 / (download) - annotate - [select for diffs], Tue Nov 3 02:14:32 2009 UTC (2 years, 3 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2009Q4-base, pkgsrc-2009Q4
Changes since 1.1959: +3 -2 lines
Diff to previous 1.1959 (colored)

Create the work directory itself with umask 077 to prevent access to
files with broken permissions (e.g. world-writable files).

Revision 1.1959 / (download) - annotate - [select for diffs], Thu Sep 10 21:46:57 2009 UTC (2 years, 4 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2009Q3-base, pkgsrc-2009Q3
Changes since 1.1958: +2 -2 lines
Diff to previous 1.1958 (colored)

Replace tab with space.

Revision 1.1958 / (download) - annotate - [select for diffs], Sun Jul 26 21:36:38 2009 UTC (2 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1957: +4 -1 lines
Diff to previous 1.1957 (colored)

Added an experimental target "import" that makes it easier to import
packages from pkgsrc-wip and other sources.

Revision 1.1957 / (download) - annotate - [select for diffs], Tue May 26 06:03:02 2009 UTC (2 years, 8 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2009Q2-base, pkgsrc-2009Q2
Changes since 1.1956: +2 -2 lines
Diff to previous 1.1956 (colored)

Accept _AUTOMATIC=yes.
At least, set as "yes" in mk/flavor/pkg/depends.mk,
and accept both "YES" and "yes" in flavor/pkg/install.mk.

Fixes PR 41422.

Revision 1.1956 / (download) - annotate - [select for diffs], Thu Apr 9 00:51:23 2009 UTC (2 years, 10 months ago) by joerg
Branch: MAIN
Changes since 1.1955: +1 -7 lines
Diff to previous 1.1955 (colored)

Remove support for NO_PACKAGE.

Revision 1.1955 / (download) - annotate - [select for diffs], Wed Apr 8 14:47:26 2009 UTC (2 years, 10 months ago) by wiz
Branch: MAIN
Changes since 1.1954: +2 -29 lines
Diff to previous 1.1954 (colored)

Switch to the license handling in license.mk.
The following licenses are accepted by default:
        public-domain
        gnu-gpl-v2 gnu-lgpl-v2
        gnu-gpl-v3 gnu-lgpl-v3
        original-bsd modified-bsd
        x11
        apache-2.0
        cddl-1.0
        open-font-license

All packages should now be converted to define their LICENSE.

Show a warning when PKG_DEVELOPER is set but LICENSE is not defined.

Revision 1.1954 / (download) - annotate - [select for diffs], Fri Mar 20 19:25:01 2009 UTC (2 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2009Q1-base, pkgsrc-2009Q1
Changes since 1.1953: +6 -1 lines
Diff to previous 1.1953 (colored)

Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the
recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS,
BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new
variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of
enter/exit marker, which can be used to reconstruct the tree and
to determine first level includes. Avoiding := for large variables
(BUILDLINK_ORDER) speeds up parse time as += has linear complexity.
The include guard reduces system time by avoiding reading files over and
over again. For complex packages this reduces both %user and %sys time to
half of the former time.

Revision 1.1953 / (download) - annotate - [select for diffs], Fri Feb 6 15:27:00 2009 UTC (3 years ago) by joerg
Branch: MAIN
Changes since 1.1952: +6 -6 lines
Diff to previous 1.1952 (colored)

Fix circular dependency detection for the case of non-leading circles.
For the dependency chain A->B->B the old code created:
_PKGSRC_DEPS=", B-1.0, A-1.0", which obviously can't match the PKGNAME
of B.
Skip the _flavor-bootstrap-depends processing if PKG_FAIL_REASON is
already set and move the check for circular dependencies right after the
block that defines PKGNAME and friends.

Revision 1.1952 / (download) - annotate - [select for diffs], Mon Sep 22 14:52:07 2008 UTC (3 years, 4 months ago) by dillo
Branch: MAIN
CVS Tags: pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3
Changes since 1.1951: +2 -1 lines
Diff to previous 1.1951 (colored)

For packages setting USE_BSD_MAKEFILE, explicitly set MKHTML to no.
This makes these packages build with the changed default in recent
NetBSD -current.

Approved by agc.

Revision 1.1951 / (download) - annotate - [select for diffs], Tue Aug 19 17:28:24 2008 UTC (3 years, 5 months ago) by agc
Branch: MAIN
CVS Tags: cube-native-xorg-base, cube-native-xorg
Changes since 1.1950: +2 -2 lines
Diff to previous 1.1950 (colored)

For no real reason, but per the "discussion" on tech-pkg, default the
creation of a symbolic link to the real work directory to "no".

Revision 1.1950 / (download) - annotate - [select for diffs], Mon Jul 21 22:34:18 2008 UTC (3 years, 6 months ago) by agc
Branch: MAIN
Changes since 1.1949: +2 -2 lines
Diff to previous 1.1949 (colored)

Restore default behaviour for creating a symbolic link to the ${WRKDIR},
which was lost when this definition was introduced without prior discussion.

Revision 1.1949 / (download) - annotate - [select for diffs], Sat Jun 14 08:32:33 2008 UTC (3 years, 7 months ago) by dillo
Branch: MAIN
CVS Tags: pkgsrc-2008Q2-base, pkgsrc-2008Q2, cwrapper
Changes since 1.1948: +5 -1 lines
Diff to previous 1.1948 (colored)

Set MAINTAINER to OWNER if the latter is set.
Somehow this got lost from the original OWNER support commit.

Revision 1.1948 / (download) - annotate - [select for diffs], Thu Jun 12 01:09:01 2008 UTC (3 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.1947: +1 -19 lines
Diff to previous 1.1947 (colored)

Move META_PACKAGE logic from bsd.pkg.mk to bds.prefs.mk, otherwise it
can't define destdir support.

Revision 1.1947 / (download) - annotate - [select for diffs], Thu Jun 12 00:06:27 2008 UTC (3 years, 7 months ago) by joerg
Branch: MAIN
Changes since 1.1946: +2 -1 lines
Diff to previous 1.1946 (colored)

Annotate whether a package was built with DESTDIR.

Revision 1.1946 / (download) - annotate - [select for diffs], Mon May 26 13:25:22 2008 UTC (3 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.1945: +19 -20 lines
Diff to previous 1.1945 (colored)

Move meta package override earlier.

Revision 1.1945 / (download) - annotate - [select for diffs], Sun May 25 21:42:22 2008 UTC (3 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.1944: +2 -2 lines
Diff to previous 1.1944 (colored)

Explicitly add pax dependency in those Makefiles that use it (or have
patches to add it). Drop pax from the default USE_TOOLS list.
Make bsdtar the default for those places that wanted gtar to extract
long links etc, as bsdtar can be built of the tree.

Revision 1.1944 / (download) - annotate - [select for diffs], Fri May 23 12:31:24 2008 UTC (3 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.1943: +31 -19 lines
Diff to previous 1.1943 (colored)

PKGNAME_NOREV is used to define the DIST_SUBDIR in some places, so
ensure it is defined with the rest of the PKGNAME_* variables before
including the phase variable files.

Revision 1.1943 / (download) - annotate - [select for diffs], Thu May 22 16:27:22 2008 UTC (3 years, 8 months ago) by joerg
Branch: MAIN
Changes since 1.1942: +1 -4 lines
Diff to previous 1.1942 (colored)

Move digest dependency into checksum and fetch part.
Make _ALL_FILES and in turn _CKSUMFILES available earlier.
Use it to only depend on digest if _CKSUMFILES is non-empty.
NO_CHECKSUM will now only skip the checksum and checksum-phase
targets. FAILOVER_FETCH will independently check the sums on
distfiles and depend on digest, fixing the remaining issues
originally raised in PR 34914.

Revision 1.1942 / (download) - annotate - [select for diffs], Wed May 21 19:53:59 2008 UTC (3 years, 8 months ago) by tnn
Branch: MAIN
Changes since 1.1941: +2 -2 lines
Diff to previous 1.1941 (colored)

Commit a workaround for the "make replace fails as non-root" bug:
Make sure _PKGSRC_BARRIER is set when using just-in-time su.
I've been running this for a long time in my tree without ill effects.
For more information see PR pkg/34470 and PR pkg/38505.

Revision 1.1941 / (download) - annotate - [select for diffs], Thu Apr 3 14:07:51 2008 UTC (3 years, 10 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2008Q1-base, pkgsrc-2008Q1
Changes since 1.1940: +1 -21 lines
Diff to previous 1.1940 (colored)

Move handling of pkg_install version into flavor. Add an explicit
phase pkg_install-depends before bootstrap-depends that just tries to
install a new pkg_install if the current version is too old. Still
keep it as bootstrap dependency for the bulk build code.
For NetBSD, PKG_TOOLS_BIN has to be computed in shell code due to a make
bug.

OK: jlam@

Revision 1.1940 / (download) - annotate - [select for diffs], Sat Mar 8 14:28:05 2008 UTC (3 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.1939: +3 -1 lines
Diff to previous 1.1939 (colored)

Add PKGVERSION_NOREV to complemenet PKGNAME_NOREV.

Revision 1.1939 / (download) - annotate - [select for diffs], Tue Feb 26 13:46:21 2008 UTC (3 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.1938: +7 -4 lines
Diff to previous 1.1938 (colored)

Split PKGTOOLS_REQD into two parts. If we don't have PKGTOOLS_REQD,
but something after PKGTOOLS_BASE_REQD, just register a bootstrap
dependency.

Revision 1.1938 / (download) - annotate - [select for diffs], Wed Feb 13 09:28:41 2008 UTC (3 years, 11 months ago) by rillig
Branch: MAIN
Changes since 1.1937: +2 -1 lines
Diff to previous 1.1937 (colored)

Pass the proper flags for stripping binaries to packages using BSD Make.

Revision 1.1937 / (download) - annotate - [select for diffs], Sun Feb 10 11:43:20 2008 UTC (4 years ago) by tnn
Branch: MAIN
Changes since 1.1936: +10 -1 lines
Diff to previous 1.1936 (colored)

Enable fake home directory support. Also add a wrkref check because an
embedded path to the HOME directory can be a security problem if, say,
the package looks in the HOME directory of an unprivileged user for
configuration files.

Note that this has the potential to cause some short-term fallout.

Revision 1.1936 / (download) - annotate - [select for diffs], Thu Feb 7 21:36:13 2008 UTC (4 years ago) by rillig
Branch: MAIN
Changes since 1.1935: +5 -5 lines
Diff to previous 1.1935 (colored)

Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

Revision 1.1935 / (download) - annotate - [select for diffs], Wed Jan 16 01:01:26 2008 UTC (4 years ago) by joerg
Branch: MAIN
Changes since 1.1934: +1 -4 lines
Diff to previous 1.1934 (colored)

pkg_install 20070802 is good enough, don't be overly aggressive.

Revision 1.1934 / (download) - annotate - [select for diffs], Sun Jan 13 20:23:18 2008 UTC (4 years ago) by adrianp
Branch: MAIN
Changes since 1.1933: +2 -2 lines
Diff to previous 1.1933 (colored)

Bump PKGTOOLS_REQD to 20071224 so everyone still has the functionality
that used to be in security/audit-packages.

Revision 1.1933 / (download) - annotate - [select for diffs], Tue Jan 1 14:20:20 2008 UTC (4 years, 1 month ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2007Q4-base, pkgsrc-2007Q4
Changes since 1.1932: +5 -1 lines
Diff to previous 1.1932 (colored)

Add more *ONW, *GRP and *MODE variables to BSD_MAKE_ENV for unprivileged build.

Revision 1.1932 / (download) - annotate - [select for diffs], Wed Dec 19 12:32:06 2007 UTC (4 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1931: +4 -1 lines
Diff to previous 1.1931 (colored)

Meta packages have user-destdir support and don't need any patches.

Revision 1.1931 / (download) - annotate - [select for diffs], Wed Dec 19 11:56:19 2007 UTC (4 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1930: +17 -1 lines
Diff to previous 1.1930 (colored)

Added a variable META_PACKAGE that should be set to "yes" by
meta-packages. That way, the packages don't need to know the details of
how meta-packages are defined.

Revision 1.1930 / (download) - annotate - [select for diffs], Thu Dec 13 11:57:34 2007 UTC (4 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1929: +5 -1 lines
Diff to previous 1.1929 (colored)

show-var is related to show-vars and show-subdir-var.

Revision 1.1929 / (download) - annotate - [select for diffs], Sat Dec 1 11:11:53 2007 UTC (4 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1928: +1 -2 lines
Diff to previous 1.1928 (colored)

Removed _INTERACTIVE_COOKIE, after asking on tech-pkg if anyone needs
it. It had only been used to change the "nerrors" variable in bulk
builds, but this variable is not used further anyway.

Revision 1.1928 / (download) - annotate - [select for diffs], Sat Oct 13 11:04:16 2007 UTC (4 years, 3 months ago) by dsl
Branch: MAIN
Changes since 1.1927: +51 -51 lines
Diff to previous 1.1927 (colored)

Fix the .include lines so that make looks in the right place first.
Remember .include "foo.mk" is looked for (first) in the directory that
contains the makefile being processed (like in C), so remove all the
${.PARSEDIR} and ../ sequences that just cause grief.

Revision 1.1927 / (download) - annotate - [select for diffs], Tue Oct 9 19:19:11 2007 UTC (4 years, 4 months ago) by martti
Branch: MAIN
CVS Tags: pkgsrc-2007Q3-base, pkgsrc-2007Q3
Changes since 1.1926: +2 -2 lines
Diff to previous 1.1926 (colored)

Remove trailing spaces.

Revision 1.1926 / (download) - annotate - [select for diffs], Sat Sep 29 16:03:28 2007 UTC (4 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1925: +1 -6 lines
Diff to previous 1.1925 (colored)

Removed a funny comment from 1997.

Revision 1.1925 / (download) - annotate - [select for diffs], Thu Sep 27 11:19:52 2007 UTC (4 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1924: +6 -1 lines
Diff to previous 1.1924 (colored)

More comments.

Revision 1.1924 / (download) - annotate - [select for diffs], Fri Sep 7 21:55:44 2007 UTC (4 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.1923: +3 -1 lines
Diff to previous 1.1923 (colored)

Add a "system features" framework that will eventually be used to
automatically supply missing "basic" headers and libraries from an
older system, e.g. IRIX 5.x or Interix or AIX, etc.

Example usage:

    USE_FEATURES+=      snprintf glob regex

For now, we just pull in libnbcompat to supply the missing bits.

Revision 1.1923 / (download) - annotate - [select for diffs], Fri Sep 7 15:51:53 2007 UTC (4 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.1922: +2 -2 lines
Diff to previous 1.1922 (colored)

The WRKDIR and PREFIX can be saved in the log directory when a package
doesn't build properly. These options are off by default since they
require much disk space.

Revision 1.1922 / (download) - annotate - [select for diffs], Sat Aug 18 00:30:21 2007 UTC (4 years, 5 months ago) by joerg
Branch: MAIN
Changes since 1.1921: +7 -1 lines
Diff to previous 1.1921 (colored)

Explicitly bail out if X11_TYPE=xorg is found.

Revision 1.1921 / (download) - annotate - [select for diffs], Mon Aug 13 06:03:46 2007 UTC (4 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.1920: +2 -38 lines
Diff to previous 1.1920 (colored)

Moved the stuff that is common to all directories of pkgsrc into its own
file. Now "make help" can be called from the top-level directory,
avoiding to parse lots of buildlink3.mk files just to get some help.

Revision 1.1920 / (download) - annotate - [select for diffs], Mon Aug 13 05:24:26 2007 UTC (4 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.1919: +2 -2 lines
Diff to previous 1.1919 (colored)

build-env is no longer defined in bsd.pkg.debug.mk.

Revision 1.1919 / (download) - annotate - [select for diffs], Mon Aug 13 05:22:37 2007 UTC (4 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.1918: +2 -2 lines
Diff to previous 1.1918 (colored)

Fixed _PKG_DEBUG_SCRIPT for the case of PKG_DEBUG_LEVEL=0.

Revision 1.1918 / (download) - annotate - [select for diffs], Fri Aug 10 13:09:52 2007 UTC (4 years, 6 months ago) by joerg
Branch: MAIN
Changes since 1.1917: +10 -2 lines
Diff to previous 1.1917 (colored)

Try a bit harder to guess which mk.conf the user is using, when
telling him to accept a license:
- if MAKECONF is set, use that
- if this is NetBSD and a non-bootstrap make is used, take /etc/mk.conf
- otherwise use ${PREFIX}/etc/mk.conf.

Issues reported by Michael Neumann on DragonFly's user list.

Revision 1.1917 / (download) - annotate - [select for diffs], Fri Aug 3 14:03:39 2007 UTC (4 years, 6 months ago) by joerg
Branch: MAIN
Changes since 1.1916: +5 -1 lines
Diff to previous 1.1916 (colored)

Update _USE_DESTDIR=full handling to use the new -u/-g code and
require pkg_install-20070802 for using it. It is now considered
to work correctly and ready for general consumption.

Revision 1.1916 / (download) - annotate - [select for diffs], Sun Jul 29 05:19:41 2007 UTC (4 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1915: +4 -0 lines
Diff to previous 1.1915 (colored)

* Add new emulator framework in pkgsrc/mk/emulator that handles all
  binary-only packages that require binary "emulation" on the native
  operating system.  Please see pkgsrc/mk/emulator/README for more
  details.

* Teach the plist framework to automatically use any existing
  PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition.

* Convert all of the binary-only packages in pkgsrc to use the
  emulator framework.  Most of them have been tested to install and
  deinstall correctly.  This involves the following cleanup actions:

    * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM}
      more consistently.

    * Simplify packages by using default INSTALL and DEINSTALL scripts
      instead of custom INSTALL/DEINSTALL code.

    * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc.
      Packages only need to state exactly which emulations they support,
      and the framework handles any i386-on-x86_64 or sparc-on-sparc64
      uses.

    * Remove "USE_NATIVE_LINUX" from pkgsrc.  The framework will
      automatically detect when the package is installing on Linux.

  Specific changes to packages include:

    * Bump the PKGREVISIONs for all of the suse100* and suse91* packages
      due to changes in the +INSTALL/+DEINSTALL scripts used in all
      of the packages.

    * Remove pkgsrc/emulators/suse_linux, which is unused by any
      packages.

    * cad/lc -- remove custom code to create the distinfo file for
	all supported platforms; just use "emul-fetch" and "emul-distinfo"
	instead.

    * lang/Cg-compiler -- install the shared libraries under ${EMULDIR}
	instead of ${PREFIX}/lib so that compiled programs will find
	the shared libraries.

    * mail/thunderbird-bin-nightly -- update to latest binary
	distributions for supported platforms.

    * multimedia/ns-flash -- update Linux version to 9.0.48 as the
	older version is no longer available for interactive fetch.

    * security/uvscan -- set LD_LIBRARY_PATH explicitly so that
	it's not necessary to install library symlinks into
	${EMULDIR}/usr/local/lib.

    * www/firefox-bin-flash -- update Linux version to 9.0.48 as the
	older version is no longer available for interactive fetch.

Revision 1.1915 / (download) - annotate - [select for diffs], Mon Jul 23 15:23:46 2007 UTC (4 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1914: +4 -13 lines
Diff to previous 1.1914 (colored)

Putting bsd.pkginstall.mk under bsd.tools.mk was a bad idea -- the
former set several USE_TOOLS lines that were being missed by bsd.tools.mk.

Rearrange the +SHLIBS code so that bsd.tools.mk can now be included
after bsd.pkginstall.mk again.  The +SHLIBS code has now been moved
over to the plist module, which is so far the repository for all of
the shlib-type handling.

This should fix the problem with fonts handling being broken.

Revision 1.1914 / (download) - annotate - [select for diffs], Fri Jul 20 14:25:03 2007 UTC (4 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1913: +2 -1 lines
Diff to previous 1.1913 (colored)

Enabled the warnings.

Revision 1.1913 / (download) - annotate - [select for diffs], Wed Jul 18 18:01:02 2007 UTC (4 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1912: +13 -4 lines
Diff to previous 1.1912 (colored)

Add back a facility to rebuild the run-time library search paths database
on platforms that need it.

XXX Right now, if the platform needs it, then it runs for every package.
XXX This needs to be fixed to only run for packages that install shared
XXX libraries.

* Move mk/plist/shlib-type to mk/scripts.

* Move definition of SHLIB_TYPE from mk/plist/plist.mk to bsd.pkg.mk.

* Move inclusion of bsd.pkginstall.mk below bsd.tools.mk so that it
  can use SHLIB_TYPE.  This is necessary because SHLIB_TYPE's value
  is the result of evaluating a command, and the command needs "TOOL"
  definitions provided by bsd.tools.mk.

Revision 1.1912 / (download) - annotate - [select for diffs], Mon Jul 16 20:51:07 2007 UTC (4 years, 6 months ago) by joerg
Branch: MAIN
Changes since 1.1911: +2 -2 lines
Diff to previous 1.1911 (colored)

Change default value of CREATE_WRKDIR_SYMLINK to no. In combination with
WRKOBJDIR, the pkgsrc tree is now read-only. Brought up multiple times
on tech-pkg and no major objection.

Revision 1.1911 / (download) - annotate - [select for diffs], Wed May 9 23:33:51 2007 UTC (4 years, 9 months ago) by joerg
Branch: MAIN
CVS Tags: pkgsrc-2007Q2-base, pkgsrc-2007Q2
Changes since 1.1910: +5 -1 lines
Diff to previous 1.1910 (colored)

Add two targets, pbulk-index and pbulk-index-item.

pbulk-index-item prints a number of variables used by the parallel bulk
build code during either the build, the report or the upload phase.

pbulk-index checks whether multiple versions of the current package
could be build (e.g. because multiple Python versions are supported) and
uses pbulk-index-item for each possible combination.

Thanks to David Laight for explaining the different between using :[#]
in the body of a make target and in a clause of an .if.

Powered-by: Google SoC 2007.

Revision 1.1910 / (download) - annotate - [select for diffs], Sun Apr 1 19:02:14 2007 UTC (4 years, 10 months ago) by kristerw
Branch: MAIN
CVS Tags: pkgsrc-2007Q1-base, pkgsrc-2007Q1
Changes since 1.1909: +2 -2 lines
Diff to previous 1.1909 (colored)

Fix quoting issue that gave syntax error when printing the message
that new package tools are needed.

Revision 1.1909 / (download) - annotate - [select for diffs], Fri Mar 2 06:01:44 2007 UTC (4 years, 11 months ago) by wiz
Branch: MAIN
CVS Tags: jlam-pkgviews-base, jlam-pkgviews
Changes since 1.1908: +1 -5 lines
Diff to previous 1.1908 (colored)

Remove warning about LIB_DEPENDS, it's sooooo long gone...

Revision 1.1908 / (download) - annotate - [select for diffs], Thu Feb 22 07:20:41 2007 UTC (4 years, 11 months ago) by rillig
Branch: MAIN
Changes since 1.1907: +3 -3 lines
Diff to previous 1.1907 (colored)

Finished the split of PKGSRC_LOCKTYPE into LOCALBASE_LOCKTYPE and
WRKDIR_LOCKTYPE. Added more documentation.

Revision 1.1907 / (download) - annotate - [select for diffs], Tue Feb 20 10:32:09 2007 UTC (4 years, 11 months ago) by rillig
Branch: MAIN
Changes since 1.1906: +2 -1 lines
Diff to previous 1.1906 (colored)

I find the ABI useful to know when looking at a binary package.

Revision 1.1906 / (download) - annotate - [select for diffs], Fri Feb 9 01:57:17 2007 UTC (5 years ago) by obache
Branch: MAIN
Changes since 1.1905: +2 -2 lines
Diff to previous 1.1905 (colored)

MAKEFLAGS for su-${.TARGET} is ${MAKEFLAGS.su-${.TARGET}},
not ${MAKEFLAGS.${.TARGET}} .

Fix non-root user update target.

Revision 1.1905 / (download) - annotate - [select for diffs], Thu Jan 11 12:11:03 2007 UTC (5 years ago) by rillig
Branch: MAIN
Changes since 1.1904: +4 -3 lines
Diff to previous 1.1904 (colored)

Added the INFO_MSG command, which can be used when the user should be
noticed about something that is not severe enough to need a warning.
INFO messages go to stdout instead of stderr.

Added the :M* modifier to the INSTALL_MACROS to make the resulting
command lines somewhat shorter.

Revision 1.1904 / (download) - annotate - [select for diffs], Sat Jan 6 19:53:01 2007 UTC (5 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1903: +6 -1 lines
Diff to previous 1.1903 (colored)

Added the FAIL command, which can be prepended to an arbitrary shell
command, making it return with a non-zero exit status.

The first use of it is in a command called FAIL_MSG, which prints an
error message and exits immediately. ERROR_MSG itself doesn't do that.

Revision 1.1903 / (download) - annotate - [select for diffs], Tue Jan 2 23:34:40 2007 UTC (5 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1902: +55 -98 lines
Diff to previous 1.1902 (colored)

Cleaned up bsd.pkg.mk:
- Removed some outdated comments.
- Made the inclusion of other *.mk files uniform.
- Replaced some instances of ${_PKG_SILENT}${_PKG_DEBUG} with ${RUN},
  since the latter is much shorter.

Revision 1.1902 / (download) - annotate - [select for diffs], Tue Jan 2 21:29:07 2007 UTC (5 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1901: +6 -60 lines
Diff to previous 1.1901 (colored)

Moved the show-tools target to misc/show.mk.

Moved the changes-entry target to misc/developer.mk. To save some time,
that file is only included when PKG_DEVELOPER is defined.

Moved the build-defs-message target to misc/show.mk and renamed it to
show-build-defs, since almost all other *-message targets just print a
single line.

Revision 1.1901 / (download) - annotate - [select for diffs], Tue Jan 2 21:04:52 2007 UTC (5 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1900: +3 -1 lines
Diff to previous 1.1900 (colored)

Added an additional line to the parallel error message.

Added an empty line to separate the description of su-target from the
definition of _ROOT_CMD (for "make help").

Revision 1.1900 / (download) - annotate - [select for diffs], Fri Dec 15 12:46:23 2006 UTC (5 years, 1 month ago) by martti
Branch: MAIN
CVS Tags: pkgsrc-2006Q4-base, pkgsrc-2006Q4
Changes since 1.1899: +2 -2 lines
Diff to previous 1.1899 (colored)

Remove trailing spaces.

Revision 1.1899 / (download) - annotate - [select for diffs], Sun Nov 26 08:37:03 2006 UTC (5 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1898: +2 -2 lines
Diff to previous 1.1898 (colored)

Moved the code that checks for PKG_FAIL_REASON and PKG_SKIP reason from
the internal/ directory to misc/, since it is not really internal to
pkgsrc.

Fixed the case where PKG_SKIP_REASON was not noticed by the bulk builds.

Added the NOT_FOR_UNPRIVILEGED and ONLY_FOR_UNPRIVILEGED variables.

Revision 1.1898 / (download) - annotate - [select for diffs], Sun Nov 19 09:32:29 2006 UTC (5 years, 2 months ago) by wiz
Branch: MAIN
Changes since 1.1897: +2 -2 lines
Diff to previous 1.1897 (colored)

Use PKG_FAIL_REASON for platform checks, to make them work again.
XXX: PKG_SKIP_REASON seems broken?

Revision 1.1897 / (download) - annotate - [select for diffs], Thu Nov 16 09:38:53 2006 UTC (5 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1896: +2 -3 lines
Diff to previous 1.1896 (colored)

Moved the check for PKG_FAIL_REASON and PKG_SKIP_REASON at the very end
of bsd.pkg.mk, so that all infrastructure parts may add their error
messages to PKG_FAIL_REASON.

Revision 1.1896 / (download) - annotate - [select for diffs], Tue Nov 14 13:56:14 2006 UTC (5 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1895: +3 -39 lines
Diff to previous 1.1895 (colored)

Moved the code that checks PKG_FAIL_REASON and PKG_SKIP_REASON into its
own file. The further plan is not to include this file in the middle of
loading, but at the end, when no variables will be changed. This will
allow the _whole_ pkgsrc infrastructure to generate errors with
PKG_FAIL_REASON, which is currently not the case.

Revision 1.1895 / (download) - annotate - [select for diffs], Sun Nov 5 19:11:29 2006 UTC (5 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1894: +5 -1 lines
Diff to previous 1.1894 (colored)

Some people really try to run pkgsrc's make with -j5 options. Since that
is not supported at all by pkgsrc, print an error message in that case.

Revision 1.1894 / (download) - annotate - [select for diffs], Sun Nov 5 15:15:24 2006 UTC (5 years, 3 months ago) by joerg
Branch: MAIN
Changes since 1.1893: +2 -2 lines
Diff to previous 1.1893 (colored)

Use REAL_ROOT_USER for configuration dirs.

Revision 1.1893 / (download) - annotate - [select for diffs], Sun Nov 5 15:10:08 2006 UTC (5 years, 3 months ago) by joerg
Branch: MAIN
Changes since 1.1892: +3 -3 lines
Diff to previous 1.1892 (colored)

Rename _INSTALL_ROOT_USER to REAL_ROOT_USER. Use it as default for
SETUID_ROOT_PERMS.

Revision 1.1892 / (download) - annotate - [select for diffs], Mon Oct 23 14:40:14 2006 UTC (5 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1891: +2 -2 lines
Diff to previous 1.1891 (colored)

Moved the help system into its own subdirectory. Extracted the AWK
program into its own file, since that way, one can add comments to the
code.

For convenience, keyword search is case insensitive.

Revision 1.1891 / (download) - annotate - [select for diffs], Sun Oct 22 07:20:06 2006 UTC (5 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1890: +5 -2 lines
Diff to previous 1.1890 (colored)

Added INCSDIR and LIBDIR to BSD_MAKE_ENV.

Revision 1.1890 / (download) - annotate - [select for diffs], Sun Oct 22 07:00:41 2006 UTC (5 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1889: +7 -1 lines
Diff to previous 1.1889 (colored)

The new variable BSD_MAKE_ENV defines BINOWN, BINGRP, etc.

Revision 1.1889 / (download) - annotate - [select for diffs], Sun Oct 22 06:50:49 2006 UTC (5 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1888: +8 -1 lines
Diff to previous 1.1888 (colored)

Added a variable RUN (no leading underscore) as abbreviation for
${_PKG_SILENT}${_PKG_DEBUG}, so that this feature can be used by
packages, too.

Revision 1.1888 / (download) - annotate - [select for diffs], Sun Oct 15 16:20:34 2006 UTC (5 years, 3 months ago) by joerg
Branch: MAIN
Changes since 1.1887: +3 -1 lines
Diff to previous 1.1887 (colored)

Include some more magic to set ownership of packages build with
use-destdir to ${ROOT_USER}:${ROOT_GROU}. This allows us to safely
use it on all packages which don't install setuid/setgid binaries.

Revision 1.1887 / (download) - annotate - [select for diffs], Tue Oct 10 16:57:58 2006 UTC (5 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1886: +3 -3 lines
Diff to previous 1.1886 (colored)

Added printf to USE_TOOLS, because it is used heavily by the "debug" and
"help" targets.

Revision 1.1886 / (download) - annotate - [select for diffs], Mon Oct 9 10:30:27 2006 UTC (5 years, 4 months ago) by joerg
Branch: MAIN
Changes since 1.1885: +7 -4 lines
Diff to previous 1.1885 (colored)

Introduce _SU_ROOT_USER, which can be used for partially unprivileged
builds, when the normal ROOT_USER overrides should happen, but
su-target is still desired to work.

Revision 1.1885 / (download) - annotate - [select for diffs], Tue Oct 3 14:22:16 2006 UTC (5 years, 4 months ago) by gdt
Branch: MAIN
Changes since 1.1884: +2 -2 lines
Diff to previous 1.1884 (colored)

fix comment about CHANGES file for changes-entry, since the default is
really CHANGES-YYYY

Revision 1.1884 / (download) - annotate - [select for diffs], Fri Aug 4 20:52:27 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2006Q3-base, pkgsrc-2006Q3
Changes since 1.1883: +3 -9 lines
Diff to previous 1.1883 (colored)

Fixed the locking, as suggested by Johnny on the tech-pkg mailing list.

Added two targets acquire-localbase-lock and release-localbase-lock,
which mark the complete LOCALBASE directory as locked, so that multiple
packages cannot run the install, deinstall or bin-install targets at the
same time.

The install target aquires locks in both WRKSRC and LOCALBASE, the other
two targets only need the LOCALBASE lock, since they may be run without
WRKSRC being present on the system.

locking.mk must be included before tools.mk and the PKG_FAIL_REASON
check.

Revision 1.1883 / (download) - annotate - [select for diffs], Fri Aug 4 07:04:38 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1882: +2 -34 lines
Diff to previous 1.1882 (colored)

Moved the bin-install target from bsd.pkg.mk to install/bin-install.mk.
Added documentation. Added locking around the real installation.

Revision 1.1882 / (download) - annotate - [select for diffs], Fri Aug 4 06:27:27 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1881: +4 -6 lines
Diff to previous 1.1881 (colored)

In the "makedirs" target, it is clear that the lock file is always the
_WRKDIR_LOCKFILE and never _PREFIX_LOCKFILE, so use that to keep things
simple.

Replaced ECHO with ECHO_MSG in the message for creating the WRKDIR
symlink.

Revision 1.1881 / (download) - annotate - [select for diffs], Fri Aug 4 05:55:18 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1880: +2 -73 lines
Diff to previous 1.1880 (colored)

Moved the locking code from bsd.pkg.mk into its own file. Where here,
added a more detailed header comment and fixed a bug concerning lockdir.

Revision 1.1880 / (download) - annotate - [select for diffs], Thu Aug 3 19:12:42 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1879: +35 -20 lines
Diff to previous 1.1879 (colored)

When installing or deinstalling a package, it is not enough to lock the
WRKDIR against foreign processes. Instead, the PKG_DBDIR is locked,
preventing other (pkgsrc) processes from modifying the set of installed
packages while another one is doing that.

This allows to use "bmake update" efficiently on multi-processor
machines by just running it in four different package directories.

Note that the pkg_add and pkg_delete tools may still interfere with this
locking when they are directly run.

Revision 1.1879 / (download) - annotate - [select for diffs], Wed Aug 2 09:46:22 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1878: +5 -2 lines
Diff to previous 1.1878 (colored)

Added bsd.pkg.help.mk, which provides the "help" target.

Since more and more files follow the convention of documenting variables
in a common format, it makes sense to be able to get the documentation
of a single variable by simple means, instead of searching through the
whole mk/ directory.

Try "make help TOPIC=CONFIGURE_DIRS" for an example.

Revision 1.1878 / (download) - annotate - [select for diffs], Thu Jul 27 21:46:45 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1877: +3 -8 lines
Diff to previous 1.1877 (colored)

Whenever we invoke a recursive make, we need to ensure that the proper
environment ${PKGSRC_MAKE_ENV} is also passed along.  Create a
convenience variable RECURSIVE_MAKE that does exactly this and that
can be used in place of MAKE when invoking make recursively.

Use RECURSIVE_MAKE everywhere in pkgsrc/mk that we invoke make
recursively.

Revision 1.1877 / (download) - annotate - [select for diffs], Thu Jul 27 13:47:29 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1876: +2 -2 lines
Diff to previous 1.1876 (colored)

After auditing all the packages the ensure that they never invoke the
compiler toolchain until the configure stage, move the "wrapper" stage
back to between "patch" and "configure".

This makes "make extract NO_DEPENDS=" work again for all packages.

Revision 1.1876 / (download) - annotate - [select for diffs], Wed Jul 26 21:23:40 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1875: +6 -1 lines
Diff to previous 1.1875 (colored)

Pass MAKECONF down to recursive make processes to ensure they all use
the same ${MAKECONF} file.

Revision 1.1875 / (download) - annotate - [select for diffs], Wed Jul 26 19:29:14 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1874: +3 -2 lines
Diff to previous 1.1874 (colored)

Ensure that the just-in-time su command invoked has the same environment
as other recursive make processes (PKGSRC_MAKE_ENV).

Revision 1.1874 / (download) - annotate - [select for diffs], Fri Jul 21 14:21:28 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1873: +2 -2 lines
Diff to previous 1.1873 (colored)

Rearrange sequence so that "wrapper" occurs between "tools" and
"extract".  This allows all user-definable targets (pre-*, do-*,
post-*) to have access to the wrapper scripts.

Revision 1.1873 / (download) - annotate - [select for diffs], Thu Jul 20 17:16:43 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1872: +4 -1 lines
Diff to previous 1.1872 (colored)

Include the file bsd.pkg.debug.mk if requested by invoking the "debug"
target.

Revision 1.1872 / (download) - annotate - [select for diffs], Mon Jul 17 13:35:11 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1871: +4 -1 lines
Diff to previous 1.1871 (colored)

Added LOCALBASE, PKGINFODIR and PKGMANDIR to _BUILD_DEFS, since they
influence the way the package is installed. Also, they are so commonly
used that it would be a nuisance to add it to every package Makefile.

Revision 1.1871 / (download) - annotate - [select for diffs], Sat Jul 15 23:58:52 2006 UTC (5 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1870: +15 -44 lines
Diff to previous 1.1870 (colored)

Split the variable BUILD_DEFS into those that are defined by packages
and those that are defined by the infrastructure (_BUILD_DEFS). This
allows the build-defs-message target to be moved to the end of
bsd.pkg.mk. Now it prints the correct result even in unprivileged
builds, which had been wrong due to the order in which the files have
been included. For example, ${UNPRIVILEGED_USER} was displayed as (not
defined) although its value was defined, which could be checked with
"bmake show-var".

Tested with one package that _does_ define BUILD_DEFS and with one that
doesn't. The behavior stays the same.

Revision 1.1870 / (download) - annotate - [select for diffs], Thu Jul 13 14:04:41 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1869: +1 -3 lines
Diff to previous 1.1869 (colored)

Remove line noting that "this file was derived from bsd.ports.mk".
The contents of this file are no longer remotedly related to bsd.ports.mk,
and pkgsrc's heritage from ports is documented elsewhere.

Revision 1.1869 / (download) - annotate - [select for diffs], Thu Jul 13 14:02:34 2006 UTC (5 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1868: +18 -199 lines
Diff to previous 1.1868 (colored)

* Add a new stage "bootstrap-depends" that happens before all other
  stages, and that installs dependencies listed in BOOTSTRAP_DEPENDS.
  The bootstrap-depends step works just like the normal depends step
  and honors the value of DEPENDS_TARGET.  It's now possible to add
  dependencies solely to facilitate fetching the distfiles, e.g.

	BOOTSTRAP_DEPENDS+=	curl-[0-9]*:../../www/curl

* Teach the tools framework about ":bootstrap" as a tools modifier
  which indicates the tool should be added as a dependency via
  BOOTSTRAP_DEPENDS.

* Add "digest" to the tools framework.

* Use USE_TOOLS+=digest:bootstrap to force pkgsrc to install digest
  before anything else.  Get rid of unused "uptodate-digest" target
  and related digest version-checking code.

* Finish the refactoring work: split checksum-related code out of
  bsd.pkg.mk and into pkgsrc/mk/checksum and replace the "checksum"
  target command list with a script that does all the real work.

* Make DIGEST_ALGORITHMS and PATCH_DIGEST_ALGORITHM into private
  variables by prepending them with an underscore.  Also, rename
  _PATCH_DIGEST_ALGORITHM to _PATCH_DIGEST_ALGORITHMS and adjust the
  makepatchsum target to allow that variable to contain a list of
  algorithms, all of which are used when creating the patch checksums
  for ${DISTINFO_FILE}.

Revision 1.1868 / (download) - annotate - [select for diffs], Mon Jul 10 22:59:27 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1867: +2 -3 lines
Diff to previous 1.1867 (colored)

Completely nuke the concept of PKG_PHASE from pkgsrc except for the
purposes of caching MAKEVARS within bsd.pkg.mk and bsd.makevars.mk.

Revision 1.1867 / (download) - annotate - [select for diffs], Sat Jul 8 02:16:33 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1866: +4 -2 lines
Diff to previous 1.1866 (colored)

Update the comments to reflect the current default workflow.

Revision 1.1866 / (download) - annotate - [select for diffs], Fri Jul 7 21:24:27 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1865: +2 -2 lines
Diff to previous 1.1865 (colored)

Rename <phase>_COOKIE variables to _COOKIE.<phase>.  These are private
variables so there are no user-visible changes.  This change just makes
it a little easier to write for loops.

Revision 1.1865 / (download) - annotate - [select for diffs], Fri Jul 7 15:59:06 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1864: +2 -8 lines
Diff to previous 1.1864 (colored)

Remove the commands that tried to make the ${X11BASE} directory if it
didn't exist.  Those commands were never run anyway, but moving the
.MAIN target exposed these commands as unassociated.

Revision 1.1864 / (download) - annotate - [select for diffs], Thu Jul 6 21:59:38 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1863: +3 -3 lines
Diff to previous 1.1863 (colored)

Make it a little easier to read the lock/unlock output by inserting some
quotes.

Revision 1.1863 / (download) - annotate - [select for diffs], Thu Jul 6 21:07:33 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1862: +4 -314 lines
Diff to previous 1.1862 (colored)

Refactor the README.html generation code from bsd.pkg.mk into a separate
bsd.pkg.readme.mk and document the public targets and variables for this
new file.

Revision 1.1862 / (download) - annotate - [select for diffs], Thu Jul 6 16:58:17 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1861: +6 -6 lines
Diff to previous 1.1861 (colored)

Fix previous... instead of moving bsd.pkg.barrier.mk down below .MAIN,
move .MAIN all the way to the top of the file.  bsd.pkg.barrier.mk
(currently) needs to be included before bsd.wrapper.mk since it defines
_BARRIER_COOKIE, which is expanded and used in place within bsd.wrapper.mk.
This makes the "wrapper" phase run again.

Revision 1.1861 / (download) - annotate - [select for diffs], Thu Jul 6 15:43:10 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1860: +4 -4 lines
Diff to previous 1.1860 (colored)

Move inclusion of bsd.pkg.barrier.mk under the .MAIN target because
bsd.pkg.barrier.mk uses the "make()" test expression.  Also, include
"all" as a post-barrier target since it is implicitly the ".MAIN" target
when a user just types "make" in a package directory.

Revision 1.1860 / (download) - annotate - [select for diffs], Wed Jul 5 23:27:34 2006 UTC (5 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.1859: +8 -3 lines
Diff to previous 1.1859 (colored)

Fixed the test on PKG_{FAIL,SKIP}_REASON. Added a prefix line to the
output of PKG_SKIP_REASON, since the plain message does not say where it
comes from.

Revision 1.1859 / (download) - annotate - [select for diffs], Wed Jul 5 22:21:02 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1858: +4 -1 lines
Diff to previous 1.1858 (colored)

Flatten out recursive makes into a single re-invocation of make by
introducing the concept of a "barrier".  We separate the user-invokable
targets into ones that must happen before the barrier, and ones that
must happen after the barrier.  The ones that happen after the barrier
are run in a sub-make process.  In this case, the targets that must
be run after the barrier are from the "wrapper" step and beyond.  We
rewrite the various "flow" targets, e.g. wrapper, configure, build,
etc., so that they of the right form to use the barrier target.

This now completely removes the concept of PKG_PHASE from pkgsrc.  It
is replaced with the concept of "before" and "after" the barrier, and
this state can be checked by testing for the existence of the barrier
cookie file.  Because we've removed most of the recursive makes, there
is now nowhere to hook the PKG_ERROR_HANDLER.* commands, so remove
them for now.

As part of this commit, put back the logic that conditionalized the
sources for the various cookie files.  Because the sources are all
"phony" targets, they were always run, regardless of whether or not
the cookie file already existed.  Now, if a cookie file exists, then
that entire phase associated with that cookie file is skipped.

Lastly, fix a thinko in configure/bsd.configure.mk where setting
NO_CONFIGURE in a package Makefile would manage to skip the "wrapper"
step altogether.  Fix this by correctly noting "wrapper" and not
"patch" as the preceding step to "configure".

Revision 1.1858 / (download) - annotate - [select for diffs], Wed Jul 5 06:09:15 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1857: +16 -575 lines
Diff to previous 1.1857 (colored)

Refactor configure, build, test and wrapper phases out of bsd.pkg.mk
and into their own directories.  Also do some cleanups with build/_build
and pkginstall -- we get rid of _build and simply run pkginstall as
part of the "build" target.

Introduce a new mechanism to handle varying directory depths under
${WRKSRC} in which we find files to override, e.g. configure, config.*,
libtool, etc.  OVERRIDE_DIRDEPTH is a package-settable variable that
specifies how far under ${WRKSRC} the various targets should look,
and it defaults to "2".  We preserve the
meaning of the various *_OVERRIDE variables, so if they are defined,
then their values supersede the OVERRIDE_DIRDEPTH mechanism.

devel/tla will need to specially set OVERRIDE_DIRDEPTH to 3 (see log
for revision 1.1857 for bsd.pkg.mk -- to be done in a separate commit.

Revision 1.1857 / (download) - annotate - [select for diffs], Sun Jun 18 09:40:25 2006 UTC (5 years, 7 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2006Q2-base, pkgsrc-2006Q2
Changes since 1.1856: +3 -3 lines
Diff to previous 1.1856 (colored)

devel/tla has the GNU config scripts in a */*/* directory.

Revision 1.1856 / (download) - annotate - [select for diffs], Sun Jun 18 09:37:55 2006 UTC (5 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.1855: +11 -7 lines
Diff to previous 1.1855 (colored)

Define CONFIG_{GUESS,SUB,RPATH}_OVERRIDE also when
OVERRIDE_GNU_CONFIG_SCRIPTS is defined.

Revision 1.1855 / (download) - annotate - [select for diffs], Sun Jun 18 09:34:07 2006 UTC (5 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.1854: +4 -4 lines
Diff to previous 1.1854 (colored)

Fixed wrong indentation of .if/.else/.endif.

Revision 1.1854 / (download) - annotate - [select for diffs], Sat Jun 17 21:27:30 2006 UTC (5 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.1853: +2 -2 lines
Diff to previous 1.1853 (colored)

Added a variable OVERRIDE_GNU_CONFIG_SCRIPTS that allows a package to
override the config.guess, config.sub and config.rpath scripts even if
GNU_CONFIGURE is not defined. This is needed for devel/tla.

Revision 1.1853 / (download) - annotate - [select for diffs], Thu Jun 15 02:39:19 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1852: +10 -7 lines
Diff to previous 1.1852 (colored)

Output PKG_{FAIL,SKIP}_REASON messages to standard error instead of
standard output.  These are error or warning messages, so they shouldn't
be "seen" by anything expecting the output of a "make" command to make
sense.  This addresses PR pkg/32239 by following the suggestions by
Roland Illig.

Revision 1.1852 / (download) - annotate - [select for diffs], Thu Jun 15 02:24:41 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1851: +4 -2 lines
Diff to previous 1.1851 (colored)

Allow the standard build target to be overridden by the one generated
if PKG_{FAIL,SKIP}_REASON is set.  This fixes the behavior when one
invokes "make build" in a package that sets a fail or skip reason to
stop as soon as the reason is printed.

Revision 1.1851 / (download) - annotate - [select for diffs], Mon Jun 12 16:30:03 2006 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1850: +10 -4 lines
Diff to previous 1.1850 (colored)

Move the common make command executed in su-target into a separate make
variable to try to get rid of potential quoting problems.

Revision 1.1850 / (download) - annotate - [select for diffs], Sun Jun 11 02:14:45 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1849: +15 -9 lines
Diff to previous 1.1849 (colored)

Split out the "work" symlink creation into a separate step and add it
as a source for the "makedirs" target.  This ensures the symlink is
created regardless of whether ${WRKDIR} already exists or not.

Revision 1.1849 / (download) - annotate - [select for diffs], Fri Jun 9 13:59:06 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1848: +7 -6 lines
Diff to previous 1.1848 (colored)

Introduce the capability to gather all the warnings and errors that
are generated for a target and output them all at once at the conclusion
of the target's invocation.  The implementation is in bsd.pkg.error.mk,
which defines a macro target "error-check" that will print out any
non-empty warning and error files in ${WARNING_DIR} and ${ERROR_DIR}
and exit appropriately if there were errors.

Convert some targets that were just long sequences of ${ERROR_MSG} or
${WARNING_MSG} within a single shell statement to use the new delayed
error output via error-check.

Modify the compiler "fail" wrappers for C++ and Fortran to be less
verbose during invocation.  Instead collect the warnings and only
print them at the end of the completed phase, e.g. after "configure"
and/or "build" completes.

Revision 1.1848 / (download) - annotate - [select for diffs], Thu Jun 8 16:21:51 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1847: +4 -1 lines
Diff to previous 1.1847 (colored)

Introduce "makedirs" as a helper target to create directories with
unprivileged ownership.

Revision 1.1847 / (download) - annotate - [select for diffs], Thu Jun 8 08:01:53 2006 UTC (5 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1846: +3 -3 lines
Diff to previous 1.1846 (colored)

Replaced PHASE_MSG with STEP_MSG in many (but not all) places where it
wasn't used to identify a ``phase'', as defined in the pkgsrc guide.

Revision 1.1846 / (download) - annotate - [select for diffs], Wed Jun 7 18:37:06 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1845: +7 -4 lines
Diff to previous 1.1845 (colored)

If there is _ZERO_FILESIZE_P, then it's natural to have _NONZERO_FILESIZE_P
to test for the opposite condition.

Revision 1.1845 / (download) - annotate - [select for diffs], Wed Jun 7 17:44:29 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1844: +6 -1 lines
Diff to previous 1.1844 (colored)

Move _ZERO_FILESIZE_P ftom bsd.pkginstall.mk to bsd.pkg.mk so it can more
clearly be used in other modules.

Revision 1.1844 / (download) - annotate - [select for diffs], Wed Jun 7 17:00:03 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1843: +4 -1 lines
Diff to previous 1.1843 (colored)

Add WARNING_CAT and ERROR_CAT which are filters for outputting file
contents to standard error.  They prefix the output with "WARNING: "
and "ERROR: " respectively.

Revision 1.1540.2.27, Wed Jun 7 15:25:38 2006 UTC (5 years, 8 months ago) by tv
Branch: tv-derecurse
Changes since 1.1540.2.26: +1 -1 lines
FILE REMOVED

EOL the tv-derecurse branch; it has become too outdated.  The last live
revision can be fetched at the tv-derecurse-eol tag.

Revision 1.1843 / (download) - annotate - [select for diffs], Tue Jun 6 15:28:51 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1842: +10 -1 lines
Diff to previous 1.1842 (colored)

Move some variable definitions out of bsd.prefs.mk and back into
bsd.pkg.mk.  They didn't actually need to be defined in bsd.prefs.mk,
just somewhere before the "main" bsd.<phase>.mk files were included.
This moves some conditional (?=) definitions back into bsd.pkg.mk so
they won't conflict with any conditional definitions in package
Makefiles.

This should fix the "checksum" problems in lang/php-gd as noted here:

    http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html

where EXTRACT_SUFX had the wrong value due to the order in while *.mk
files were included.

Revision 1.1842 / (download) - annotate - [select for diffs], Tue Jun 6 06:30:29 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1841: +7 -26 lines
Diff to previous 1.1841 (colored)

Separate out the part of bsd.tools.mk that actually created the tools
into a new file pkgsrc/mk/tools/create.mk.  This leaves bsd.tools.mk
as a file that pulls in all of the other ones.  Also move the
tools-related targets from bsd.pkg.mk into bsd.tools.mk.

The tools cookie file has been removed, as well as hooks for
{pre,do,post}-tools.  Instead, there is now only a single public target
"tools" which may be invoked.  Invoking "tools" will always cause all
of the tools in ${TOOLS_DIR} to be created.

The "tools" step has been moved and is now just after the "depends"
step and before sources are extracted.  This is the earliest place
where the "tools" step can be taken, and it allows the created tools
to be used in all steps/phases after it, starting with "extract".  As
a consequence, we should just invoke tools by their bare names in
targets, e.g. awk, sed, patch, etc., instead of with the ${VARIABLE}
names, e.g. ${AWK}, ${SED}, ${PATCH}, etc.

Revision 1.1841 / (download) - annotate - [select for diffs], Tue Jun 6 04:48:19 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1840: +4 -4 lines
Diff to previous 1.1840 (colored)

Refactor "patch" code into correspondingly named subdirectory of
pkgsrc/mk.  Also get rid of the recursive make for the "patch" target.
This basically merges the "patch" phase into the "tools" phase.

There should eventually be a standalone script that can be used to
verify checksums listed in distinfo that should be used instead of
the roll-your-own code in the do-pkgsrc-patch target.

Revision 1.1840 / (download) - annotate - [select for diffs], Tue Jun 6 03:05:48 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1839: +12 -483 lines
Diff to previous 1.1839 (colored)

Refactor "fetch" and "extract" code into correspondingly named
subdirectories of pkgsrc/mk.  Move the following files around for
locality:

	pkgsrc/mk/scripts/extract  -> pkgsrc/mk/extract/extract
	pkgsrc/mk/bsd.sites.mk     -> pkgsrc/mk/fetch/sites.mk

Also get rid of the recursive make for the "fetch" and "extract"
targets.  This basically merges the "fetch" and "extract" phases into
the "patch" phase.

There is still much more work to do to simplify the fetch code, but
this is a good start.

Revision 1.1839 / (download) - annotate - [select for diffs], Mon Jun 5 22:49:44 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1838: +30 -31 lines
Diff to previous 1.1838 (colored)

Use PHASE_MSG, STEP_MSG, WARNING_MSG, and ERROR_MSG in place of ECHO_MSG
in various places.

Revision 1.1838 / (download) - annotate - [select for diffs], Mon Jun 5 17:56:10 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1837: +1 -3 lines
Diff to previous 1.1837 (colored)

Remove spurious comment.

Revision 1.1837 / (download) - annotate - [select for diffs], Mon Jun 5 17:21:54 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1836: +1 -31 lines
Diff to previous 1.1836 (colored)

Move definitions for UPDATE_TARGET and DEPENDS_TARGET closer to where
they are used.  Also, move UPDATE_RUNNING into the install module where
it is used, and make it "private" by prepending with an underscore.

Revision 1.1836 / (download) - annotate - [select for diffs], Mon Jun 5 02:22:49 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1835: +2 -1 lines
Diff to previous 1.1835 (colored)

Ensure the directory containing the lockfile is created prior to the
lockfile's creation.  Fixes the "depends" step when PKGSRC_LOCKTYPE
is not "none".

Revision 1.1835 / (download) - annotate - [select for diffs], Mon Jun 5 01:42:58 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1834: +4 -4 lines
Diff to previous 1.1834 (colored)

Backout previous and fix in another way -- use "set -e" to force the
shell to exit if any untested command fails.  This is based on Roland
Illig's recommendation from his pkglint talk at pkgsrcCon/Paris.

Revision 1.1834 / (download) - annotate - [select for diffs], Sun Jun 4 20:10:12 2006 UTC (5 years, 8 months ago) by tv
Branch: MAIN
Changes since 1.1833: +3 -3 lines
Diff to previous 1.1833 (colored)

Fix problem in su-target: the exitcode of the make command is discarded,
so it would exit successfully even if the sub-make failed.  This caused
rather interesting behavior with SU_CMD=sudo, and sudo timed out.  Ensure
that the result code is preserved by using a && chain rather than ;.

Revision 1.1833 / (download) - annotate - [select for diffs], Sun Jun 4 08:25:52 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1832: +1 -3 lines
Diff to previous 1.1832 (colored)

Move some "update"-only variables from bsd.pkg.mk to bsd.pkg.update.mk.

Revision 1.1832 / (download) - annotate - [select for diffs], Sun Jun 4 06:09:36 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1831: +14 -14 lines
Diff to previous 1.1831 (colored)

Make LOCKFILE into a "private" variable by prepending with an underscore.

Revision 1.1831 / (download) - annotate - [select for diffs], Sun Jun 4 05:26:45 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1830: +3 -1 lines
Diff to previous 1.1830 (colored)

Include bsd.pkg.update.mk to get the "update" targets and variables.

Revision 1.1830 / (download) - annotate - [select for diffs], Sun Jun 4 05:25:08 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1829: +4 -7 lines
Diff to previous 1.1829 (colored)

Move test for the lockfile within the target's shell code instead of
testing for it at the Makefile level.

Revision 1.1829 / (download) - annotate - [select for diffs], Sun Jun 4 04:31:47 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1828: +57 -64 lines
Diff to previous 1.1828 (colored)

Drop the use of _ACQUIRE_LOCK and _RELEASE_LOCK and replace with
acquire-lock and release-lock macro targets.  Take advantage of using
a make target by breaking up the _ACQUIRE_LOCK script into smaller
pieces, and make better use of the *_MSG definitions for printing
messages within the acquire-lock and release-lock targets.

Revision 1.1828 / (download) - annotate - [select for diffs], Sun Jun 4 00:39:05 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1827: +10 -33 lines
Diff to previous 1.1827 (colored)

Convert just-in-time su targets to use su-target instead of ${_SU_TARGET}.
Garbage-collect the (now) unused _SU_TARGET.

Revision 1.1827 / (download) - annotate - [select for diffs], Sat Jun 3 23:11:42 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1826: +42 -1333 lines
Diff to previous 1.1826 (colored)

First pass at implementing support for package system flavors other
than pkgsrc's current one.  This is an important lead-up to any project
that redesigns the pkg_* tools in that it doesn't tie us to past design
(mis)choices.  This commit mostly deals with rearranging code, although
there was a considerable amount of rewriting done in cases where I
thought the code was somewhat messy and was difficult to understand.

The design I chose for supporting multiple package system flavors is
that the various depends, install, package, etc.  modules would define
default targets and variables that may be overridden in files from
pkgsrc/mk/flavor/${PKG_FLAVOR}.  The default targets would do the
sensible thing of doing nothing, and pkgsrc infrastructure would rely
on the appropriate things to be defined in pkgsrc/mk/flavor to do the
real work.  The pkgsrc/mk/flavor directory contains subdirectories
corresponding to each package system flavor that we support.  Currently,
I only have "pkg" which represents the current pkgsrc-native package
flavor.  I've separated out most of the code where we make assumptions
about the package system flavor, mostly either because we directly
use the pkg_* tools, or we make assumptions about the package meta-data
directory, or we directly manipulate the package meta-data files, and
placed it into pkgsrc/mk/flavor/pkg.

There are several new modules that have been refactored out of bsd.pkg.mk
as part of these changes: check, depends, install, package, and update.
Each of these modules has been slimmed down by rewriting them to avoid
some recursive make calls.  I've also religiously documented which
targets are "public" and which are "private" so that users won't rely
on reaching into pkgsrc innards to call a private target.

The "depends" module is a complete overhaul of the way that we handle
dependencies.  There is now a separate "depends" phase that occurs
before the "extract" phase where dependencies are installed.  This
differs from the old way where dependencies were installed just before
extraction occurred.  The reduce-depends.mk file is now replaced by
a script that is invoked only once during the depends phase and is
used to generate a cookie file that holds the full set of reduced
dependencies.  It is now possible to type "make depends" in a package
directory and all missing dependencies will be installed.

Future work on this project include:

    * Resolve the workflow design in anticipation of future work on
      staged installations where "package" conceptually happens before
      "install".

    * Rewrite the buildlink3 framework to not assume the use of the
      pkgsrc pkg_* tools.

    * Rewrite the pkginstall framework to provide a standard pkg_*
      tool to perform the actions, and allowing a purely declarative
      file per package to describe what actions need to be taken at
      install or deinstall time.

    * Implement support for the SVR4 package flavor.  This will be
      proof that the appropriate abstractions are in place to allow
      using a completely different set of package management tools.

Revision 1.1826 / (download) - annotate - [select for diffs], Tue May 23 07:39:22 2006 UTC (5 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1825: +11 -2 lines
Diff to previous 1.1825 (colored)

Packages may set the variable FETCH_MESSAGE to a list of lines that are
printed when some distfile must be fetched manually. After printing
them, the build is aborted.

This deprecates the old _FETCH_MESSAGE, as packages should never need to
define variables with leading underscores.

Revision 1.1825 / (download) - annotate - [select for diffs], Mon May 22 22:22:02 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1824: +3 -46 lines
Diff to previous 1.1824 (colored)

Move the check-shlibs target from bsd.pkg.mk to bsd.pkg.check.mk where
it will live with other "check" targets run after package installation.

Get rid of SHLIB_HANDLING, whose meaning had mutated over the years
from one thing to another.  Currently, it is used to basically note
whether the system's "ldd" command can be usefully run on the package's
binaries and libraries.  Rename this variable to CHECK_SHLIBS_SUPPORTED
for more clarity.

CHECK_SHLIBS is now a variable set exclusively by the user in /etc/mk.conf
to note whether the check for missing run-time search paths is performed
after a package is installed.  It defaults to "no" unless PKG_DEVELOPER
is set.

Revision 1.1824 / (download) - annotate - [select for diffs], Sun May 21 23:50:15 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1823: +2 -2 lines
Diff to previous 1.1823 (colored)

Move mk/install to mk/pkginstall to better reflect the contents (the
pkginstall framework).

Revision 1.1823 / (download) - annotate - [select for diffs], Sun May 21 14:41:29 2006 UTC (5 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1822: +4 -4 lines
Diff to previous 1.1822 (colored)

Pass PKG_PHASE=install when recursively calling make from within the
real-su-install target so that the {pre,do,post}-install target command
lists will see the correct, fully-expanded definitions of certain
phase-specific variables.

Revision 1.1822 / (download) - annotate - [select for diffs], Wed May 10 17:53:34 2006 UTC (5 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.1821: +13 -13 lines
Diff to previous 1.1821 (colored)

Fixed some pkglint warnings in the do-configure, do-build, do-test and
do-install targets. This fixes an endless loop occuring when running "make"
in regress/make-quoting.

Revision 1.1821 / (download) - annotate - [select for diffs], Sat May 6 03:28:44 2006 UTC (5 years, 9 months ago) by reed
Branch: MAIN
Changes since 1.1820: +3 -2 lines
Diff to previous 1.1820 (colored)

If USE_ABI_DEPENDS=no, do not add the BUILDLINK_ABI_DEPENDS.$pkg
to BUILD_DEPENDS. (I posted about this to pkgsrc-users on April 14.)

Revision 1.1820 / (download) - annotate - [select for diffs], Wed Apr 26 05:58:44 2006 UTC (5 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1819: +2 -1 lines
Diff to previous 1.1819 (colored)

Allow a package to specify the ownership and permission on
${PKG_SYSCONFDIR} if PKG_SYSCONFSUBDIR is defined and non-empty.  A
package may now set PKG_SYSCONFDIR_PERMS to an "owner group mode"
triplet, which defaults to "${ROOT_USER} ${ROOT_GROUP} 755".

Revision 1.1819 / (download) - annotate - [select for diffs], Mon Apr 24 20:19:03 2006 UTC (5 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.1818: +4 -4 lines
Diff to previous 1.1818 (colored)

Rename recently added BUILD_INFO variable DATE to BUILD_DATE, and
the make variable holding its value to _BUILD_DATE.

Discussed on tech-pkg.

Revision 1.1818 / (download) - annotate - [select for diffs], Sat Apr 22 08:36:07 2006 UTC (5 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.1817: +2 -2 lines
Diff to previous 1.1817 (colored)

Adjusted the code to the pkglint warning that NO_PACKAGE should not be
quoted.

Revision 1.1817 / (download) - annotate - [select for diffs], Tue Apr 18 00:25:05 2006 UTC (5 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1816: +3 -2 lines
Diff to previous 1.1816 (colored)

Rename the CHANGES file to CHANGES-2006.  From now on, the changes for
each year will accumulate in CHANGES-YYYY.

Revision 1.1816 / (download) - annotate - [select for diffs], Wed Apr 12 21:01:15 2006 UTC (5 years, 9 months ago) by joerg
Branch: MAIN
Changes since 1.1815: +5 -2 lines
Diff to previous 1.1815 (colored)

Add INSTALL_GAME_DIR to complement INSTALL_GAME_DATA. The directories
are group-writeable by the games user on those platforms, where
GAMEMODE includes setgid. It defaults to PKGDIRMODE otherwise.

Revision 1.1815 / (download) - annotate - [select for diffs], Wed Apr 12 19:28:47 2006 UTC (5 years, 9 months ago) by reed
Branch: MAIN
Changes since 1.1814: +14 -2 lines
Diff to previous 1.1814 (colored)

Rename the _PKGTOOLS_VER variable in the +BUILD_INFO to
PKGTOOLS_VERSION (since that is what it is).

Also add to the +BUILD_INFO the:
HOMEPAGE (also is in DESC)
CATEGORIES
MAINTAINER
DATE (using "+%Y-%m-%d %H:%M:%S %z")

This information will be included in the upcoming
pkg_info -X "summary" output.

(In my own pkgsrc, I have been recording the date and maintainer
for over two years.)

Revision 1.1814 / (download) - annotate - [select for diffs], Mon Apr 10 04:47:30 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.1813: +2 -2 lines
Diff to previous 1.1813 (colored)

Correct comment on run-depends-list target (PR pkg/29741).

Revision 1.1813 / (download) - annotate - [select for diffs], Thu Apr 6 06:23:05 2006 UTC (5 years, 10 months ago) by reed
Branch: MAIN
Changes since 1.1812: +7 -7 lines
Diff to previous 1.1812 (colored)

Over 1200 files touched but no revisions bumped :)

RECOMMENDED is removed. It becomes ABI_DEPENDS.

BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.

BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.

BUILDLINK_DEPENDS does not change.

IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".

Added to obsolete.mk checking for IGNORE_RECOMMENDED.

I did not manually go through and fix any aesthetic tab/spacing issues.

I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.

I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.

As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.

As discussed on tech-pkg.

I will commit to revbump, pkglint, pkg_install, createbuildlink separately.

Note that if you use wip, it will fail!  I will commit to pkgsrc-wip
later (within day).

Revision 1.1812 / (download) - annotate - [select for diffs], Mon Mar 20 01:48:57 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2006Q1-base, pkgsrc-2006Q1
Changes since 1.1811: +14 -5 lines
Diff to previous 1.1811 (colored)

* Creates a new variable PKGINFODIR (named similarly to PKGMANDIR)
  that is a purely user-settable variable to represent the relative
  path under ${PREFIX} where info files are stored and "dir" files
  are managed.  PKGINFODIR defaults to "info".  INFO_DIR still works,
  but will be obsoleted after the 2006Q1 branch.

* Modify GNU_CONFIGURE_INFODIR to only honor ${PKGINFODIR} if the
  package installs directly into ${PREFIX} and not some subdirectory
  under ${PREFIX}.  This fixes packages that don't really honor
  $(infodir) all that well, and also avoids PLIST problems relating
  to directory removal for those packages.

* Since the majority of Emacs Lisp packages use GNU_CONFIGURE, just
  set GNU_CONFIGURE_INFODIR directly to ${EMACS_INFOPREFIX}, which is
  the Emacs-distro-specific location for info files.  Also pass
  EMACS_INFOPREFIX through PLIST_SUBST for PLIST substitution.

* INFO_FILES should be defined if the package installs info files.
  If the info files are not listed in the PLIST, then INFO_FILES
  must list the filenames for the info files installed by the package,
  which are assumed to be located in ${PREFIX}/${PKGINFODIR}.

* The plist module can now better detect info files listed in PLISTs
  and exports a command to the pkginstall module to append info file
  names to the +INFO_FILES scriptlet at install-time.

* The print-PLIST target is updated to properly list info files in
  the auto-generated PLIST.

* The check-files code is updated to skip all "dir" Info database files.

Revision 1.1811 / (download) - annotate - [select for diffs], Fri Mar 17 08:02:41 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.1810: +6 -2 lines
Diff to previous 1.1810 (colored)

Allow INSTALLATION_DIRS to contain absolute paths so long as they being
with ${PREFIX}.  This simplifies re-using variables that contain full
paths.

Revision 1.1810 / (download) - annotate - [select for diffs], Wed Mar 15 16:20:11 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.1809: +19 -17 lines
Diff to previous 1.1809 (colored)

Always run the pkginstall framework targets to generate the
INSTALL/DEINSTALL and rc.d scripts, regardless of whether NO_BUILD is
defined or not.

We do this by renaming the main "build" target to "_build", and creating
a new "build" target that has "_build" and "pkginstall" as dependencies.
This allows the "build" and "install" targets to be consecutive, so
no changes in behavior are visible to the user.

Because the pkginstall targets are no longer run within the protection
of the locks during the build phase, we need to manage locking within
a new "pkginstall" target.

Revision 1.1809 / (download) - annotate - [select for diffs], Wed Mar 15 14:06:09 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.1808: +2 -1 lines
Diff to previous 1.1808 (colored)

Back out previous... it was part of some larger changes that were never
committed and I got ahead of myself.

Revision 1.1808 / (download) - annotate - [select for diffs], Tue Mar 14 17:24:34 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.1807: +2 -3 lines
Diff to previous 1.1807 (colored)

We can always pass --infodir to configure scripts, regardless of whether
or not there are info files to be installed.

Revision 1.1807 / (download) - annotate - [select for diffs], Tue Mar 14 01:14:35 2006 UTC (5 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.1806: +9 -28 lines
Diff to previous 1.1806 (colored)

Modify the pkginstall framework so that it manages all aspects of
INSTALL/DEINSTALL script creation within pkgsrc.

If an INSTALL or DEINSTALL script is found in the package directory,
it is automatically used as a template for the pkginstall-generated
scripts.  If instead, they should be used simply as the full scripts,
then the package Makefile should set INSTALL_SRC or DEINSTALL_SRC
explicitly, e.g.:

	INSTALL_SRC=	${PKGDIR}/INSTALL
	DEINSTALL_SRC=	# emtpy

As part of the restructuring of the pkginstall framework internals,
we now *always* generate temporary INSTALL or DEINSTALL scripts.  By
comparing these temporary scripts with minimal INSTALL/DEINSTALL
scripts formed from only the base templates, we determine whether or
not the INSTALL/DEINSTALL scripts are actually needed by the package
(see the generate-install-scripts target in bsd.pkginstall.mk).

In addition, more variables in the framework have been made private.
The *_EXTRA_TMPL variables have been renamed to *_TEMPLATE, which are
more sensible names given the very few exported variables in this
framework.  The only public variables relating to the templates are:

	INSTALL_SRC		INSTALL_TEMPLATE
	DEINSTALL_SRC		DEINSTALL_TEMPLATE
				HEADER_TEMPLATE

The packages in pkgsrc have been modified to reflect the changes in
the pkginstall framework.

Revision 1.1806 / (download) - annotate - [select for diffs], Sun Mar 12 14:55:18 2006 UTC (5 years, 11 months ago) by rillig
Branch: MAIN
Changes since 1.1805: +5 -1 lines
Diff to previous 1.1805 (colored)

Added the variable PHASE_MSG, STEP_MSG, WARNING_MSG and ERROR_MSG to
facilitate the generation of consistent-looking progress messages.

Revision 1.1805 / (download) - annotate - [select for diffs], Fri Mar 10 11:02:00 2006 UTC (5 years, 11 months ago) by tonio
Branch: MAIN
Changes since 1.1804: +3 -3 lines
Diff to previous 1.1804 (colored)

replace-interpreter should use REPLACE_FILES.${lang} instead of
_REPLACE_FILES.${lang}

Revision 1.1804 / (download) - annotate - [select for diffs], Thu Mar 9 23:31:51 2006 UTC (5 years, 11 months ago) by jlam
Branch: MAIN
Changes since 1.1803: +2 -2 lines
Diff to previous 1.1803 (colored)

Make it safe to include bsd.pkginstall.mk directly in bsd.pkg.mk, and
drop pkginstall.mk, which did the same thing.  Also, rework some of
the targets so that we avoid needing to inspect *_MEMBERS variables
within make -- we defer the check to the shell code invoked by the
targets.

All changes are internal and don't affect existing packages in a
visible way.

Revision 1.1803 / (download) - annotate - [select for diffs], Thu Mar 9 15:58:10 2006 UTC (5 years, 11 months ago) by rillig
Branch: MAIN
Changes since 1.1802: +14 -4 lines
Diff to previous 1.1802 (colored)

Since the REPLACE_INTERPRETER is used in more and more packages, it is
not good style to make the package author define variables from the
pkgsrc-internal namespace. The variables REPLACE.* and REPLACE_FILES.*
can now be used as replacements for _REPLACE.* and _REPLACE_FILES.*.
Support for the old variable names will be removed after 2006Q2.

Revision 1.1802 / (download) - annotate - [select for diffs], Thu Mar 9 00:20:27 2006 UTC (5 years, 11 months ago) by jlam
Branch: MAIN
Changes since 1.1801: +3 -2 lines
Diff to previous 1.1801 (colored)

Reimplement the info-file handling so that we use an +INFO_FILES
scriptlet to manage the info-file registration.  The new scriptlet's
template is install/info-files.  Remove obsolete texinfo.mk and
install/install-info.

No changes to package Makefiles are necessary -- the re-implementation
is internal to pkgsrc infrastructure.

Revision 1.1801 / (download) - annotate - [select for diffs], Sat Mar 4 21:30:13 2006 UTC (5 years, 11 months ago) by jlam
Branch: MAIN
Changes since 1.1800: +2 -2 lines
Diff to previous 1.1800 (colored)

Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where no
developer is officially maintaining the package.

The rationale for changing this from "tech-pkg" to "pkgsrc-users" is
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list).  Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't
developers.

Revision 1.1800 / (download) - annotate - [select for diffs], Thu Mar 2 19:15:37 2006 UTC (5 years, 11 months ago) by joerg
Branch: MAIN
Changes since 1.1799: +4 -3 lines
Diff to previous 1.1799 (colored)

Make GNU_CONFIGURE_PREFIX the default prefix for GNU_CONFIGURE_MANDIR
and GNU_CONFIGURE_INFODIR. Add the latter for symmetry.

Revision 1.1799 / (download) - annotate - [select for diffs], Sat Feb 18 15:37:22 2006 UTC (5 years, 11 months ago) by rillig
Branch: MAIN
Changes since 1.1798: +6 -3 lines
Diff to previous 1.1798 (colored)

Added SITES.${foo} as an alias for SITES_${foo}. The latter will be
deprecated after the 2006Q1 branch.

Revision 1.1798 / (download) - annotate - [select for diffs], Thu Feb 2 21:15:46 2006 UTC (6 years ago) by rillig
Branch: MAIN
Changes since 1.1797: +3 -1 lines
Diff to previous 1.1797 (colored)

If the replace-interpreter program cannot find a file, a warning is
printed.

Revision 1.1797 / (download) - annotate - [select for diffs], Sat Jan 21 21:32:51 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1796: +5 -5 lines
Diff to previous 1.1796 (colored)

Don't write ${FOO:Mbar} == "bar", when !empty(FOO:Mbar) will suffice.
In this case, "FOO" is "INTERACTIVE_STAGE".

Revision 1.1796 / (download) - annotate - [select for diffs], Sat Jan 21 10:10:42 2006 UTC (6 years ago) by rillig
Branch: MAIN
Changes since 1.1795: +3 -3 lines
Diff to previous 1.1795 (colored)

Unquoted SUBST_MESSAGE.*, as this is no longer needed.

Revision 1.1795 / (download) - annotate - [select for diffs], Fri Jan 20 20:17:07 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1794: +1 -784 lines
Diff to previous 1.1794 (colored)

Remove the old PLIST-handling code after bulk building has shown the new
PLIST module works correctly.

Revision 1.1794 / (download) - annotate - [select for diffs], Thu Jan 19 20:32:17 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1793: +7 -25 lines
Diff to previous 1.1793 (colored)

Move more "patch"-related variables and targets out of bsd.pkg.mk and into
bsd.pkg.patch.mk.

Revision 1.1793 / (download) - annotate - [select for diffs], Thu Jan 19 19:35:25 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1792: +7 -34 lines
Diff to previous 1.1792 (colored)

Move more of the "extract"-related variables and targets out of bsd.pkg.mk
and into bsd.pkg.extract.mk.

Revision 1.1792 / (download) - annotate - [select for diffs], Thu Jan 19 16:11:10 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1791: +4 -50 lines
Diff to previous 1.1791 (colored)

* Split out the "clean" targets and variables and put them into a separate
  file pkgsrc/mk/bsd.pkg.clean.mk.

* Reimplement the clean target so that we don't need to invoke a separate
  make process just to do clean-depends.

* Reimplement clean-depends using a pipe to avoid command-line length
  issues.

Revision 1.1791 / (download) - annotate - [select for diffs], Wed Jan 18 20:18:04 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1790: +1 -83 lines
Diff to previous 1.1790 (colored)

Move the following targets from bsd.pkg.mk to bsd.utils.mk:

	show-depends-dirs
	show-all-depends-dirs
	show-all-depends-dirs-excl

While we're here, reimplement them using the new pkg_paths and
depends-depth-first.awk scripts.  As a side effect, this speeds up
the execution of these targets by around 5-15% depending on the
complexity of the dependency graph.

NOTE: This *does* change the behavior of these targets slightly because
      the output is now newline-separated instead of space-separated,
      and the order of the output lines doesn't match the original
      targets because the dependency graph is now walked depth-first
      instead of breadth first.

Revision 1.1790 / (download) - annotate - [select for diffs], Wed Jan 18 19:12:54 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1789: +3 -9 lines
Diff to previous 1.1789 (colored)

Remove unused "show-root-only" target.

Revision 1.1789 / (download) - annotate - [select for diffs], Wed Jan 18 00:10:07 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1788: +3 -1 lines
Diff to previous 1.1788 (colored)

Create a standalone awk script, depends-depth-first.awk, that encapsulates
the code that performs the dependency graph traversal (in depth-first
fashion).  This script has a hook that allows executing a shell command
line upon visiting a dependency's package directory in either prefix
or postfix order, and may be used to simplify the code in bsd.pkg.mk
that iterates over dependencies.

This awk script requires the target "show-depends-pkgpaths", which is
defined in a new Makefile pkgsrc/mk/bsd.utils.mk.  This file should
accumulate "utility" targets that current exist in bsd.pkg.mk, i.e.,
"helper" targets for various actions.

Revision 1.1788 / (download) - annotate - [select for diffs], Thu Jan 12 23:43:56 2006 UTC (6 years ago) by jlam
Branch: MAIN
Changes since 1.1787: +54 -6 lines
Diff to previous 1.1787 (colored)

Initial commit of a new module that encapsulates all of the code
for manipulating PLISTs.  This module is not used by default pending
more widespread testing -- currently the variable _USE_PLIST_MODULE
must be defined in /etc/mk.conf to enable its use.

The main features of the new PLIST module are:

    (1) Splits out the PLIST-handling code from bsd.pkg.mk into a
	separate "plist" module.

    (2) Splits out giant, multi-line awk scripts stored in make
	variables into separate awk scripts that may be joined
	together to post-process PLISTs.  Each of these awk scripts
	consolidates the processing for one set of files, e.g.,
	man pages, info pages, etc., and is more easily commented
	than a make variable.

    (3) Splits out the print-PLIST code from the regular PLIST code
	since they have no common pieces (print-plist.mk vs.
	plist.mk).

    (4) Completely re-implements the shared-library handling to be
	more efficient.  Along the way, this also fixes a problem
	for Mac OS X users where the PLISTs incorrectly contained
	absolute paths.

    (5) Completely re-implements the info-file handling so that we
	can migrate from INFO_FILES definitions to just adding
	info/foo.info entries in the static PLISTs.

    (6) Adds commented-out support for automatically compressed or
	decompressed info page entries based on the value of MANZ.
	These changes will be activated after texinfo.mk has been
	replaced by something that is built using the more modern
	primitives now available in pkgsrc.

    (7) Move the file compression logic into a separate script
	"doc-compress" that compresses or decompresses files while
	minding symlinks.  This script is now called by bsd.pkg.mk
	to do the "autmoatic man page handling".  In the future,
	it will also handle the "automatic info page handling" and
	possible others.

In general, the idea is to move stuff out of the Makefiles and into
separate files where we don't need to worry about quoting rules
and where each file can have a separate history of commits.  This
simplifies the makefile logic (especially in terms of readability)
and also simplifies maintenance of the code.

Revision 1.1787 / (download) - annotate - [select for diffs], Thu Jan 12 00:40:19 2006 UTC (6 years ago) by rillig
Branch: MAIN
Changes since 1.1786: +4 -1 lines
Diff to previous 1.1786 (colored)

Added the target check-interpreter to bsd.pkg.check.mk, which checks
that the interpreter of "#!"-style scripts exists. It is disabled by
default, and can be enabled by setting CHECK_INTERPRETER=yes. As for the
other check-* targets, CHECK_INTERPRETER_SKIP is a list of shell globs
that can be used to to skip certain files.

Ok'ed by jlam.

Revision 1.1786 / (download) - annotate - [select for diffs], Wed Jan 11 05:48:19 2006 UTC (6 years ago) by schmonz
Branch: MAIN
Changes since 1.1785: +2 -4 lines
Diff to previous 1.1785 (colored)

Since qmail and related packages install into ${PREFIX} (and have
for a while now), we no longer need to add ${QMAILDIR} in PLIST_SUBST
or MESSAGE_SUBST. Noticed by jlam.

Revision 1.1785 / (download) - annotate - [select for diffs], Thu Jan 5 23:18:26 2006 UTC (6 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.1784: +2 -3 lines
Diff to previous 1.1784 (colored)

Revert unintended part of last commit.

Revision 1.1784 / (download) - annotate - [select for diffs], Thu Jan 5 23:16:01 2006 UTC (6 years, 1 month ago) by joerg
Branch: MAIN
Changes since 1.1783: +3 -2 lines
Diff to previous 1.1783 (colored)

Adjust comment about SUBST_FILES to match reality:
absolute file names work as well.

Revision 1.1783 / (download) - annotate - [select for diffs], Wed Jan 4 04:25:47 2006 UTC (6 years, 1 month ago) by schmonz
Branch: MAIN
Changes since 1.1782: +11 -1 lines
Diff to previous 1.1782 (colored)

Add a wee bit of infrastructure to improve how we deprecate broken
packages from branch to branch:

When a package is considered broken (for whatever reason) at branch
time, we'll mark it with BROKEN_IN=name-of-branch. At the next
branch, we can easily determine which ones have remained broken and
remove them.

BROKEN_IN is visible to users iff a build fails, when it appends a
warning message to the above effect.

With feedback from dillo. Reviewed by jlam.

Revision 1.1782 / (download) - annotate - [select for diffs], Tue Jan 3 17:26:56 2006 UTC (6 years, 1 month ago) by wiz
Branch: MAIN
Changes since 1.1781: +17 -23 lines
Diff to previous 1.1781 (colored)

In the bin-install target, instead of running pkg_add for every
BINPKG_SITES entry separately, construct an appropriate PKG_PATH
and call pkg_add only once. Patch from Chapman Flack in PR 30929.

Use PKGNAME_REQD when installing package dependencies.
Patch from Chapman Flack in PR 30954.

Revision 1.1781 / (download) - annotate - [select for diffs], Tue Jan 3 00:41:51 2006 UTC (6 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.1780: +27 -29 lines
Diff to previous 1.1780 (colored)

Instead of patching the generated config.status script, patch the GNU
configure script itself so that the generated config.status script
does what we want (just exit if asked to "recheck").  This ensures
the timestamp for config.status is earlier than the timestamps for
the files that config.status generates (Makefile, config.h, etc.).

This fixes some problems where some packages end up "rebuilding" as
part of the install target, which makes the rebuilt files owned by
root and makes cleaning the work directory fail.

Revision 1.1780 / (download) - annotate - [select for diffs], Mon Jan 2 23:24:58 2006 UTC (6 years, 1 month ago) by dmcmahill
Branch: MAIN
Changes since 1.1779: +10 -10 lines
Diff to previous 1.1779 (colored)

Change some remaining ONLY_FOR_ARCHS to ONLY_FOR_PLATFORM and NOT_FOR_ARCH to
NOT_FOR_PLATFORM that were missed when these variables were changed ages ago.

Revision 1.1779 / (download) - annotate - [select for diffs], Sat Dec 31 15:20:59 2005 UTC (6 years, 1 month ago) by rillig
Branch: MAIN
Changes since 1.1778: +2 -2 lines
Diff to previous 1.1778 (colored)

Don't check for PKG_FAIL_REASON when doing show-depends-dirs. This prevents
packages that set PKG_FAIL_REASON from being excluded from the bulk build
databases like .index and .dependstree.

Revision 1.1778 / (download) - annotate - [select for diffs], Sat Dec 31 08:18:34 2005 UTC (6 years, 1 month ago) by wiz
Branch: MAIN
Changes since 1.1777: +4 -4 lines
Diff to previous 1.1777 (colored)

Fix some quoting as per PR 30956 by Chapman Flack.

Revision 1.1777 / (download) - annotate - [select for diffs], Sat Dec 31 08:05:00 2005 UTC (6 years, 1 month ago) by wiz
Branch: MAIN
Changes since 1.1776: +2 -2 lines
Diff to previous 1.1776 (colored)

If target is real-su-bin-install, set DEPENDS_TARGET to bin-install.
From Chapman Flack in PR 30928.

Revision 1.1776 / (download) - annotate - [select for diffs], Sat Dec 31 07:53:11 2005 UTC (6 years, 1 month ago) by wiz
Branch: MAIN
Changes since 1.1775: +3 -3 lines
Diff to previous 1.1775 (colored)

Handle automatic dependencies in bin-install correctly.
From Chapman Flack in PR 32422.

Revision 1.1775 / (download) - annotate - [select for diffs], Thu Dec 29 06:18:53 2005 UTC (6 years, 1 month ago) by jlam
Branch: MAIN
Changes since 1.1774: +2 -13 lines
Diff to previous 1.1774 (colored)

Teach the pkgsrc infrastructure to Just Know when the pkginstall
framework should be used.  This is implemented by creating a small
file mk/install/pkginstall.mk that guards the implementation makefile
mk/install/bsd.pkginstall.mk.  This guard file just checks whether
one of the pkginstall-related variables is non-empty, and if so, then
the implementation file is automatically included.  This completely
deprecates USE_PKGINSTALL, which no longer has any affect in pkgsrc.

Revision 1.1774 / (download) - annotate - [select for diffs], Mon Dec 5 22:07:07 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2005Q4-base, pkgsrc-2005Q4
Changes since 1.1773: +27 -27 lines
Diff to previous 1.1773 (colored)

Applied all quoting fixes found by "pkglint --autofix".

Revision 1.1773 / (download) - annotate - [select for diffs], Sun Dec 4 15:52:32 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1772: +1 -6 lines
Diff to previous 1.1772 (colored)

The checksums for pkgsrc patches are always checked -- even if
NO_CHECKSUM is set.

Revision 1.1772 / (download) - annotate - [select for diffs], Thu Dec 1 11:18:30 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1771: +11 -1 lines
Diff to previous 1.1771 (colored)

Don't create distinfo files in the "makesum" and "makepatchsum" targets
if NO_CHECKSUM is set to "yes". This allows to run "make makepatchsum"
in the top level pkgsrc directory without having to worry about lots of
additional distinfo files being created.

Revision 1.1771 / (download) - annotate - [select for diffs], Thu Dec 1 00:27:56 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1770: +3 -2 lines
Diff to previous 1.1770 (colored)

Inserted "set -e" as the first command in the show-depends-dirs target
to force an early exit as soon as a "cd" command fails. Otherwise, "/"
would have been added as a dependency, leading to undefined behavior.
See PR 32202 for details.

Fixes the second item of PR 32202.

Revision 1.1770 / (download) - annotate - [select for diffs], Thu Dec 1 00:17:05 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1769: +15 -3 lines
Diff to previous 1.1769 (colored)

The new target do-check-pkg-fail-reason should to be a dependency of
every top level target that is intended to be called by the user or by a
package different from the current package. It provides the same action
as the "main" targets like "fetch", "expand", "build" before in case
PKG_FAIL_REASON is set, that is it prints all PKG_FAIL_REASONs and
fails.

Fixes PR 32202.

Implementation notes:
- The target names have the "do-" prefix to not pollute the
  bsd.pkg.check.mk namespace.
- The PKG_SKIP_REASON has no influence on the do-check-pkg-fail-reason
  target, although both are handled with the same code.

Revision 1.1769 / (download) - annotate - [select for diffs], Tue Nov 29 22:18:38 2005 UTC (6 years, 2 months ago) by reed
Branch: MAIN
Changes since 1.1768: +2 -2 lines
Diff to previous 1.1768 (colored)

Fix REQUIRES= when ldd output has wrong number of fields.
(This also fixes problem where on some Linux systems, ldd
outputs linux-gate.so.1 entry without corresponding library.)
This was noticed on Linux.

This was discussed and okayed on the tech-pkg list in February,
2002. I have been using this on NetBSD and Linux since then. (Also
just tested on DragonFly.)

Revision 1.1768 / (download) - annotate - [select for diffs], Wed Nov 23 18:27:13 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1767: +19 -33 lines
Diff to previous 1.1767 (colored)

Per request, back out all the SKIP_AUDIT_PACKAGES changes.
bsd.pkg.mk:1.1758-1.1752
bsd.prefs.mk:1.210
bulk/build:1.79
defaults/mk.conf:1.93-1.92

Revision 1.1767 / (download) - annotate - [select for diffs], Tue Nov 22 03:41:20 2005 UTC (6 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.1766: +2 -2 lines
Diff to previous 1.1766 (colored)

Missing a line from the previous commit that would cause PKG_DB_TMPDIR
to also be forcibly created (if missing) as part of "make install".

Revision 1.1766 / (download) - annotate - [select for diffs], Tue Nov 22 03:38:40 2005 UTC (6 years, 2 months ago) by jlam
Branch: MAIN
Changes since 1.1765: +4 -3 lines
Diff to previous 1.1765 (colored)

Create PKG_DB_TMPDIR (${WRKDIR}/.pkgdb) in a separate step from creating
${WRKDIR}, and just always create it as part of a "make extract".  This
should fix problems where if an old work directory is lying around that
doesn't already have .pkgdb, then a "make reinstall" won't break.

Revision 1.1765 / (download) - annotate - [select for diffs], Sun Nov 20 15:34:33 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1764: +1 -2 lines
Diff to previous 1.1764 (colored)

Removed a line in the _SU_TARGET variable that had been left from
debugging.

Revision 1.1764 / (download) - annotate - [select for diffs], Sun Nov 20 08:07:30 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1763: +2 -2 lines
Diff to previous 1.1763 (colored)

Added subshell parentheses around the command for updating pkg_install.
This allows for copy&paste.

Revision 1.1763 / (download) - annotate - [select for diffs], Sun Nov 20 01:11:14 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1762: +3 -2 lines
Diff to previous 1.1762 (colored)

Reverted the SU_CMD change from between 1.1748 and 1.1749 almost
completely. The only difference to revision 1.1748 is that the
PATH=$$PATH:${SU_CMD_PATH_APPEND} argument is included in single quotes.
This will lead to problems when the PATH should contain single quotes
but works in all other cases. (Single quotes in the PATH hadn't worked
before either.) The tricky part regarding this code is that the PATH and
.CURDIR bypass the SU_CMD. They are evaluated before and inserted as
literals into the command that is executed by the SU_CMD. Preserving
these variables this way circumvents interpretation and modification
through the SU_CMD, but leads to ugly rules for quoting which are
currently not handled completely correctly.

Revision 1.1762 / (download) - annotate - [select for diffs], Sat Nov 19 12:30:41 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1761: +3 -2 lines
Diff to previous 1.1761 (colored)

If the directory of a dependency does not exist, fail instead of (almost)
silently skipping the dependency.

Revision 1.1761 / (download) - annotate - [select for diffs], Fri Nov 18 17:07:13 2005 UTC (6 years, 2 months ago) by tv
Branch: MAIN
Changes since 1.1760: +3 -14 lines
Diff to previous 1.1760 (colored)

Collapse two .for blocks to improve readability:
_ULIMIT_CMD to use a ${...:@var@loop ...@} construct
_ACCEPTABLE to use a !empty(var:Mfoo) conditional

Revision 1.1760 / (download) - annotate - [select for diffs], Fri Nov 18 14:40:21 2005 UTC (6 years, 2 months ago) by tv
Branch: MAIN
Changes since 1.1759: +8 -36 lines
Diff to previous 1.1759 (colored)

Use :D and :U constructs in a few more places to collapse some .if defined
blocks to a more parallelism-readable state.

Revision 1.1759 / (download) - annotate - [select for diffs], Fri Nov 18 14:31:54 2005 UTC (6 years, 2 months ago) by tv
Branch: MAIN
Changes since 1.1758: +3 -12 lines
Diff to previous 1.1758 (colored)

Simplify the _MASTER_SITE_{BACKUP,OVERRIDE} settings a bit by using a :D
construct rather than .if defined(), and changing := to =.

Revision 1.1758 / (download) - annotate - [select for diffs], Thu Nov 17 19:30:22 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1757: +3 -3 lines
Diff to previous 1.1757 (colored)

To support variants of make that run the shell so 'set -e' is true (shell
exits on any command failing), add a '|| ${TRUE}' when running the
check-vulnerable target in do-fetch.

Revision 1.1757 / (download) - annotate - [select for diffs], Thu Nov 17 17:18:01 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1756: +3 -3 lines
Diff to previous 1.1756 (colored)

Back out the previous change.  The output _will_ be visible to the user.
See the "*)" case in the do-fetch target.

Revision 1.1756 / (download) - annotate - [select for diffs], Thu Nov 17 15:57:47 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1755: +4 -4 lines
Diff to previous 1.1755 (colored)

The message that audit-packages is out-of-date is printed on stderr instead
of stdout because the latter would not show up to the user.

Revision 1.1755 / (download) - annotate - [select for diffs], Thu Nov 17 04:12:54 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1754: +5 -3 lines
Diff to previous 1.1754 (colored)

Only show the message about fiddling with mk.conf if the output of
check-vulnerable actually contains some vulnerability ids.

Revision 1.1754 / (download) - annotate - [select for diffs], Thu Nov 17 03:58:16 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1753: +3 -3 lines
Diff to previous 1.1753 (colored)

Minimum audit-packages version is _1_.40, not 0.40

Revision 1.1753 / (download) - annotate - [select for diffs], Wed Nov 16 21:43:40 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1752: +3 -3 lines
Diff to previous 1.1752 (colored)

Missed a couple of underscores.  Add them.

Revision 1.1752 / (download) - annotate - [select for diffs], Wed Nov 16 20:59:22 2005 UTC (6 years, 2 months ago) by erh
Branch: MAIN
Changes since 1.1751: +30 -18 lines
Diff to previous 1.1751 (colored)

Improve the handling of allowed vulnerabilities.  Instead of the single
ALLOW_VULNERABLE_PACKAGES settings that applies to all packages, there can
now be per-package lists of allowed vulnerability ids:
	ALLOW_VULNERABILITIES.<pkgname>=<space separated list of vulnids>

To avoid duplication of code, audit-packages is now used to do these checks.
It can be skipped altogether by setting:
	SKIP_AUDIT_PACKAGES=yes

Revision 1.1751 / (download) - annotate - [select for diffs], Tue Nov 15 21:21:01 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1750: +8 -5 lines
Diff to previous 1.1750 (colored)

Rewrote the _PATH_CMD command, which could not handle a PATH environment
variable before if it had multiple adjacent white-space characters in
it. Removed the dependency on awk(1), as a simple shell script can do
this job, too. Another change is that all kinds of weird pathnames can
be used for PREPEND_PATH, like /bin, "/bin/Program Files", "/     ",
/foo\ bar, and so on. This had not been possible before, too.

Related to PR 32079.

Ok'ed by jlam.

Revision 1.1750 / (download) - annotate - [select for diffs], Tue Nov 15 18:03:40 2005 UTC (6 years, 2 months ago) by gavan
Branch: MAIN
Changes since 1.1749: +2 -2 lines
Diff to previous 1.1749 (colored)

make install doesn't work when updating pkg_install. Recommend make update
instead.

Revision 1.1749 / (download) - annotate - [select for diffs], Tue Nov 15 16:29:10 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1748: +3 -3 lines
Diff to previous 1.1748 (colored)

Allow white-space in the PATH environment variable. Fixes PR 32079. The
shell quoting still isn't completely correct for some other variables.
This needs to be fixed, too.

Revision 1.1748 / (download) - annotate - [select for diffs], Mon Nov 14 04:41:17 2005 UTC (6 years, 2 months ago) by rillig
Branch: MAIN
Changes since 1.1747: +6 -7 lines
Diff to previous 1.1747 (colored)

Removed trailing white-space.

Revision 1.1747 / (download) - annotate - [select for diffs], Wed Nov 9 18:42:32 2005 UTC (6 years, 3 months ago) by tv
Branch: MAIN
Changes since 1.1746: +2 -2 lines
Diff to previous 1.1746 (colored)

Use lt_cv_sys_max_cmd_len in devel/libtool-base, too.

Revision 1.1746 / (download) - annotate - [select for diffs], Sat Nov 5 13:31:43 2005 UTC (6 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.1745: +9 -3 lines
Diff to previous 1.1745 (colored)

Use new automatic flag; depend on appropriate pkg_install version.

Revision 1.1745 / (download) - annotate - [select for diffs], Sat Nov 5 09:37:10 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1744: +3 -3 lines
Diff to previous 1.1744 (colored)

Made the dependency directory check a little stricter. In the worst case
this could produce extra warnings. It does not affect the rest of the
build process at all.

Revision 1.1744 / (download) - annotate - [select for diffs], Fri Nov 4 21:26:19 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1743: +2 -5 lines
Diff to previous 1.1743 (colored)

The last fix did not work. Completely reverted the unintended part of
the last changes.

Revision 1.1743 / (download) - annotate - [select for diffs], Fri Nov 4 20:52:38 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1742: +2 -2 lines
Diff to previous 1.1742 (colored)

Replaced "done" with "esac" to fix a syntax error.

Revision 1.1742 / (download) - annotate - [select for diffs], Fri Nov 4 20:36:42 2005 UTC (6 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.1741: +5 -2 lines
Diff to previous 1.1741 (colored)

Relax rules a bit on INSTALLATION_DIRS -- we still enforce that
directories listed in INSTALLATION_DIRS are created in ${PREFIX}, but
it's now okay to include ${PREFIX} at the front of each, directory,
e.g. this is now okay:

	INSTALLATION_DIRS+=	${PREFIX}/bin

Makes using this variable a bit less unwieldy sometimes.

Revision 1.1741 / (download) - annotate - [select for diffs], Fri Nov 4 20:28:47 2005 UTC (6 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.1740: +2 -5 lines
Diff to previous 1.1740 (colored)

back out part of previous commit that was unintended.

Revision 1.1740 / (download) - annotate - [select for diffs], Fri Nov 4 20:06:14 2005 UTC (6 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.1739: +9 -6 lines
Diff to previous 1.1739 (colored)

Use ${SLEEP} instead of sleep, and note that we use the sleep tool if
we're doing locking.

Revision 1.1739 / (download) - annotate - [select for diffs], Fri Nov 4 11:27:41 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1738: +2 -2 lines
Diff to previous 1.1738 (colored)

Now that all packages using CONFIGURE_DIRS have been checked (and
modified) to not rely on this change, the default value of BUILD_DIRS
can be set to ${CONFIGURE_DIRS} instead of ${WRKSRC}. There are far more
packages setting CONFIGURE_DIRS and BUILD_DIRS to the same value than
there are packages needing different values, so this default seems more
reasonable. Now the default values are:

CONFIGURE_DIRS?=	${WRKSRC}		# (unchanged)
BUILD_DIRS?=		${CONFIGURE_DIRS}
INSTALL_DIRS?=		${BUILD_DIRS}		# (unchanged)

Revision 1.1738 / (download) - annotate - [select for diffs], Wed Nov 2 18:32:19 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1737: +2 -3 lines
Diff to previous 1.1737 (colored)

Removed the unused variable GNU_CONFIGURE_INFODIR, as suggested by
Stoned Elipod.

Revision 1.1737 / (download) - annotate - [select for diffs], Mon Oct 31 09:50:44 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1736: +3 -3 lines
Diff to previous 1.1736 (colored)

Changed back the default values for GNU_CONFIGURE_{INFO,MAN}DIR to what
they had been before my last change. I had thought it would be more
intuitive if they were based on GNU_CONFIGURE_PREFIX instead of PREFIX,
but this might break some packages.

Revision 1.1736 / (download) - annotate - [select for diffs], Mon Oct 31 09:42:19 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1735: +11 -9 lines
Diff to previous 1.1735 (colored)

Added two new variables, GNU_CONFIGURE_INFODIR and GNU_CONFIGURE_MANDIR.
Up to now, a package that wanted to use a different location for
--mandir had to first define CONFIGURE_HAS_MANDIR=no and then
CONFIGURE_ARGS+=--mandir=${...}, which looks weird. Now it only has to
set GNU_CONFIGURE_MANDIR.

Revision 1.1735 / (download) - annotate - [select for diffs], Mon Oct 24 23:23:00 2005 UTC (6 years, 3 months ago) by wiz
Branch: MAIN
Changes since 1.1734: +2 -2 lines
Diff to previous 1.1734 (colored)

Use correct (internal) variable for pkg_add arguments.

Revision 1.1734 / (download) - annotate - [select for diffs], Mon Oct 24 18:28:42 2005 UTC (6 years, 3 months ago) by rillig
Branch: MAIN
Changes since 1.1733: +4 -4 lines
Diff to previous 1.1733 (colored)

Use $${foo} instead of $$foo to prevent ident(1) from reporting false
positives. No functional changes.

Revision 1.1733 / (download) - annotate - [select for diffs], Sun Oct 23 16:58:42 2005 UTC (6 years, 3 months ago) by minskim
Branch: MAIN
Changes since 1.1732: +2 -2 lines
Diff to previous 1.1732 (colored)

Pass PKG_REQD through shell environment, instead of arguments of make,
so that a dependent package can override it properly.  This makes
INSTALL_MAKE_FLAGS work when a package is installed as a dependency.

Revision 1.1732 / (download) - annotate - [select for diffs], Sun Oct 16 17:48:24 2005 UTC (6 years, 3 months ago) by tv
Branch: MAIN
Changes since 1.1731: +2 -3 lines
Diff to previous 1.1731 (colored)

Use show-vars-eval in show-needs-update.

Revision 1.1731 / (download) - annotate - [select for diffs], Sun Oct 16 17:44:45 2005 UTC (6 years, 3 months ago) by tv
Branch: MAIN
Changes since 1.1730: +9 -1 lines
Diff to previous 1.1730 (colored)

Add "show-vars-eval" target, which outputs eval-able shell expressions
to allow easy setting of multiple variables in one invocation.

Revision 1.1730 / (download) - annotate - [select for diffs], Mon Oct 10 17:37:17 2005 UTC (6 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.1729: +2 -2 lines
Diff to previous 1.1729 (colored)

For INSTALLATION_DIRS, use ${PKGMANDIR} instead of "man".
Also before it used a wildcard for *man and now get rid of that
wildcard in front.

Revision 1.1729 / (download) - annotate - [select for diffs], Sat Oct 8 13:16:28 2005 UTC (6 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1728: +27 -14 lines
Diff to previous 1.1728 (colored)

CONFIGURE_DIRS, BUILD_DIRS, TEST_DIRS and INSTALL_DIRS are interpreted
relative to ${WRKSRC}. This makes it possible to shorten definitions
like "BUILD_DIRS=${WRKSRC}/foo ${WRKSRC}/bar" in package Makefiles to
"BUILD_DIRS=foo bar". Almost all current uses of those directories are
given as absolute directories (mostly in the form ${WRKSRC}/foo), which
will work as they did before.

Revision 1.1728 / (download) - annotate - [select for diffs], Fri Oct 7 17:39:28 2005 UTC (6 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1727: +10 -9 lines
Diff to previous 1.1727 (colored)

Renamed HTML_PKGNAME to _HTML_PKGLINK, which describes its contents more
precisely. Added _HTML_PKGNAME and _HTML_PKGPATH variables for better
readability. Fixed quoting style in print-summary-data.

Revision 1.1727 / (download) - annotate - [select for diffs], Fri Oct 7 16:57:14 2005 UTC (6 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1726: +5 -9 lines
Diff to previous 1.1726 (colored)

Replaced some `if's with `case's to make the code simpler. Merged
multiple ${ECHO_N} into one ${ECHO}.

Revision 1.1726 / (download) - annotate - [select for diffs], Thu Oct 6 15:25:47 2005 UTC (6 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.1725: +3 -1 lines
Diff to previous 1.1725 (colored)

For print-PLIST generation, make sure that ${PKGMANDIR} becomes "man".

Revision 1.1725 / (download) - annotate - [select for diffs], Tue Oct 4 20:50:49 2005 UTC (6 years, 4 months ago) by seb
Branch: MAIN
Changes since 1.1724: +2 -2 lines
Diff to previous 1.1724 (colored)

whitespace police.

Revision 1.1724 / (download) - annotate - [select for diffs], Tue Oct 4 17:43:57 2005 UTC (6 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.1723: +2 -1 lines
Diff to previous 1.1723 (colored)

Add PKGMANDIR in the MAKE_ENV.
(Previously in my own pkgsrc I had done this in
various individual makefiles.)

Revision 1.1723 / (download) - annotate - [select for diffs], Tue Oct 4 17:33:44 2005 UTC (6 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.1722: +6 -6 lines
Diff to previous 1.1722 (colored)

Remove accidental extra space.
And also fix four places using spaces instead of a tab to be consistent.
(For some reason my cvs diff didn't show anything though.)

Revision 1.1722 / (download) - annotate - [select for diffs], Tue Oct 4 17:27:00 2005 UTC (6 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.1721: +21 -5 lines
Diff to previous 1.1721 (colored)

Add custom PKGMANDIR setting to mk/defaults/mk.conf.  This is a
pathname relative to ${PREFIX} of directory holding the manual pages
and man directories. I have been using this for over two years.

This defaults to "man" so no change.

If using GNU_CONFIGURE then set --mandir.  (Unless CONFIGURE_HAS_MANDIR
is no because some old GNU configure scripts are too old. This is
similar to existing CONFIGURE_HAS_INFODIR.)

Add PKGMANDIR to PLIST_SUBST.  Add plist awk pattern-action statement
to convert man/ to ${PKGMANDIR}/. (This might need to be double checked
for some PLISTs that prefix some custom settings in front. qmail
used to do this, but now I see it does not.)

When "Decompressing manual pages" convert man/ also.

I have several other changes to commit for individual packages.

I chose not to modify the INSTALL_MAN or INSTALLATION_DIRS
to also convert man/ to PKGMANDIR/ because I thought this may
make it more confusing. So instead, I modify the individual
uses of these instead. (Todo: modify pkglint to check for this?)

(agc@ of the pkgsrc-pmc asked me to make these changes.)

Revision 1.1721 / (download) - annotate - [select for diffs], Tue Oct 4 16:45:25 2005 UTC (6 years, 4 months ago) by reed
Branch: MAIN
Changes since 1.1720: +4 -4 lines
Diff to previous 1.1720 (colored)

In man page routines, match the "cat" sub-directories
for cat pages having "[0-9]" suffixes instead of just "0".
Some systems install cat pages with suffix number same as the cat
section number.

(This has been in my pkgsrc tree for probably a couple years,
but looking today, I do see man/cat1/ftp.1 on one of my systems.)

Revision 1.1720 / (download) - annotate - [select for diffs], Wed Sep 28 08:24:52 2005 UTC (6 years, 4 months ago) by rillig
Branch: MAIN
Changes since 1.1719: +13 -12 lines
Diff to previous 1.1719 (colored)

Added a variable LICENSE_FILE that may be set to point to the license
file of the package. It does _not_ replace the LICENSE variable. The
variable is currently only used in the show-license target. It is
intended that LICENSE_FILE is used for licenses that only apply to a
single package or a package group, so that the number of licenses in the
licenses/ directory is kept small.

Revision 1.1719 / (download) - annotate - [select for diffs], Fri Sep 16 06:09:02 2005 UTC (6 years, 4 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q3-base, pkgsrc-2005Q3
Changes since 1.1718: +4 -2 lines
Diff to previous 1.1718 (colored)

Remove the CHECK_FILES bits during deinstall so that they are regenerated
from scratch during a reinstall.  This makes CHECK_FILES more useful when
debugging packages with broken PLISTs.

Revision 1.1718 / (download) - annotate - [select for diffs], Fri Aug 26 14:47:30 2005 UTC (6 years, 5 months ago) by xtraeme
Branch: MAIN
Changes since 1.1717: +4 -3 lines
Diff to previous 1.1717 (colored)

_RESUME_TRANSFER: only try to get the value of the temp file when it's
available.

Revision 1.1717 / (download) - annotate - [select for diffs], Thu Aug 18 19:24:15 2005 UTC (6 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.1716: +9 -1 lines
Diff to previous 1.1716 (colored)

INSTALLATION_DIRS implies NO_MTREE:  If a package sets INSTALLATION_DIRS,
then it's known to pre-create all of the directories that it needs at
install-time, so we don't need mtree to do it for us.

Revision 1.1716 / (download) - annotate - [select for diffs], Mon Aug 15 17:35:45 2005 UTC (6 years, 5 months ago) by jlam
Branch: MAIN
Changes since 1.1715: +10 -10 lines
Diff to previous 1.1715 (colored)

Fix an annoying whitespace issue for 80 character-width displays.

Revision 1.1715 / (download) - annotate - [select for diffs], Mon Aug 15 13:05:18 2005 UTC (6 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.1714: +2 -2 lines
Diff to previous 1.1714 (colored)

In print-pkg-size-this, initialize s before summing up all file sizes. This
results in "0" being printed for empty packages, which had been "" before.
Fixes PR 30955.

Revision 1.1714 / (download) - annotate - [select for diffs], Sun Aug 14 19:52:26 2005 UTC (6 years, 5 months ago) by rillig
Branch: MAIN
Changes since 1.1713: +2 -3 lines
Diff to previous 1.1713 (colored)

Reverted the change from revision 1.1710, which sorted all DEPENDS and
BUILD_DEPENDS alphabetically. Some packages depend on the
first-come-first-serve order.

Revision 1.1713 / (download) - annotate - [select for diffs], Sun Aug 14 17:26:13 2005 UTC (6 years, 5 months ago) by kristerw
Branch: MAIN
Changes since 1.1712: +2 -2 lines
Diff to previous 1.1712 (colored)

The check-files-post need to be done before post-install-script,
to prevent errors from pacakes using e.g. CONF_FILES.

Revision 1.1712 / (download) - annotate - [select for diffs], Wed Aug 10 18:21:07 2005 UTC (6 years, 6 months ago) by kristerw
Branch: MAIN
Changes since 1.1711: +4 -4 lines
Diff to previous 1.1711 (colored)

Move the check-files-post check so that it is done after the automatic
manual page handling.  This prevents the check from reporting errors
for manpages that are (un)compressed by the automatic manual page handling.

Revision 1.1711 / (download) - annotate - [select for diffs], Mon Aug 8 15:38:19 2005 UTC (6 years, 6 months ago) by veego
Branch: MAIN
Changes since 1.1710: +7 -7 lines
Diff to previous 1.1710 (colored)

Restore the @(..)s which were removed in rev 1.1706.
They are needed in the fetch-list case to prevent outputting anything if
the distfile is allready in $DISTDIR.

Revision 1.1710 / (download) - annotate - [select for diffs], Fri Jul 22 18:59:55 2005 UTC (6 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.1709: +3 -2 lines
Diff to previous 1.1709 (colored)

Sort the dependencies list alphabetically when checking if they are
installed. That makes it easier to check if a specific package is listed
or not.

Revision 1.1709 / (download) - annotate - [select for diffs], Sun Jul 17 04:17:09 2005 UTC (6 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1708: +2 -1 lines
Diff to previous 1.1708 (colored)

Override the INSTALL setting in sys.mk that messes up the rest of the
logic in the tools framework.

Revision 1.1708 / (download) - annotate - [select for diffs], Sat Jul 16 01:19:27 2005 UTC (6 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1707: +2 -2 lines
Diff to previous 1.1707 (colored)

Get rid of USE_PERL5.  The new way to express needing the Perl executable
around at either build-time or at run-time is:

	USE_TOOLS+=	perl		# build-time
	USE_TOOLS+=	perl:run	# run-time

Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.

Revision 1.1707 / (download) - annotate - [select for diffs], Fri Jul 15 18:27:54 2005 UTC (6 years, 6 months ago) by jlam
Branch: MAIN
Changes since 1.1706: +10 -10 lines
Diff to previous 1.1706 (colored)

Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
PKGSRC_USE_TOOLS go away.  There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.

Revision 1.1706 / (download) - annotate - [select for diffs], Wed Jul 6 05:52:34 2005 UTC (6 years, 7 months ago) by reed
Branch: MAIN
Changes since 1.1705: +9 -14 lines
Diff to previous 1.1705 (colored)

For the fetch-list target: Do not use mkdir if just creating a shell
script that will make the directory later. This fixes the problem
where it fails when doesn't have write access -- for example use
"make fetch-list" to create the shell script to use on another
system.

Thank you, Geert Hendrickx, for your feedback.

Also in a few places echo ${fetchfile:T} instead of ${fetchfile}.

(Todo: maybe should not say "not fetched" until has tried all sites.)

Revision 1.1705 / (download) - annotate - [select for diffs], Mon Jun 27 16:25:43 2005 UTC (6 years, 7 months ago) by rillig
Branch: MAIN
Changes since 1.1704: +2 -2 lines
Diff to previous 1.1704 (colored)

pkglint does not output any "OK" lines by default, so there's no need to
filter them out.

Revision 1.1704 / (download) - annotate - [select for diffs], Mon Jun 27 13:34:41 2005 UTC (6 years, 7 months ago) by wiz
Branch: MAIN
Changes since 1.1703: +2 -2 lines
Diff to previous 1.1703 (colored)

Improve English in warning. From Rhialto in PR 30610. (second occurrence)

Revision 1.1703 / (download) - annotate - [select for diffs], Mon Jun 27 13:33:55 2005 UTC (6 years, 7 months ago) by wiz
Branch: MAIN
Changes since 1.1702: +2 -2 lines
Diff to previous 1.1702 (colored)

Improve English in warning. From Rhialto in PR 30610.

Revision 1.1702 / (download) - annotate - [select for diffs], Thu Jun 23 18:41:57 2005 UTC (6 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1701: +2 -2 lines
Diff to previous 1.1701 (colored)

Clean up some clutter in pkgsrc/mk: move the ${OPSYS}.*.dist mtree
files into mk/platform, where they now live with the ${OPSYS}.mk files.

Revision 1.1701 / (download) - annotate - [select for diffs], Thu Jun 23 12:12:11 2005 UTC (6 years, 7 months ago) by wiz
Branch: MAIN
Changes since 1.1700: +1 -3 lines
Diff to previous 1.1700 (colored)

Back out previous -- committed by mistake.

Revision 1.1700 / (download) - annotate - [select for diffs], Thu Jun 23 12:11:07 2005 UTC (6 years, 7 months ago) by wiz
Branch: MAIN
Changes since 1.1699: +3 -1 lines
Diff to previous 1.1699 (colored)

Add missing line continuation backslashes.
Noted by Jukka Salmi.

Revision 1.1699 / (download) - annotate - [select for diffs], Thu Jun 23 09:02:46 2005 UTC (6 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1698: +1 -67 lines
Diff to previous 1.1698 (colored)

Split out the check-wrkref implementation and related variables from
bsd.pkg.mk into bsd.pkg.check.mk file.

Revision 1.1698 / (download) - annotate - [select for diffs], Thu Jun 23 08:31:20 2005 UTC (6 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1697: +9 -114 lines
Diff to previous 1.1697 (colored)

Split out the check-files implementation and related variables into
a new bsd.pkg.check.mk file.  This new file will eventually collect
all of the various "check" targets that are run at install-time.
While here, change the implementation of check-files so that it is
not so monolithic.

Change the meaning of the CHECK_FILES variables so that if it's not
"no", then the file checks are run.  Also, allow these checks to be
run if the user explicitly sets CHECK_FILES in /etc/mk.conf, even if
PKG_DEVELOPER is not defined.

Revision 1.1697 / (download) - annotate - [select for diffs], Thu Jun 23 04:15:47 2005 UTC (6 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1696: +4 -4 lines
Diff to previous 1.1696 (colored)

Reverse the checks for the value of CHECK_WRKREF so that if it's value
isn't "no", then we run the checks.  This allows for possibly making
CHECK_WRKREF a more multi-valued option or list in the future.

Revision 1.1696 / (download) - annotate - [select for diffs], Tue Jun 14 22:02:00 2005 UTC (6 years, 7 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2005Q2-base, pkgsrc-2005Q2
Changes since 1.1695: +3 -2 lines
Diff to previous 1.1695 (colored)

Allow the test for whether the file is a text file to be overridden via
CHECK_WRKREF_IS_TEXT_FILE.

Revision 1.1695 / (download) - annotate - [select for diffs], Mon Jun 13 02:25:50 2005 UTC (6 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1694: +20 -7 lines
Diff to previous 1.1694 (colored)

In the check-wrkref target, change the algorithm so that text files
are checked for ${WRKDIR}, but all files are checked for ${TOOLS_DIR}
(assuming that ${TOOLS_DIR} is in ${WRKDIR}).  Also, let CHECK_WRKREF_PKG
set the name of the package to check.

Revision 1.1694 / (download) - annotate - [select for diffs], Sat Jun 11 04:26:17 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1693: +2 -1 lines
Diff to previous 1.1693 (colored)

Add a default fall-through for the shell case statement (portability
issue).

Revision 1.1693 / (download) - annotate - [select for diffs], Fri Jun 10 23:38:00 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1692: +56 -1 lines
Diff to previous 1.1692 (colored)

check-wrkref is a make target that greps through the installed files
for a package and looks for references to the build directory.  If
any such references are found and PKG_DEVELOPER is defined, then exit
with an error.  This target is automatically run after a package is
installed if CHECK_WRKREF is "yes".  The default value for CHECK_WRKREF
is "no".

You can specify certain files to be skipped during the check by setting
CHECK_WRKREF_SKIP to a list of shell globs.  Installed files that
match these globs are skipped when running the check-wrkref target.

The original implementation was from Dan McMahill sent to me in private
email.  I've added a few more bells and whistles for this commit.  This
target will be helpful for catching any unwrapped files or mis-embedded
tool paths.

Revision 1.1692 / (download) - annotate - [select for diffs], Thu Jun 9 16:26:23 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1691: +20 -10 lines
Diff to previous 1.1691 (colored)

General improvements to the changes-entry target:

* Improve the documentation.
* Avoid running commands during Makefile processing by using the :sh
  modifier instead of defining variables using !=
* Add a new variable PKGSRC_CHANGES that holds the path to the CHANGES
  file to be modified.
* Use ${ID} and ${DATE}, which are provided by the tools framework and
  avoid PATH issues.

Revision 1.1691 / (download) - annotate - [select for diffs], Thu Jun 9 16:09:58 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1690: +2 -3 lines
Diff to previous 1.1690 (colored)

Don't reinvent PKGPATH, which already contains just the "category/package"
portion of the path.

Revision 1.1690 / (download) - annotate - [select for diffs], Thu Jun 9 16:08:27 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1689: +16 -1 lines
Diff to previous 1.1689 (colored)

Add a documentation block above the changes-entry target.

Revision 1.1689 / (download) - annotate - [select for diffs], Thu Jun 9 10:09:58 2005 UTC (6 years, 8 months ago) by wiz
Branch: MAIN
Changes since 1.1688: +3 -5 lines
Diff to previous 1.1688 (colored)

Delay running of id until it is needed. Fixes PR 30477 by Neil Hoggarth.

Revision 1.1688 / (download) - annotate - [select for diffs], Wed Jun 8 22:44:08 2005 UTC (6 years, 8 months ago) by wiz
Branch: MAIN
Changes since 1.1687: +22 -1 lines
Diff to previous 1.1687 (colored)

Add changes-entry target, which adds an entry for the current package
into pkgsrc/doc/CHANGES.
The type of the entry depends on what CTYPE is set to, which defaults
to "Updated".  Other possible values are "Added", "Renamed", "Moved",
and "Removed". An example usage would be:
	cd /usr/pkgsrc/category/package
	make changes-entry CTYPE=Added
after you added a new package, and similar for the others.
If NETBSD_LOGIN_NAME is not set in /etc/mk.conf, it defaults to
your local login name.

Revision 1.1687 / (download) - annotate - [select for diffs], Sat Jun 4 20:56:47 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1686: +54 -54 lines
Diff to previous 1.1686 (colored)

Added a leading underscore to the names of the *_COOKIE variables, as they
are not part of the public interface.

Revision 1.1686 / (download) - annotate - [select for diffs], Fri Jun 3 20:22:59 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1685: +1 -14 lines
Diff to previous 1.1685 (colored)

Back out revision 1.1684.  MAKEFLAGS was being propagated incorrectly
through to dependencies, which caused dependencies to have improper
lists of tools required.

XXX This whole mess with MAKEFLAGS and which ones are passed along when
XXX running the install-depends target needs to be fixed for real.

Revision 1.1685 / (download) - annotate - [select for diffs], Wed Jun 1 18:03:05 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1684: +1 -5 lines
Diff to previous 1.1684 (colored)

Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.

Revision 1.1684 / (download) - annotate - [select for diffs], Wed Jun 1 17:27:22 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1683: +14 -1 lines
Diff to previous 1.1683 (colored)

*.makevars.mk doesn't exist until after ${WRKDIR} is created, which
doesn't happen until after the package is extracted.  Prior to
extraction, cache the variables named in MAKEVARS using MAKEFLAGS
instead.  This avoids invoking each expensive computation up to four
times before it gets cached.  For packages that include lots of
buildlink3.mk files, this saves a lot of CPU time.

Revision 1.1683 / (download) - annotate - [select for diffs], Wed Jun 1 17:05:19 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1682: +1 -2 lines
Diff to previous 1.1682 (colored)

Include bsd.makevars.mk in bsd.prefs.mk instead of bsd.pkg.mk.  This
allows the saved make variables to be re-set whenever bsd.prefs.mk is
included, and is a shortcut for the common case where a Makefile
includes both.

Revision 1.1682 / (download) - annotate - [select for diffs], Wed Jun 1 03:04:16 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1681: +2 -22 lines
Diff to previous 1.1681 (colored)

Separate out the logic to include the correct <phase>.makevars.mk file
into a new file bsd.makevars.mk that can be included by other Makefiles.

Revision 1.1681 / (download) - annotate - [select for diffs], Tue May 31 21:53:26 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1680: +1 -2 lines
Diff to previous 1.1680 (colored)

Convert USE_GNU_TOOLS into USE_TOOLS as the former is no longer supported
in pkgsrc.

Revision 1.1680 / (download) - annotate - [select for diffs], Tue May 31 12:10:07 2005 UTC (6 years, 8 months ago) by dillo
Branch: MAIN
Changes since 1.1679: +4 -4 lines
Diff to previous 1.1679 (colored)

Rename describe-options to show-options, replacing the old show-options
target.

Revision 1.1679 / (download) - annotate - [select for diffs], Sun May 29 17:12:16 2005 UTC (6 years, 8 months ago) by jmmv
Branch: MAIN
Changes since 1.1678: +4 -1 lines
Diff to previous 1.1678 (colored)

Simplify unprivileged builds by adding a new variable, UNPRIVILEGED, that,
when set to YES, changes multiple defaults to let this work properly.

Revision 1.1678 / (download) - annotate - [select for diffs], Thu May 26 11:15:30 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1677: +2 -2 lines
Diff to previous 1.1677 (colored)

Fixed the output of show-tools.

Revision 1.1677 / (download) - annotate - [select for diffs], Sun May 22 20:15:40 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1676: +4 -20 lines
Diff to previous 1.1676 (colored)

Finish removing instances of _USE_NEW_TOOLS from pkgsrc.

Revision 1.1676 / (download) - annotate - [select for diffs], Sun May 22 19:11:12 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1675: +1 -18 lines
Diff to previous 1.1675 (colored)

Remove the old tools framework and references to _USE_NEW_TOOLS.

Revision 1.1675 / (download) - annotate - [select for diffs], Sun May 22 15:31:03 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1674: +34 -34 lines
Diff to previous 1.1674 (colored)

Fixed some quoting issues.

Revision 1.1674 / (download) - annotate - [select for diffs], Sat May 21 01:55:53 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1673: +10 -5 lines
Diff to previous 1.1673 (colored)

In computing _REPLACE_LOCALEDIR_PATTERNS_FIND_cmd, make sure the :sh
operator does not result in an empty string as make(1) doesn't like
them.  Also, rewrite the variable substitution for the find(1) command
to be more readable, and get rid of the extra grep(1) in favor of
using :N.

Revision 1.1673 / (download) - annotate - [select for diffs], Fri May 20 21:36:05 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1672: +5 -6 lines
Diff to previous 1.1672 (colored)

Change instances where we stored `shell command` in a make variable into
variables that use the :sh modifier.  This still causes expansion to only
happen when referenced, and has the advantage of being :Q-safe.

Bring back the changes from revision 1.19 of mk/subst.mk now that the
problem noted above has been fixed.  This passes the buildlink-unwrap
regression test.

Revision 1.1672 / (download) - annotate - [select for diffs], Wed May 18 23:59:44 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1671: +3 -2 lines
Diff to previous 1.1671 (colored)

Replaced the NO_WRKDIR_SYMLINK variable with CREATE_WRKDIR_SYMLINK, as
suggested by Alistair. If you don't want the symlinks, set the variable
to "no".

Revision 1.1671 / (download) - annotate - [select for diffs], Wed May 18 19:42:01 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1670: +3 -1 lines
Diff to previous 1.1670 (colored)

If NO_WRKDIR_SYMLINK is defined, no symlink to ${WRKSRC} is created when
the WRKOBJDIR is set explicitly. This allows for having pkgsrc mounted
r/w without actually modifying it.

Revision 1.1670 / (download) - annotate - [select for diffs], Wed May 18 02:52:38 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1669: +14 -1 lines
Diff to previous 1.1669 (colored)

Added the show-tools target, which emits a shell code fragment defining all
tools known to the pkgsrc infrastructure.

Revision 1.1669 / (download) - annotate - [select for diffs], Tue May 17 22:07:56 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1668: +6 -2 lines
Diff to previous 1.1668 (colored)

Turn _MANCOMPRESSED into a strictly "yes" and "no" variable
(case-sensitive) to simplify writing the do-install target code that
automatically compresses or decompresses man pages after installation.

Revision 1.1668 / (download) - annotate - [select for diffs], Tue May 17 21:46:59 2005 UTC (6 years, 8 months ago) by dmcmahill
Branch: MAIN
Changes since 1.1667: +8 -6 lines
Diff to previous 1.1667 (colored)

Rework the README.html generation code.  Major changes are:

- completely redo the code which decides on the machine architecture,
  operating system, and operating system version for the binary packages.
  The old way just used to directory names to take a guess.  The new
  way creates a cache file containing meta-data for all the binary packages
  in each "All" directory.  This cache file is consulted when generating
  the lists of available binary packages.  The meta-data is obtained with
  pkg_info so it should always be correct even if you do something silly
  like mix OS_VERSION or MACHINE_ARCH packages up in the same directory.

  Among the benefits are:  works when PACKAGES is not $PKGSRC/packages,
  works with a more or less arbitrary subdirectory structure, works
  when there are subdirectories for multiple operating systems.

  This portion of the fix should address PR25390.

  The cache files are only updated when the contents of an "All" directory
  changes or if the cache file format changes.  There is some room for
  improving the updating of the cache files, but its not too bad the way
  it is.

- fix up some of the awk code so that generadme.awk works with Solaris
  nawk as well as NetBSD's nawk and gawk (for pre-2.0 systems).

- remove some "if ! foo" shell constructs to increase portability.

- be more consistent with what variables get passed to mkreadme from
  make and which ones are determined automatically.  Mostly this meant
  moving stuff into mkreadme to make it easier to run it standalone.

Revision 1.1667 / (download) - annotate - [select for diffs], Tue May 17 06:31:00 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
CVS Tags: tv-derecurse-merge
Changes since 1.1666: +2 -2 lines
Diff to previous 1.1666 (colored)

Save the names of the patches applied during the patch phase into the
patch cookie file, one per line.  A package with no patches applied
will have a patch cookie file with no lines (zero bytes).

Revision 1.1666 / (download) - annotate - [select for diffs], Mon May 16 18:01:12 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1665: +2 -2 lines
Diff to previous 1.1665 (colored)

Don't have USE_TOOLS+=imake replace USE_IMAKE.  Rather let the former
specify that imake is used by the package, while the latter triggers
the special do-configure process.

Revision 1.1665 / (download) - annotate - [select for diffs], Mon May 16 15:20:15 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1664: +5 -2 lines
Diff to previous 1.1664 (colored)

Fix mistake in previous commit -- expr is required by the wrapper
framework.  Problem & fix from tron@.

Revision 1.1664 / (download) - annotate - [select for diffs], Mon May 16 05:11:51 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1663: +3 -3 lines
Diff to previous 1.1663 (colored)

No package seems to be using ${NICE} so don't require it.

Revision 1.1663 / (download) - annotate - [select for diffs], Mon May 16 05:09:21 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1662: +3 -3 lines
Diff to previous 1.1662 (colored)

Don't require m4 for all packages, only for packages that use it.

Revision 1.1662 / (download) - annotate - [select for diffs], Mon May 16 04:54:11 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1661: +5 -5 lines
Diff to previous 1.1661 (colored)

tee is only used by bsd.bulk-pkg.mk.

Revision 1.1661 / (download) - annotate - [select for diffs], Mon May 16 04:48:05 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1660: +8 -4 lines
Diff to previous 1.1660 (colored)

We only need "date" to write the date into the +PRESERVE file.

Revision 1.1660 / (download) - annotate - [select for diffs], Mon May 16 04:39:04 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1659: +6 -6 lines
Diff to previous 1.1659 (colored)

expr is only used by bsd.bulk-pkg.mk.

Revision 1.1659 / (download) - annotate - [select for diffs], Mon May 16 04:30:41 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1658: +8 -3 lines
Diff to previous 1.1658 (colored)

tsort is only used by bsd.bulk-pkg.mk.

Revision 1.1658 / (download) - annotate - [select for diffs], Mon May 16 03:07:38 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1657: +4 -4 lines
Diff to previous 1.1657 (colored)

Change the EXTRACT_USING_PAX defined/undefined option into a EXTRACT_USING
which can take multiple values -- "pax" or "gtar".  The default value
of EXTRACT_USING is "pax", which more closely matches reality since
before, we were using bootstrap "tar" for ${GTAR} and it was actually
pax-as-tar.  Also, stop pretending pax-as-tar from the bootstrap kit
or on NetBSD is GNU tar.  Lastly, in bsd.pkg.extract.mk, note whether
we need "pax" or "gtar" depending on what we need to extract the
distfiles.

Revision 1.1657 / (download) - annotate - [select for diffs], Mon May 16 00:11:50 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1656: +7 -4 lines
Diff to previous 1.1656 (colored)

We only need mtree if NO_MTREE isn't defined.

Revision 1.1656 / (download) - annotate - [select for diffs], Mon May 16 00:00:35 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1655: +8 -6 lines
Diff to previous 1.1655 (colored)

Consolidate the bits that add to PKGSRC_USE_TOOLS, and improve the
comment for shlock.

Revision 1.1655 / (download) - annotate - [select for diffs], Sun May 15 21:32:42 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1654: +43 -14 lines
Diff to previous 1.1654 (colored)

Fix the MANZ handling in bsd.pkg.mk.  If MANZ is defined, then we want
the final man pages to be compressed.  If MANZ is not defined, then
we want the final man pages to be uncompressed.

We need to figure out if during installation, we need either gunzip
or gzip to decompress or compress the installed man pages.  If a
package sets MANCOMPRESSED to "yes" or "no", then it's an indication
to the install code that the package itself installed the man pages
either compressed or uncompressed.  If a package sets
MANCOMPRESSED_IF_MANZ, then the package uses BSD-style makefiles, so
we need to determine if the BSD-style makefile causes the man pages
to be compressed or not.  In this case, we need to check in PKGMAKECONF
whether MANZ is set or not.

XXX Perhaps we should also check for MKMANZ if a package uses BSD-style
XXX makefiles?

Revision 1.1654 / (download) - annotate - [select for diffs], Sun May 15 05:05:47 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1653: +5 -5 lines
Diff to previous 1.1653 (colored)

We only need gzcat when requested by the extract and patch phases, or
if the package itself requests it.

Revision 1.1653 / (download) - annotate - [select for diffs], Sat May 14 22:19:07 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1652: +11 -9 lines
Diff to previous 1.1652 (colored)

Rewrote the show-depends-dirs target: fixed shell quoting, omitted
duplicates in the output, output warnings if necessary. The $$dlist at
the end is unquoted intentionally to omit spaces in the output.
Approved by jlam.

Revision 1.1652 / (download) - annotate - [select for diffs], Sat May 14 21:15:07 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1651: +3 -3 lines
Diff to previous 1.1651 (colored)

Consider ${TAR} differently from ${GTAR}.  Currently, mark pkgsrc down
as needing both (no impact since they're both satisfied by the tar
binary installed by the bootstrap kit).  There's some funniness in
the extraction code where we check for pax or GNU tar that needs to
be resolved.  Remove the TAR=${GTAR} hack since it's no longer needed
after these changes.

XXX Later, a sweep needs to be made to see where we actually need GTAR
XXX and where we only need TAR, probably triggered by whether we call it
XXX with the "z" option or not.  Packages that need GTAR should explicitly
XXX add USE_TOOLS+=gtar to the package Makefile.

Revision 1.1651 / (download) - annotate - [select for diffs], Sat May 14 19:37:53 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1650: +4 -211 lines
Diff to previous 1.1650 (colored)

Separate out the variables and targets for the "patch" phase into a
separate file pkgsrc/mk/bsd.pkg.patch.mk.  Also, include this file
ahead of the inclusion of bsd.tools.mk so that tools required to
patch are created by the tools framework.

Revision 1.1650 / (download) - annotate - [select for diffs], Sat May 14 07:15:29 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1649: +3 -4 lines
Diff to previous 1.1649 (colored)

If we use the new tools framework, the _USE_GMAKE is unnecessary as we
simply check for whether "gmake" is in USE_TOOLS.

Revision 1.1649 / (download) - annotate - [select for diffs], Sat May 14 06:04:44 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1648: +11 -11 lines
Diff to previous 1.1648 (colored)

compiler.mk uses the following tools to compute the values of variables
at the time that they're defined: ${AWK}, ${GREP}, ${SED}, ${TRUE}.
Move the inclusion of compiler.mk below the inclusion of bsd.tools.mk
so that these variables are properly defined by the time they are
used.  This should fix problems where pkgsrc gcc was not being properly
detected when using the new tools framework.

This change has the side effect of changing the relative order of the
compiler directories and the tool directory in the PATH, but this has
no impact on existing packages, and actually makes more sense anyway.

Revision 1.1648 / (download) - annotate - [select for diffs], Sat May 14 04:26:15 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1647: +3 -18 lines
Diff to previous 1.1647 (colored)

Simplify the check for whether we need a patch tool or not -- we simply
check for whether ${PATCHDIR} exists or not, or whether PATCHFILES is
defined or not.  This avoids the use of != in a variable definition
just to find out if we need patch or not.

Revision 1.1647 / (download) - annotate - [select for diffs], Sat May 14 02:03:00 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1646: +3 -3 lines
Diff to previous 1.1646 (colored)

Found another two uses of .ifndef and .ifdef.
Converted them to .if [!]defined().

Revision 1.1646 / (download) - annotate - [select for diffs], Sat May 14 01:50:38 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1645: +19 -19 lines
Diff to previous 1.1645 (colored)

Replaced .ifdef with .if defined() and .ifndef with .if !defined(). This
will allow better error checking in Makefiles.

Revision 1.1645 / (download) - annotate - [select for diffs], Fri May 13 22:22:44 2005 UTC (6 years, 8 months ago) by rillig
Branch: MAIN
Changes since 1.1644: +17 -14 lines
Diff to previous 1.1644 (colored)

Moved checking if ${SHLOCK} exists into the shell code fragment that
acquires the lock. This had to be done for the new tools framework and
because of the weird order of things in bsd.pkg.mk. Approved by jlam.

Revision 1.1644 / (download) - annotate - [select for diffs], Fri May 13 21:13:01 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1643: +8 -4 lines
Diff to previous 1.1643 (colored)

Don't check for ${SHLOCK}, which isn't defined yet that early in
bsd.pkg.mk under the new tools framework.  Instead, just note that if
we set PKGSRC_LOCKTYPE, that pkgsrc will require shlock.  Remove
"shlock" from the large PKGSRC_USE_TOOLS list since we don't need it
all of the time.  This fixes PKGSRC_LOCKTYPE != none when using the
new tools framework.

Revision 1.1643 / (download) - annotate - [select for diffs], Fri May 13 16:54:13 2005 UTC (6 years, 8 months ago) by jlam
Branch: MAIN
Changes since 1.1642: +4 -2 lines
Diff to previous 1.1642 (colored)

Change references to M4 & YACC into TOOLS_M4 & TOOLS_YACC to simplify
transition to new tools framework.

Revision 1.1601.2.1 / (download) - annotate - [select for diffs], Thu May 12 21:42:33 2005 UTC (6 years, 8 months ago) by snj
Branch: pkgsrc-2005Q1
Changes since 1.1601: +8 -8 lines
Diff to previous 1.1601 (colored) next main 1.1602 (colored)

Pullup ticket 488 - requested by Lubomir Sedlacik
infrastructure fixes regarding whitespace

Revisions pulled up:
- pkgsrc/mk/bsd.pkg.mk	1.1615, 1.1632

    Module Name:    pkgsrc
    Committed By:   tv
    Date:           Thu Apr 21 15:53:53 UTC 2005

    Modified Files:
            pkgsrc/mk: bsd.pkg.mk

    Log Message:
    Work around brain damaged autoconf by stripping leading and trailing
    whitespace from *FLAGS and LIBS before doing :Q quoting.

    Should fix PR pkg/29945.
----
    Module Name:    pkgsrc
    Committed By:   jlam
    Date:           Tue May 10 01:34:05 UTC 2005

    Modified Files:
            pkgsrc/mk: bsd.pkg.mk

    Log Message:
    In make variables, quotes protect embedded whitespace in words, so we
    can replace :C/^ *//:C/ *$// with :M* to get the same effect -- removing
    leading and trailing whitespace and extra spaces between words.

Revision 1.1642 / (download) - annotate - [select for diffs], Thu May 12 20:41:10 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1641: +3 -9 lines
Diff to previous 1.1641 (colored)

Instead of structuring code so that variables defined by the EVAL_PREFIX
loop are only used afterwards, split out the EVAL_PREFIX code into a
separate file find-prefix.mk that can be included at any point to
generate a prefix-computation for the variables specified by FIND_PREFIX
at the inclusion point.

Revision 1.1641 / (download) - annotate - [select for diffs], Thu May 12 18:07:30 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1640: +3 -1 lines
Diff to previous 1.1640 (colored)

Only cache the variable if it's been defined.

Revision 1.1640 / (download) - annotate - [select for diffs], Thu May 12 01:14:05 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1639: +2 -2 lines
Diff to previous 1.1639 (colored)

There's no need to check for EXTRACT_SUFX when figuring out whether we
need to use bzcat for patches.  bsd.pkg.extract.mk can figure out
independently whether bzcat is needed for distfiles.  This fixes
PR pkg/30206.

Revision 1.1639 / (download) - annotate - [select for diffs], Wed May 11 22:19:00 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1638: +3 -2 lines
Diff to previous 1.1638 (colored)

Under the new tools framework, we use TOOLS_AWK to represent the awk
program that the software itself uses.  Duplicate that using the old
framework to ease integration.

Revision 1.1638 / (download) - annotate - [select for diffs], Wed May 11 22:08:18 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1637: +15 -13 lines
Diff to previous 1.1637 (colored)

Rename MAKE_VARS to MAKEVARS so that it more closely resembles
"MAKEFLAGS".  Both "MAKEVARS" and "MAKEFLAGS" affect the package-level
make process, not the software's own make process.

Revision 1.1637 / (download) - annotate - [select for diffs], Wed May 11 04:01:49 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1636: +4 -141 lines
Diff to previous 1.1636 (colored)

Separate out the variables and targets for the "extract" phase into a
separate file pkgsrc/mk/bsd.pkg.extract.mk.  Also, include this file
ahead of the inclusion of bsd.tools.mk so that tools required to
extract are created by the tools framework.

Revision 1.1636 / (download) - annotate - [select for diffs], Wed May 11 02:07:37 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1635: +2 -2 lines
Diff to previous 1.1635 (colored)

Rename mk/bsd.pkg.install.mk to mk/install/bsd.pkginstall.mk to
consolidate the files for that framework in one directory.

Revision 1.1635 / (download) - annotate - [select for diffs], Tue May 10 20:14:27 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1634: +4 -4 lines
Diff to previous 1.1634 (colored)

Split out ldconfig handling from the USE_TOOLS processing in replace.mk.
This makes more sense since there is never going to be a pkgsrc
replacement for ldconfig.  We now always create an ldconfig tool in
${TOOLS_DIR} that either calls the system-supplied one if it exists,
or is a no-op.

Revision 1.1634 / (download) - annotate - [select for diffs], Tue May 10 19:52:30 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1633: +3 -3 lines
Diff to previous 1.1633 (colored)

Split out "strip" from the USE_TOOLS processing in replace.mk.  Instead,
we create a "strip" tool unconditionally, and make it either a no-op or
the real thing depending on the whether we want unstripped files or not.

Revision 1.1633 / (download) - annotate - [select for diffs], Tue May 10 19:06:58 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1632: +30 -29 lines
Diff to previous 1.1632 (colored)

Make a distinction between the tools that pkgsrc needs and the tools
that a package needs.  Tools that pkgsrc needs are listed in
PKGSRC_USE_TOOLS, and tools that a package needs on top of that are
listed in USE_TOOLS.

Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc.  for each of the
tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g.  TOOLS_SED,
TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package
needs.  These variables contain the full command line to the real
command and arguments needed to invoke the tool.

Revision 1.1632 / (download) - annotate - [select for diffs], Tue May 10 01:34:04 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1631: +8 -8 lines
Diff to previous 1.1631 (colored)

In make variables, quotes protect embedded whitespace in words, so we
can replace :C/^ *//:C/ *$// with :M* to get the same effect -- removing
leading and trailing whitespace and extra spaces between words.

Revision 1.1631 / (download) - annotate - [select for diffs], Mon May 9 05:06:55 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1630: +64 -15 lines
Diff to previous 1.1630 (colored)

Teach bsd.pkg.mk to create a phase-specific "makevars.mk" file that
caches variable definitions that were computed by make.  These variables
are specified by listing them in MAKE_VARS, e.g.,

	.if !defined(FOO)
	FOO!=	very_time_consuming_command
	.endif
	MAKE_VARS+=	FOO

bsd.pkg.mk will include only the one generated during the most recent
phase.  A particular phase's makevars.mk file consists of variable
definitions that are a superset of all of the ones produced in previous
phases of the build.

The caching is useful because bsd.pkg.mk invokes make recursively,
which in the example above has the potential to run the very time-consuming
command each time unless we cause FOO to be defined for the sub-make
processes.  We don't cache via MAKE_FLAGS because MAKE_FLAGS isn't
consistently applied to every invocation of make, and also because
MAKE_FLAGS can overflow the maximum length of a make variable very
quickly if we add many values to it.

One important and desirable property of variables cached via MAKE_VARS
is that they only apply to the current package, and not to any
dependencies whose builds may have been triggered by the current
package.

The makevars.mk files are generated by new targets fetch-vars,
extract-vars, patch-vars, etc., and these targets are built during
the corresponding real-* target to ensure that they are being invoked
with PKG_PHASE set to the proper value.

Also, remove the variables cache file that bsd.wrapper.mk was generating
since the new makevars.mk files provide the same functionality at a
higher level.  Change all WRAPPER_VARS definitions that were used by
the old wrapper-phase cache file into MAKE_VARS definitions.

Revision 1.1630 / (download) - annotate - [select for diffs], Sun May 8 13:52:25 2005 UTC (6 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.1629: +9 -1 lines
Diff to previous 1.1629 (colored)

Add a dummy describe-options target for package not using the
options framework.

Revision 1.1629 / (download) - annotate - [select for diffs], Sat May 7 22:17:40 2005 UTC (6 years, 9 months ago) by wiz
Branch: MAIN
Changes since 1.1628: +2 -2 lines
Diff to previous 1.1628 (colored)

Refer doc/pkgsrc.txt instead of Packages.txt.

Revision 1.1628 / (download) - annotate - [select for diffs], Sat May 7 19:32:56 2005 UTC (6 years, 9 months ago) by reed
Branch: MAIN
Changes since 1.1627: +2 -1 lines
Diff to previous 1.1627 (colored)

Add PKGBASE to MESSAGE_SUBST for substituting variables in MESSAGEs.

Noticed it was used in multimedia/xine-ui/MESSAGE.NetBSD.

Maybe this is redundant, and in that case, could have just hard-coded
"xine-ui" instead.

Revision 1.1627 / (download) - annotate - [select for diffs], Wed May 4 06:42:43 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1626: +3 -3 lines
Diff to previous 1.1626 (colored)

Teach the new tools framework about ${STRIP}, which is used in some
packages to strip installed executables.  If INSTALL_UNSTRIPPED ==
"yes", then we create a "strip" wrapper in ${TOOLS_DIR} that just
calls ${TRUE} by considering ${TRUE} the system-supplied strip command.

Revision 1.1626 / (download) - annotate - [select for diffs], Wed May 4 04:23:34 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1625: +2 -2 lines
Diff to previous 1.1625 (colored)

In make, && has a higher precedence than ||.  Add parentheses to fix the
logic of the conditional.

Revision 1.1625 / (download) - annotate - [select for diffs], Tue May 3 21:30:42 2005 UTC (6 years, 9 months ago) by kristerw
Branch: MAIN
Changes since 1.1624: +5 -3 lines
Diff to previous 1.1624 (colored)

Repair CHECK_FILES by adding \( \) around the -or expression in find.

Revision 1.1624 / (download) - annotate - [select for diffs], Tue May 3 20:41:53 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1623: +13 -6 lines
Diff to previous 1.1623 (colored)

Teach the new tools framework about INSTALL and set the appropriate
default value for each platform.  Currently, the replacement tools
comes from sysutils/coreutils, but where there is no native BSD install
program, bootstrap-pkgsrc should probably be made to provide an install
shell script as an alternative, and mk/tools/bootstrap.mk should be
amended accordingly.

Also remove one use of ${TYPE} in pkgsrc (bsd.pkg.mk) under the new tools
framework.

Revision 1.1623 / (download) - annotate - [select for diffs], Tue May 3 16:30:34 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1622: +6 -1 lines
Diff to previous 1.1622 (colored)

Teach the new tools framework about MAIL_CMD.  We use mail/nail as a
"mail" replacement in case TOOLS_PLATFORM.mail is empty.

Revision 1.1622 / (download) - annotate - [select for diffs], Mon May 2 21:10:02 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1621: +5 -3 lines
Diff to previous 1.1621 (colored)

* Push the imake- and xmkmf-handling into the new tools framework.

* Get rid of an explicit check for ${_IMAKE_MAKE} == ${GMAKE} in
  bsd.pkg.mk to check for whether we need to depend on gmake or not.
  Instead, we now note in Linux.mk that packages that need imake will
  also need to use gmake by setting _IMAKE_TOOLS+=gmake.

* Push the definition of MAKE_PROGRAM from bsd.pkg.mk into make.mk where
  it's closer to related code.

Revision 1.1621 / (download) - annotate - [select for diffs], Mon May 2 05:45:15 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1620: +4 -4 lines
Diff to previous 1.1620 (colored)

We need ldconfig (this should probably be restricted only to packages that
install shared libraries).

Revision 1.1620 / (download) - annotate - [select for diffs], Mon May 2 03:09:04 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1619: +5 -8 lines
Diff to previous 1.1619 (colored)

Re-order nested .if statements for brevity.

Revision 1.1619 / (download) - annotate - [select for diffs], Mon May 2 02:50:33 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1618: +7 -3 lines
Diff to previous 1.1618 (colored)

Teach the new tools framework about USE_TOOLS+=bzcat.

Revision 1.1618 / (download) - annotate - [select for diffs], Sat Apr 30 04:35:54 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1617: +17 -3 lines
Diff to previous 1.1617 (colored)

Split replace.mk into two parts, one of which is included by bsd.prefs.mk
to provide "TOOL" definitions for tools used by a top-level make process
(usually because it uses them in a != variable definition).  This allows
USE_TOOLS to be defined before bsd.prefs.mk is included by a package
Makefile, where USE_TOOLS lists the additional (non-default) tools that
are required to build the package.

Also, drop the fallback to existing "TOOL" definitions because we now
have TOOLS_PLATFORM.* for each platform in pkgsr/mk/tools/tools.*.mk.

Revision 1.1617 / (download) - annotate - [select for diffs], Mon Apr 25 16:47:18 2005 UTC (6 years, 9 months ago) by drochner
Branch: MAIN
Changes since 1.1616: +2 -2 lines
Diff to previous 1.1616 (colored)

whitespace fix -- does nobody use emacs here?

Revision 1.1616 / (download) - annotate - [select for diffs], Fri Apr 22 02:20:22 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1615: +3 -3 lines
Diff to previous 1.1615 (colored)

Prepend USE_NEW_TOOLS with an underscore to make it private.  Developers
should set _USE_NEW_TOOLS=yes in /etc/mk.conf in order to test the new
tools framework.

Revision 1.1615 / (download) - annotate - [select for diffs], Thu Apr 21 15:53:53 2005 UTC (6 years, 9 months ago) by tv
Branch: MAIN
Changes since 1.1614: +8 -8 lines
Diff to previous 1.1614 (colored)

Work around brain damaged autoconf by stripping leading and trailing
whitespace from *FLAGS and LIBS before doing :Q quoting.

Should fix PR pkg/29945.

Revision 1.1614 / (download) - annotate - [select for diffs], Mon Apr 18 10:06:47 2005 UTC (6 years, 9 months ago) by agc
Branch: MAIN
Changes since 1.1613: +3 -1 lines
Diff to previous 1.1613 (colored)

Add _DISTFILES and _PATCHFILES definitions to the list of definitions
which get recorded in the build information (accessible with pkg_info -B).

Revision 1.1613 / (download) - annotate - [select for diffs], Sat Apr 16 09:26:22 2005 UTC (6 years, 9 months ago) by agc
Branch: MAIN
Changes since 1.1612: +4 -4 lines
Diff to previous 1.1612 (colored)

Don't fail if there are multiple digest values for the same file with the
same algorithm in the distinfo file - pointed out by Robert Elz in PR 29973.

Additional testing by wiz - thanks!

Revision 1.1612 / (download) - annotate - [select for diffs], Sat Apr 16 09:20:18 2005 UTC (6 years, 9 months ago) by agc
Branch: MAIN
Changes since 1.1611: +4 -1 lines
Diff to previous 1.1611 (colored)

Occasionally we do not want the "--host=${MACHINE_GNU_PLATFORM}" argument
added if GNU_CONFIGURE is specified - the arla and forthcoming openafs
packages are ones that need to be able to let the GNU configure script
guess for itself, rather than hardcoding the value.

Add a switch called USE_GNU_CONFIGURE_HOST to determine whether the
--host argument is provided to the GNU configure script.  This is
switched on (it has a "yes" value) by default, so the previous
behaviour applies, but allows us to specify this value on a
package-by-package basis.

Documentation changes for this are also forthcoming.

Revision 1.1611 / (download) - annotate - [select for diffs], Fri Apr 15 02:04:57 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1610: +6 -1 lines
Diff to previous 1.1610 (colored)

Add a new yes/no variable USE_NEW_TOOLS to ease testing the new tools
framework.  USE_NEW_TOOLS defaults to "no".

Revision 1.1610 / (download) - annotate - [select for diffs], Wed Apr 13 16:15:59 2005 UTC (6 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.1609: +2 -1 lines
Diff to previous 1.1609 (colored)

Print out the exitcode of pkg_create if nonzero, as it sometimes exists
without an error message. (Example: editors/abiword on NetBSD-1.6.2/i386.)
Approved by jlam.

Revision 1.1609 / (download) - annotate - [select for diffs], Wed Apr 13 14:07:30 2005 UTC (6 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.1608: +2 -2 lines
Diff to previous 1.1608 (colored)

Fix error introduced in rev. 1.1606: "$${PKGVULNDIR}" should be
"${PKGVULNDIR}" (one $, not two).  This was causing the vulnerabilities
file to be looked for in the wrong place.  This fix makes the
check-vulnerable target actually parse the vulnerabilities file and
look for vulnerable installed packages again.

Revision 1.1608 / (download) - annotate - [select for diffs], Tue Apr 5 14:00:33 2005 UTC (6 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.1607: +2 -4 lines
Diff to previous 1.1607 (colored)

Always include wrapper/bl3, period, even if NO_BUILD.

Revision 1.1607 / (download) - annotate - [select for diffs], Tue Apr 5 03:18:00 2005 UTC (6 years, 10 months ago) by minskim
Branch: MAIN
Changes since 1.1606: +2 -2 lines
Diff to previous 1.1606 (colored)

Prevent MAKEFLAGS from being passed through shell environment.  It was
redundant because we explicitly pass MAKEFLAGS to a sub-process
through command line arguments.

This fixes the problem reported in PR pkg/29874 that PKGNAME_REQD is
not overridden in recursive MAKE calls.

Revision 1.1606 / (download) - annotate - [select for diffs], Thu Mar 31 21:02:28 2005 UTC (6 years, 10 months ago) by agc
Branch: MAIN
Changes since 1.1605: +7 -2 lines
Diff to previous 1.1605 (colored)

Fix for PR 28230 (bsd.pkg.mk ignores /etc/audit-packages.conf) by
sourcing any config file, if it's defined.  With thanks to Julio M.
Merino Vidal for the first pass at a fix, and for keeping me honest
and up-to-date with variable checks in portable shell constructs.

Revision 1.1605 / (download) - annotate - [select for diffs], Tue Mar 29 08:17:42 2005 UTC (6 years, 10 months ago) by garbled
Branch: MAIN
Changes since 1.1604: +2 -5 lines
Diff to previous 1.1604 (colored)

Fixes for shlib handling on AIX

Revision 1.1604 / (download) - annotate - [select for diffs], Thu Mar 24 17:46:00 2005 UTC (6 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.1603: +3 -15 lines
Diff to previous 1.1603 (colored)

USE_BUILDLINK3 is no longer optional (and cannot be turned off).  Per mail
to tech-pkg:

=====

* USE_BUILDLINK3=YES will be unconditional.  (In fact, USE_BUILDLINK3 will
  be ignored altogether by mk/; but see below.)

* NO_BUILDLINK and NO_WRAPPER will be ignored by mk/.  If a build happens,
  these phases will happen.

* The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER.
  If no build happens, those phases are not needed.

* NO_TOOLS will be ignored by mk/.  The tools phase, which provides much
  more than just the C compiler, will always happen regardless of package.
  This will make metapackage builds only slightly slower, in trade for far
  less user error.

Revision 1.1603 / (download) - annotate - [select for diffs], Tue Mar 22 22:49:15 2005 UTC (6 years, 10 months ago) by xtraeme
Branch: MAIN
Changes since 1.1602: +4 -1 lines
Diff to previous 1.1602 (colored)

In the distclean target, if PKG_RESUME_TRANSFERS is set, clean
the temp files too.

Revision 1.1602 / (download) - annotate - [select for diffs], Tue Mar 22 22:20:21 2005 UTC (6 years, 10 months ago) by xtraeme
Branch: MAIN
Changes since 1.1601: +63 -45 lines
Diff to previous 1.1601 (colored)

Some changes for PKG_RESUME_TRANSFERS:

o If origfile is already downloaded (size ok) and there's
  a temp file with incomplete size, don't try to resume the
  transfer on the temp file, remove it.
o Clean the code a bit.

Revision 1.1540.2.26 / (download) - annotate - [select for diffs], Mon Mar 21 15:43:00 2005 UTC (6 years, 10 months ago) by tv
Branch: tv-derecurse
CVS Tags: tv-derecurse-eol
Changes since 1.1540.2.25: +14 -2 lines
Diff to previous 1.1540.2.25 (colored)

sync with HEAD

Revision 1.1601 / (download) - annotate - [select for diffs], Sun Mar 20 18:18:09 2005 UTC (6 years, 10 months ago) by jmmv
Branch: MAIN
CVS Tags: tv-derecurse-base, pkgsrc-2005Q1-base
Branch point for: pkgsrc-2005Q1
Changes since 1.1600: +8 -1 lines
Diff to previous 1.1600 (colored)

Reset the current locale to a sane value (that is, 'C') during the build
of packages.  Several utilities behave differently or even incorrectly if
a locale different than 'C' is set.

One of these is perl, which spits a big warning and then breaks some
packages.  An example is irssi, as described in PR pkg/29613 by Hanno
Wagner.

Revision 1.1600 / (download) - annotate - [select for diffs], Fri Mar 18 18:16:34 2005 UTC (6 years, 10 months ago) by tv
Branch: MAIN
Changes since 1.1599: +5 -1 lines
Diff to previous 1.1599 (colored)

Fix a gleaming illustration of why using YES/NO variables everywhere
possible, just for the sake of doing so, is not a good thing to do:

The platform files define _STRIPFLAG_* to determine whether to strip things.
But since this is included in bsd.prefs.mk, ".if ..." checks cannot take
things set in the Makefile into account.  So convert INSTALL_UNSTRIPPED=YES
to a defined/undefined variable check in bsd.pkg.mk, and use the :D:U idiom
in the _STRIPFLAG_* variables.

This should fix PR pkg/28772 and PR pkg/29031.

Revision 1.1599 / (download) - annotate - [select for diffs], Wed Mar 16 02:09:54 2005 UTC (6 years, 10 months ago) by dmcmahill
Branch: MAIN
Changes since 1.1598: +2 -2 lines
Diff to previous 1.1598 (colored)

make sure we correctly set F77.  Addresses PR29666

Revision 1.1598 / (download) - annotate - [select for diffs], Sun Mar 13 09:30:31 2005 UTC (6 years, 10 months ago) by agc
Branch: MAIN
Changes since 1.1597: +1 -0 lines
Diff to previous 1.1597 (colored)

Put back the speed-up in the vulnerability checking when building a package,
but disable this if the package name in the pkg-vulnerabilities file contains
a meta-character. This speeds up the check-vulnerable target from:

[9:28:06] agc@sys3 ...pkgsrc/misc/libutf 11 > time make check-vulnerable
1.821u 1.988s 0:02.57 147.8%    0+0k 0+0io 0pf+0w
[9:28:17] agc@sys3 ...pkgsrc/misc/libutf 12 >

to

[9:28:27] agc@sys3 ...pkgsrc/misc/libutf 13 > time make check-vulnerable
0.273u 0.233s 0:00.33 151.5%    0+0k 0+0io 0pf+0w
[9:28:30] agc@sys3 ...pkgsrc/misc/libutf 14 >

(with caches filled, on a fairly fast machine - P4 2.8 GHz, 2GB RAM).

Revision 1.1540.2.25 / (download) - annotate - [select for diffs], Wed Mar 2 19:38:26 2005 UTC (6 years, 11 months ago) by tv
Branch: tv-derecurse
Changes since 1.1540.2.24: +8 -5 lines
Diff to previous 1.1540.2.24 (colored)

sync with HEAD

Revision 1.1597 / (download) - annotate - [select for diffs], Wed Mar 2 11:11:36 2005 UTC (6 years, 11 months ago) by agc
Branch: MAIN
Changes since 1.1596: +2 -2 lines
Diff to previous 1.1596 (colored)

When FAILOVER_FETCH is set, only use the first digest algorithm found
for a dist file or patch, and let the "checksum" target do the full
digest integrity checks.  Should fix a problem reported by John Klos
on tech-pkg, which I was a bit dim in analysing.

Revision 1.1596 / (download) - annotate - [select for diffs], Sun Feb 27 22:10:25 2005 UTC (6 years, 11 months ago) by veego
Branch: MAIN
Changes since 1.1595: +7 -4 lines
Diff to previous 1.1595 (colored)

Fix PLIST_SRC error introduced in rev 1.1593.
Before this fix it would include
  PLIST.common
then _only_ one of the following
  PLIST.${OPSYS}
  PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
  PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
  PLIST
and then PLIST.common_end.

Now, uses all of the following PLIST files, in that order:

PLIST.common
PLIST.${OPSYS}
PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST
PLIST.common_end

Revision 1.1540.2.24 / (download) - annotate - [select for diffs], Fri Feb 25 14:46:51 2005 UTC (6 years, 11 months ago) by tv
Branch: tv-derecurse
Changes since 1.1540.2.23: +46 -26 lines
Diff to previous 1.1540.2.23 (colored)

sync with HEAD

Revision 1.1595 / (download) - annotate - [select for diffs], Fri Feb 25 13:05:52 2005 UTC (6 years, 11 months ago) by agc
Branch: MAIN
Changes since 1.1594: +19 -11 lines
Diff to previous 1.1594 (colored)