Commit graph

2355 commits

Author SHA1 Message Date
reed
295b6a402f Welcome to version 20060405.
pkg_add also check for USE_ABI_DEPENDS.

Check if USE_ABI_DEPENDS or IGNORE_RECOMMENDED was set
when this package was built. IGNORE_RECOMMENDED is now historical.

For the cat man page, I manually made it say "pkgsrc" instead of
"NetBSD".

I committed to NetBSD's src/usr.sbin/pkg_install/ first :)
2006-04-06 06:49:30 +00:00
reed
d348169c00 Welcome to createbuildlink-3.11.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
2006-04-06 06:36:36 +00:00
reed
fd7750babc Welcome to revbump-1.5.
ABI_DEPENDS instead of RECOMMENDED.

Not tested, but also reviewed by maintainer.
2006-04-06 06:25:46 +00:00
reed
5abef9be14 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).
2006-04-06 06:21:32 +00:00
wiz
0bbdf0f44f Sync with src/usr.sbin v1.70:
http_expand_URL(): fclose() the fdopen()'ed filedescriptor
before leaving the function (for all cases).

Actual fix and sanity checking by Dillo & Wiz
Coverity CID 2340
2006-04-05 18:17:31 +00:00
wiz
cc332cafad Sync with src/usr.sbin v1.62:
When recognizing a broken package version/name,
make sure to error out really, don't just print a warning
and the run into further problems.

Coverity CID 2739.
2006-04-05 18:17:08 +00:00
wiz
047eb34369 Bump date for previous. 2006-04-04 20:49:43 +00:00
tv
ad54c428d8 1.69.1: Add a -q option, which is a superset of -n; squelches progress
messages and "echo-to-screen" commands (e.g., pkg_delete).  This provides
a much more accurate emulation of the former -c and -i options (now
-a -q and -u -q respectively), by suppressing messages not related to the
human-readable version information.
2006-04-04 18:38:13 +00:00
reed
b77ba07fe0 Use PKGMANDIR instead of hard-coded "man". 2006-04-04 12:25:07 +00:00
wiz
66ecb76eb5 Bump date, so that version in src and pkgsrc have the same
version _and_ the same code.
2006-04-04 06:38:29 +00:00
wiz
55a059b0bc Pull over v1.4 from src/usr.sbin:
revision 1.4
date: 2006/03/17 01:10:53;  author: hubertf;  state: Exp;  lines: +5 -2
Fix filedescriptor leak
Coverity CID 1625
2006-04-04 06:37:15 +00:00
wiz
90179254d2 Pull over v1.59-v1.61 from src/usr.sbin:
revision 1.61
date: 2006/03/17 17:46:44;  author: hubertf;  state: Exp;  lines: +4 -3
Put check if "best" is empty back into the right place, messed up
in previous commit.
Noted by yamt@
----------------------------
revision 1.60
date: 2006/03/17 02:20:46;  author: hubertf;  state: Exp;  lines: +10 -4
findbestmatchingname_fn(): catch possible problems if best (vp)
contains some strange name (shouldn't happen, but ...)

Coverity CID 869
----------------------------
revision 1.59
date: 2006/03/17 02:10:55;  author: hubertf;  state: Exp;  lines: +8 -7
findbestmatchingname_fn(): only do something sensible if the pointer
handed in is actually usable (not NULL)

Fixes Coverity ID 870
2006-04-04 06:36:12 +00:00
wiz
786e9a25a2 Pull over v1.36 from src/usr.sbin:
revision 1.36
date: 2006/03/17 01:58:25;  author: hubertf;  state: Exp;  lines: +11 -3
We can't sprintf() into a NULL pointer - catch that properly
for ALL cases.

Coverity CID 861
2006-04-04 06:34:25 +00:00
wiz
ae42a7bdb3 Sync with src/usr.sbin: whitespace diffs only. 2006-04-04 06:32:59 +00:00
wiz
c9a1f04e00 Pull over v1.77 from src/usr.sbin:
revision 1.77
date: 2006/03/26 18:11:22;  author: christos;  state: Exp;  lines: +3 -3
PR/33123: Murray Armfield: standards compliance & glob.h
Certain fields in glob.h need to be size_t; fix this and version glob(3).
    http://www.opengroup.org/onlinepubs/000095399/basedefs/glob.h.html
2006-04-04 06:31:22 +00:00
wiz
0d252fca2c Pull over v1.5 and v1.6 from src/usr.sbin:
revision 1.6
date: 2005/11/13 20:37:23;  author: agc;  state: Exp;  lines: +1 -10
Get rid of cvs merge botch in previous.
----------------------------
revision 1.5
date: 2005/11/13 20:07:41;  author: agc;  state: Exp;  lines: +25 -8
The Dewey number comparison routines were added by myself in 2002 in
revision 1.32 of pkg_install/lib/str.c, and have absolutely nothing to
do with the original FreeBSD utilities.

Place the appropriate (3 clause) copyright on this file.
2006-04-04 06:30:10 +00:00
wiz
680f66a11d Pull over v1.68 from src/usr.sbin:
revision 1.68
date: 2006/03/17 02:31:44;  author: hubertf;  state: Exp;  lines: +4 -3
pkg_do(): only use cp2 if it's really set to something useful

Coverity CID 1176
2006-04-04 06:28:22 +00:00
wiz
8d27f5d82e Pull over 1.36 from src/usr.sbin:
revision 1.36
date: 2005/12/03 01:08:38;  author: hubertf;  state: Exp;  lines: +3 -3
Only warn about running as non-root when -v is given
(or when running in non-unprivilegedmode, but how to detect?)
2006-04-04 06:27:13 +00:00
wiz
3774c1a14d Pull over v1.51 from src/usr.sbin:
revision 1.51
date: 2006/03/06 20:00:10;  author: reed;  state: Exp;  lines: +4 -4
Fix the "Cannot chdir" error message to actually show the
problem directory name for lsbest and lsall.

For example:

# pkg_admin -d /usr/packages/DragonFly/1.4.0/i386/All lsbest 'gmake>0'
pkg_admin: Cannot chdir to /var/db/pkg: No such file or directory

Should show:
pkg_admin: Cannot chdir to /usr/packages/DragonFly/1.4.0/i386/All: No such file or directory
2006-04-04 06:25:59 +00:00
wiz
864c7d4c33 Pull over 1.117 from src/usr.sbin:
revision 1.117
date: 2006/03/17 02:37:31;  author: hubertf;  state: Exp;  lines: +6 -2
Add sanity check if there's a @cwd in the +CONTENT file.
If not abort, because we wouldn't know where to put the files.

Coverity CID 1358
2006-04-04 06:24:39 +00:00
reed
f759d83930 List Xorg versions also.
(I have used Xorg as native X.)
2006-03-31 01:05:16 +00:00
dmcmahill
91649a67c0 avoid a malformed conditional with the make on netbsd-2. 2006-03-23 13:46:31 +00:00
wiz
73e4d7ff6a pkglint: unquote subst message. 2006-03-19 10:49:02 +00:00
rillig
2fbd4ebed2 Updated pkglint to 4.59.
Changes since 4.58:
- Improved checking of patch files.
- Adjusted the variable names to the recent pkgsrc changes.
- Print a note if the pkglint version does not match the one from the
  checked pkgsrc tree.
2006-03-14 14:24:14 +00:00
rillig
e39db93190 Added HEADER_TEMPLATE. 2006-03-14 14:20:13 +00:00
rillig
2cb1b0aed5 {DE,}INSTALL_EXTRA_TMPL have been renamed to {DE,}INSTALL_TEMPLATE. 2006-03-14 14:18:55 +00:00
jlam
daad0f3d6c 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.
2006-03-14 01:14:26 +00:00
erh
e8d1f2d71c Fix -uu handling so recursive updates of already installed packages work,
even if the initial package to install isn't installed yet.
Bump the version to 20060313.
2006-03-13 22:08:22 +00:00
rillig
b13fb33101 {DE,}INSTALL_EXTRA_TMPL do not always need the += operator. 2006-03-13 01:03:59 +00:00
minskim
784da9a80b Do not declare a static variable in a header file as non-static. This makes
the package build with gcc-4.
2006-03-13 00:16:41 +00:00
minskim
73b7ad53a3 Define SLIST_HEAD_INITIALIZER for platforms without it. 2006-03-13 00:13:37 +00:00
jmmv
e06d00cd6b Update to 1.28:
- PKG_SYSCONFDIR cannot be set by mk.conf; it is PKG_SYSCONFBASE.  This was
  correct in one place but incorrect in another.  Fixes PR pkg/33061 by
  Yoshito Komatsu.
2006-03-12 19:36:01 +00:00
rillig
e680623f2c - Added a bunch of variables to makevars.map.
- Removed the specialized spell checker for NO_*_ON_*, since the generic
  one catches these quite well.
- SITES_* is deprecated in favor of SITES.*.
- Don't warn if variable alignment is done with exactly one space
  character, since this is common when one line from a group has an
  overly lengthy variable.
- Added support for checking whether the number of leading lines of context
  matches the number of trailing lines of context in patch files of the
  unified diff format. The MacOS X patch utility cannot handle these. As
  there are quite a number of false positives here (especially when the
  hunk is applied at the end of a file), this warning only shows up in
  --debug mode.
2006-03-12 16:55:51 +00:00
rillig
bd0e3a1e45 Added the BrokenIn data type. All BROKEN_IN lines generate an additional
note that tells the user to remove the line if the package builds.
2006-03-12 13:34:53 +00:00
rillig
9df67ca189 - Renamed "List!" to "InternalList".
- When ${SED} and ${MV} are used in a single shell command, print a note
  that the SUBST framework is preferred over the direct use of these
  commands.
2006-03-11 18:38:35 +00:00
reed
b3e673d6fc Use PKGMANDIR instead of "man". 2006-03-11 04:30:14 +00:00
reed
887f068344 Explain why this exists and mention other package with it. 2006-03-11 04:29:25 +00:00
rillig
d2e0cfbc92 Added CHECK_FILES_SKIP, DEVOSSSOUND, DLOPEN_REQUIRE_PTHREAD. 2006-03-11 00:01:28 +00:00
jlam
bb4f311e85 Use pkginstall to generate the INSTALL script instead. 2006-03-10 22:38:30 +00:00
rillig
2099d2013d Don't check the quoting in backticks. This is a misdesign of pkglint. 2006-03-10 22:30:25 +00:00
rillig
4800cacdde Added PKG_SYSCONFDIR and PKG_SYSCONFVAR. The latter is not a Varname, as
the name might suggest, but an Identifier.
2006-03-10 22:14:52 +00:00
rillig
7022e13801 Added SITES. 2006-03-10 12:33:49 +00:00
epg
ee3f12b91f Add -DHAVE_CONFIG_H to CPPFLAGS so xstrdup.c will include <string.h>
and get the correct prototypes for strcpy and strlen.

Fixes build on Ubuntu Linux, and likely others.
2006-03-10 06:10:44 +00:00
rillig
7aece09dff Added the REPLACE.* and REPLACE_FILES.* variables. 2006-03-09 17:34:17 +00:00
wiz
b16e7b4e97 Add -*- perl -*- so emacs recognizes it automatically.
revbump: only print "updated" line when updating was successful.
2006-03-09 17:24:48 +00:00
rillig
7201eefb04 - In unified diffs, the hunk header must not end in a CR character.
- Unmaintained packages should have pkgsrc-users instead of tech-pkg.
2006-03-08 21:15:31 +00:00
wiz
ae456feac0 Update to 1.4:
Replace 'make' with '${MAKE}' for non-NetBSD. Requested by joerg@.
2006-03-07 07:28:55 +00:00
wiz
92ccec1842 Improve short description. 2006-03-07 07:27:26 +00:00
wiz
caf134912c Quoting fix in example, from joerg@. 2006-03-07 06:51:20 +00:00
wiz
186660eae4 Standardize option handling (use getopts, provide same options for all
three tools).
use strict and cleanup problems found this way.
Remove some unused variables.
Update documentation.

Welcome to 1.3!
2006-03-07 04:30:54 +00:00