Commit graph

4608 commits

Author SHA1 Message Date
rillig
8506e905d6 pkglint does not output any "OK" lines by default, so there's no need to
filter them out.
2005-06-27 16:25:43 +00:00
rillig
63d76b7f93 Fixed the quoting. The shell is hard-coded to /bin/sh instead of relying
on which(1). Correctly pass all arguments (even the first one) to the
build script. This fixes PR 30362.
2005-06-27 16:04:08 +00:00
wiz
2baa8b4a15 Improve English in warning. From Rhialto in PR 30610. (second occurrence) 2005-06-27 13:34:41 +00:00
wiz
6328437570 Improve English in warning. From Rhialto in PR 30610. 2005-06-27 13:33:55 +00:00
minskim
af252c5f04 Darwin>=7.0 does not need devel/dlcompat. 2005-06-26 13:11:22 +00:00
minskim
1766fa83af Fix another typo (TOOLS_READ_CMD -> TOOLS_REAL_CMD). 2005-06-24 21:21:31 +00:00
minskim
b27f349884 Fix a typo. 2005-06-24 21:17:01 +00:00
jlam
73e8531006 Teach the tools framework about csh, and replace with tcsh if necessary. 2005-06-24 20:59:59 +00:00
jlam
237d39908a Create TOOLS_LDCONFIG and LDCONFIG variables that contain the actual
command that can be embedded into packages.  Calling a bare "ldconfig"
will still call the one in the tools directory, which always does the
right thing.
2005-06-24 20:40:53 +00:00
jlam
aa8ce0eb27 Remove unused variable _TOOLS_VARNAME.ldconfig. 2005-06-24 20:33:52 +00:00
minskim
36a63b2df7 Darwin may have bzcat. 2005-06-24 20:15:06 +00:00
minskim
317318f0f0 Support bash as a tool, so that packages containing bash scripts
(e.g. graphics/netpbm) use native bash if available.
2005-06-24 19:39:10 +00:00
sketch
4228902141 Use ${PERL5} instead of `perl' and relying on $PATH order. 2005-06-24 13:37:51 +00:00
dillo
334a53f8dc lang/perl58 has been renamed to lang/perl5 (hi johnny!) 2005-06-24 08:29:59 +00:00
jlam
c2fb31ba79 Drop the perl-5.6.x package from pkgsrc. Remove lang/perl58 and update
lang/perl5 to perl-5.8.6nb4.  Modify packages that referred to
lang/perl58 to point to lang/perl5 instead.
2005-06-24 06:43:43 +00:00
kristerw
9768a1614a CHECK_FILES is not ready for prime time, so do not enable it by
default for PKG_DEVELOPER yet...
2005-06-23 21:34:01 +00:00
jlam
31379eace1 Put back behavior that was lost in the initial split of the check-files
implementation out of bsd.pkg.mk -- if NO_PKG_REGISTER is defined,
then don't bother with the file-checks because we don't care about
cleaning up afterwards if we can't uninstall the package.
2005-06-23 21:06:56 +00:00
jlam
1cae80d83e Add a PKGSRC_USE_TOOLS definition to bsd.pkg.check.mk that notes the
tools that are used in the targets.  Also, replace "diff" with ${DIFF}.
2005-06-23 20:51:00 +00:00
jlam
df8c47b2f2 Note locations for native diff tools. 2005-06-23 20:45:34 +00:00
jlam
805d6d300a Teach the tools framework about "diff". 2005-06-23 20:39:39 +00:00
jlam
9b5d98e50b "cmp" can be "gcmp" if we use the one from pkgsrc. 2005-06-23 20:35:55 +00:00
jlam
6efbd72779 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.
2005-06-23 18:41:57 +00:00
jlam
03f3fae54f Drop CHECK_WRKREF_IS_TEXT_FILE and modify the semantics of CHECK_WRKREF
so that it's a list of options, or "no".  The valid options are:

	work	check files for ${WRKDIR}
	tools	check files for ${TOOLS_DIR}

where "work" supersedes "tools".  The default CHECK_WRKREF is "no"
unless PKG_DEVELOPER is defined, in which case it's "tools".
2005-06-23 18:12:20 +00:00
wiz
085d1a2044 Back out previous -- committed by mistake. 2005-06-23 12:12:11 +00:00
wiz
e95f3821fb Add missing line continuation backslashes.
Noted by Jukka Salmi.
2005-06-23 12:11:07 +00:00
wiz
050e29dbc5 Sync with today\'s sourceforge mirror list. 2005-06-23 10:28:54 +00:00
jlam
5d1e8de6bc Split out the check-wrkref implementation and related variables from
bsd.pkg.mk into bsd.pkg.check.mk file.
2005-06-23 09:02:46 +00:00
jlam
6ae4606464 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.
2005-06-23 08:31:20 +00:00
jlam
8d486b1ebd 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.
2005-06-23 04:15:47 +00:00
heinz
2c81ca4213 Updated list of Apache mirror sites, according to
http://www.apache.org/mirrors/.
2005-06-22 21:14:42 +00:00
jlam
4149dcc90e We were writing the wrong directory path for the location to the
uninstalled libtool archive in the case where we build it into some
place other than the current directory.  Older versions of libtool
didn't allow you to build a *.la file anywhere other than the current
directory, and libtool-fix-la made use of this assumption in libtool's
behavior.  More recent versions of libtool *do* let you build a *.la
file anywhere you'd like, so instead of blindly assuming it's the
current directory, use the path to the argument of the -o option.
This embeds the proper directory path into the uninstalled libtool
archive.

This has no impact on packages that just build libtool archives into
the current directory.  The packages that *are* impacted are the ones
that:

   (1) pkgsrc converted to use libtool, and,
   (2) build shared libraries that are linked into other things
       as part of the build, and,
   (3) builds the libtool archives in some place other than the
       current directory.
2005-06-22 21:08:37 +00:00
jlam
ab6733f9ca x11.version.mk doesn't necessarily provide a definition for
BUILTIN_X11_VERSION.${X11_TYPE}.  Clarify this in the comment header.
2005-06-20 20:59:45 +00:00
jlam
b81dff43e1 Until pkgsrc gets a databases/db1 package, we must always prefer the
native db1 package because the alternative doesn't yet exist.
2005-06-20 07:20:40 +00:00
jlam
809759a4de Allow for explicit PREFER.<pkg> settings to override PREFER_NATIVE and
PREFER_PKGSRC.
2005-06-20 05:44:17 +00:00
jlam
7357eef2ae The OpenBSD chgrp and chown can be in different places depending on the
OpenBSD release, so check for the right location.
2005-06-17 20:58:58 +00:00
jlam
873398634f Pull out the LS and TR definitions from algae/Makefile and place them
in tools/defaults.mk where they can be more widely used.
2005-06-17 17:05:18 +00:00
jlam
c49a0c735b PERL_PATH is also a common GNU configure script variable for the path to
the perl interpreter.
2005-06-17 16:24:51 +00:00
salo
b26c32d51a Use tabs, not spaces. 2005-06-16 17:40:56 +00:00
grant
3bfb445a35 provide defaults for bzcat and tbl to avoid unnecessary build
dependencies on archivers/bzip2 and textproc/groff when they are
available in the base system.
2005-06-16 04:30:46 +00:00
jlam
b9ac1b57c0 Avoid generating a blank line as the first command of a target as that
isn't understood by some make programs, e.g. /usr/ccs/bin/make.
2005-06-15 17:54:59 +00:00
jlam
ccd8fe4d4c Allow the test for whether the file is a text file to be overridden via
CHECK_WRKREF_IS_TEXT_FILE.
2005-06-14 22:02:00 +00:00
jlam
bdead8cfd3 Require xpkgwedge>=1.14 so that the correct make is always invoked on
Solaris and Linux, regardless of whether we use the same make to build
the software or not.
2005-06-14 20:14:50 +00:00
jlam
b3c6a77a03 We need xpkgwedge whenever we use imake. 2005-06-14 20:04:36 +00:00
jlam
33a4d9397c Require xpkgwedge>=1.13 when used as a build dependency so that the
correct make(1) program is invoked by pkgxmkmf.
2005-06-14 07:25:24 +00:00
jlam
226567f45c Make IMAKE_TOOLS into a publicly-readable variable so that it can be
used by pkgtools/xpkgwedge.
2005-06-14 07:12:23 +00:00
jlam
baa963cd7c We only need to set USE_X11BASE, run install.man, and override the
compiler (CC/CXX) if we're actually using imake to generate Makefiles
for building and installing software.  This fixes errors in various
KDE-3.x packages that use imake for other purposes.
2005-06-14 02:09:38 +00:00
jlam
1ffcef48db 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.
2005-06-13 02:25:50 +00:00
jlam
55c85320ca Separate the message from the do-distribution-patch and do-pkgsrc-patch
targets so that if they're overridden in the package Makefile, the
message is still printed.
2005-06-12 03:59:42 +00:00
jlam
7969727e46 Rename "apply-distribution-patches" and "apply-pkgsrc-patches" targets
to "do-distribution-patch" and "do-pkgsrc-patch", respectively, and
allow them to be overridden by the package Makefile.  This allows for
more fine-grained overriding of the patch process.
2005-06-12 03:38:04 +00:00
dillo
91ba937bb4 Allow this file to be included even if no options are supported
(as may be the case if all options are platform specific).  In that
case set PKG_OPTIONS to empty and skip the rest of the file.

Okayed by jlam.
2005-06-11 16:12:13 +00:00
jlam
9a2b543ac3 Remove unnecessary .undef lines after .for loops as the loop variables
are automatically undefined after the loop exits.
2005-06-11 05:22:03 +00:00
jlam
df53a167da Add a default fall-through for the shell case statement (portability
issue).
2005-06-11 04:26:17 +00:00
jlam
d8e783d924 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.
2005-06-10 23:38:00 +00:00
jlam
d9ac2e54e4 Force an autoconf "cache" override for tools that are likely to be
shell builtins, e.g. echo, false, test, true, since those tools don't
have a full path.
2005-06-10 20:53:54 +00:00
sketch
e2eb7e8270 mk.conf needs to be backed up as part of the bootstrap files. 2005-06-10 13:09:07 +00:00
rillig
54682e7ad9 Fixed a typo. 2005-06-09 19:49:48 +00:00
jlam
c285ef536b Fix harmless typo. 2005-06-09 18:44:26 +00:00
jlam
fe40930572 Forgot the strip the comma when removing "-Wl," from the the next
argument during argument merging.
2005-06-09 17:06:21 +00:00
jlam
29ef35e288 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.
2005-06-09 16:26:23 +00:00
jlam
94f3443509 Don't reinvent PKGPATH, which already contains just the "category/package"
portion of the path.
2005-06-09 16:09:58 +00:00
jlam
1ad3a3bdd6 Add a documentation block above the changes-entry target. 2005-06-09 16:08:27 +00:00
wiz
16b3e5b4cc Delay running of id until it is needed. Fixes PR 30477 by Neil Hoggarth. 2005-06-09 10:09:58 +00:00
jlam
4f7957a874 Rewrite the USE_BUILTIN.pthread section a bit so that it more closely
matches the template in bsd.builtin.mk.  This causes USE_BUILTIN.pthread
to be cached, which is useful at least for debugging purposes.
2005-06-09 06:03:40 +00:00
jlam
b753b0d414 Clarify why dlopen.builtin.mk ignores PREFER_* values. 2005-06-09 05:59:51 +00:00
wiz
c209ba29cb 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.
2005-06-08 22:44:08 +00:00
wiz
774ace527b Fix variable name in comment: it is PKG_OPTIONS_VAR, with an S. 2005-06-08 22:36:52 +00:00
jlam
c6f8fbdaa0 Print the full path to broken or modified patches that aren't applied.
This also fixes the problem where the names of broken local patches
(in ${LOCALPATCHES}) weren't printed correctly in the error message.
2005-06-08 17:52:50 +00:00
dillo
db9aee67d2 fix variable name in example comment 2005-06-08 16:19:08 +00:00
markd
c2c2d866b6 Add description for emacs-xaw3d. 2005-06-08 14:43:43 +00:00
markd
eda80c44bb Remove obsolete EMACS_USE_XAW3D. 2005-06-08 14:42:47 +00:00
jlam
2499370d92 The USE_BUILTIN.dl code got too complex in the previous commit.
Simplify it so that USE_BUILTIN.dl is simply IS_BUILTIN.dl except for
Darwin's special case.  This makes PREFER_PKGSRC=yes work again on
NetBSD instead of causing USE_BUILTIN.dl=no to be set, which is
impossible.
2005-06-08 08:13:05 +00:00
jlam
532553f653 Properly turn:
-Wl,-rpath -Wl,/dir1:/dir2:/dir3
into:
	-Wl,-rpath,/dir1 -Wl,-rpath,/dir2 -Wl,-rpath,/dir3

Do the same for -Wl,-R and -Wl,-rpath-link.  This makes the wrapper
scripts pass the test in regress/buildlink-transform/rpath-merge.mk
and fixes PR pkg/27702.
2005-06-08 05:54:17 +00:00
jlam
ce74a9adee Update comment to reflect implementation. 2005-06-08 05:02:50 +00:00
jlam
53c57e3bf6 Remove part of comment that is no longer true. 2005-06-08 04:54:27 +00:00
wiz
96a491edb7 Add description for mjpegtools-cmov, from Geert Hendrickx in PR 30366. 2005-06-07 21:23:35 +00:00
jlam
816e616b23 Add another common name for the GNU configure variable name used for the
"env" tool.
2005-06-07 16:57:37 +00:00
jlam
034f0336eb Add a few more GNU configure variable names that are commonly used.
Also, some configure scripts use "ENV" to represent the path to the
"env" tool, which is probably bad since ENV has a special meaning to
/bin/sh.  To workaround this, set ac_cv_path_ENV.
2005-06-07 16:33:12 +00:00
dillo
a55c83b93b make legacy variables external:
PKG_LEGACY_OPTIONS
	PKG_OPTIONS_DEPRECATED_WARNINGS
2005-06-06 13:54:51 +00:00
tv
c887a4516b Force libtool-base-1.5.18nb3 on DragonFly. 2005-06-05 18:05:54 +00:00
rillig
16d303a282 Fixed a typo in a comment. 2005-06-05 04:35:45 +00:00
markd
3fdb9ff461 IMAKE_FILEMAN_SUFFIX is 4 on Solaris and (as I read it) OSF1 and UnixWare. 2005-06-04 23:33:50 +00:00
rillig
e3aa46eedc Added a leading underscore to the names of the *_COOKIE variables, as they
are not part of the public interface.
2005-06-04 20:56:47 +00:00
wiz
4d151e342c Describe new xterm options, from Jeroen Ruigrok van der Werven 2005-06-04 17:43:18 +00:00
dillo
dff8372404 Improve the way option groups are displayed in show-options.
While here, rename _cls_ to _grp_, as they are called groups.
2005-06-04 16:30:19 +00:00
seb
5feada633d Fix variable names in usage example. 2005-06-04 10:11:24 +00:00
jlam
c55f2fb319 Teach the tools framework about mktemp. Replace explicit tests for
mktemp with USE_TOOLS+=mktemp in the samba packages.
2005-06-03 22:54:44 +00:00
jlam
dd2b1cf653 Teach the tools framework about bdftopcf and remove
x11-clients.buildlink3.mk.  Packages that need bdftopcf should say:

	USE_TOOLS+=	bdftopcf
2005-06-03 21:11:06 +00:00
jlam
a741f4ed26 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.
2005-06-03 20:22:59 +00:00
jlam
08c60ab83d Coalesce the common makefile code in the builtin.mk file that inspect
the X11 distribution using imake into mk/buildlink3/imake-check.mk.
imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check
that generates the required Imakefiles and runs imake.  Remove the
now extraneous builtin-imake.mk files as the builtin.mk files can now
contain the name of the imake symbol to check.
2005-06-03 19:12:49 +00:00
dillo
5fa9d959f6 don't requrie PKG_SUPPORTED_OPTIONS to be set when groups are in use 2005-06-03 14:25:47 +00:00
wiz
97ad9a77e1 Remove obsolete USE_GIF variable. 2005-06-03 13:54:49 +00:00
uebayasi
2132936af4 Describe options used in inputmethod/uim and www/w3m. 2005-06-03 13:50:38 +00:00
wiz
a7d52b044d Describe idea option. 2005-06-03 13:27:47 +00:00
wiz
27c865846e Remove obsolete USE_IDEA variable. 2005-06-03 13:26:40 +00:00
wiz
1c3a46e98b Remove USE_ESOUND, all users have been converted. 2005-06-03 13:20:50 +00:00
wiz
625b87ac7c "socks" option has been removed, remove it here too. 2005-06-03 10:29:23 +00:00
wiz
b94b207c3b Remove gtk2 options description now that option has been removed :) 2005-06-03 10:24:47 +00:00
wiz
cff21637ae Add gtk2 option description. 2005-06-03 08:57:36 +00:00
wiz
3e573b0295 Fix USE_SOCKS=5 case. 2005-06-02 22:20:37 +00:00
dillo
f91dd9c279 add group options to PKG_SUPPORTED_OPTIONS before includeing
mk/defaults/obsolete.mk so socks and kerberos work when listed in
groups
2005-06-02 21:55:05 +00:00