Commit graph

80484 commits

Author SHA1 Message Date
jlam
6a9818ab44 Don't include bsd.builtin.mk... just include the builtin.mk file for
the package that we're interested in (iconv).  Also, fix the logic so
that we don't assume that built-in libiconv.so doesn't exist.
2005-06-01 19:03:45 +00:00
wiz
8aaaeb0bb0 Describe lprng-* options. 2005-06-01 18:54:20 +00:00
wiz
5b1d5367f3 Remove obsolete LPRNG* options. 2005-06-01 18:52:32 +00:00
wiz
524b798f8c Convert to options framework. 2005-06-01 18:51:57 +00:00
jmmv
cbe4100202 Convert the mplayer* and mencoder* packages to the options framework.
This means that the MPLAYER_ENABLE_RUNTIME_CPU_DETECTION,
MPLAYER_DISABLE_DRIVERS and MPLAYER_USE_MEDIALIB become deprecated
(although still recognized).

Visible changes in the resulting binary packages should be minimum by
default (everything that was enabled before still is, and the same
dependencies are kept).  A notable addition, though, is the support for
user-defined menus, closing PR pkg/29784.

Also note that (almost) all dependencies have now a corresponding option
to disable them in case you want to get a minimalist mplayer package.
'make show-options' is your friend ;)

With thanks to wiz@ and dillo@ for their comments and help.
2005-06-01 18:45:45 +00:00
wiz
b88e551f4e Convert to options framework. 2005-06-01 18:37:27 +00:00
jlam
7debfabe11 Use IMAKE_MAKE instead of MAKE to process the makefile generated by imake. 2005-06-01 18:33:02 +00:00
wiz
596cf2a5ae Remove ipv6 -- use inet6 instead. 2005-06-01 18:23:57 +00:00
wiz
0985a894aa No reason to include bsd.prefs.mk, comment it.
(The code that would use it is commented out too.).
2005-06-01 18:23:37 +00:00
wiz
61dd787c63 Deprecate ipv6 option in favour of inet6. 2005-06-01 18:19:31 +00:00
wiz
e9a28c1b56 There is no ipv6 category.
XXX: should there be one, replacing USE_INET6?
2005-06-01 18:18:09 +00:00
wiz
96a7a5307e Recognize inet6 in PKG_SUPPORTED_OPTIONS as an indicator
that a package support IPv6 (for the README-IPv6.html generation).
2005-06-01 18:16:20 +00:00
jlam
05db0b4f12 Turn IMAKE_MAKE into a public variable that may be set via /etc/mk.conf. 2005-06-01 18:14:23 +00:00
jlam
95fd1f6ec9 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.
2005-06-01 18:02:37 +00:00
wiz
6469e231c2 Recognize inet6 in PKG_SUPPORTED_OPTIONS as an indicator
that a package support IPv6 (for the README-IPv6.html generation).
2005-06-01 17:45:57 +00:00
jlam
d811860c7b *.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.
2005-06-01 17:27:22 +00:00
jlam
a72cd1c453 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.
2005-06-01 17:05:19 +00:00
wiz
926075cea7 fxtv only supports Xaw3d anyway, so just include Xaw3d's bl3.mk
file instead of using the general Xaw framework.
While here, s/echo/${ECHO}/

Ok'd by maintainer tron@
2005-06-01 16:41:26 +00:00
jmmv
ef81bfd6ab Reformat:
- Cut long lines wherever possible.
- Remove indentation of major sections (chapter and sections).
- Remove spaces between tags and CDATA (as in '<para>foo</para>').
- Some other minor fixes.
2005-06-01 15:49:44 +00:00
wiz
80d0469364 Fix grammar in comment. 2005-06-01 14:54:18 +00:00
markd
20c42f20aa Switch USE_OSS to options framework. 2005-06-01 14:51:56 +00:00
wiz
2477fd485b Convert to options framework. 2005-06-01 14:47:54 +00:00
wiz
fdfab0ae03 Remove obsolete DELIVER_SUID. 2005-06-01 14:45:35 +00:00
wiz
eaf372f7d1 Document deliver-suid. 2005-06-01 14:45:25 +00:00
wiz
878985790f Convert to options framework.
Replace undocumented DELIVER_CONF_PREFIX with plain PKG_SYSCONFDIR handling.
Remove unneeded inclusion of bsd.man.mk.
2005-06-01 14:45:01 +00:00
markd
3904ff71db FILEMAN manual pages have FILEMAN suffix. 2005-06-01 14:38:39 +00:00
wiz
29315a0d37 Finish conversion to options framework. 2005-06-01 14:37:31 +00:00
wiz
a46079128a Sort. 2005-06-01 14:37:14 +00:00
wiz
336ed019bf Fix casing of IPsec in COMMENT. 2005-06-01 14:35:31 +00:00
wiz
4717998f31 Convert to options framework. 2005-06-01 14:29:58 +00:00
markd
5f757378ce LIBMAN manual pages should have the LIBMAN suffix. 2005-06-01 14:29:47 +00:00
wiz
9762458cc7 Do not pull in esound/bl3.mk regardless of the setting
of USE_ESOUND, because the esound library is only used in a dynamically
loaded module. Noted by tv@.
2005-06-01 14:28:36 +00:00
markd
81c0cfd0d0 OpenWindows imake installs manual pages to different locations than
where the XFree86/xorg ones do.
2005-06-01 14:27:12 +00:00
markd
8ddab030e4 On NetBSD, OpenBSD and BSDOS imake always installs man/catN pages with
a "0" suffix.
2005-06-01 14:23:07 +00:00
abs
c7714ed518 update pkg_chk to 1.59:
Fix fallout of 'sh -e' change in 1.58 - make pkg_chk -lb work again
2005-06-01 14:15:12 +00:00
abs
9e2946589a update pkg_chk to 1.59:
Fix fallout of 'sh -e' change in 1.58 - make pkg_chk -lb work again
2005-06-01 14:14:47 +00:00
wiz
f11542f235 + mailscanner-4.42, sudo-1.6.8p8. 2005-06-01 14:12:43 +00:00
wiz
8c0beeae4e Updated audio/SDL_mixer to 1.2.6nb2 2005-06-01 14:12:31 +00:00
wiz
a8b8039f7b Update to 1.2.6nb2:
Fix MIDI playback. Remove configuration option that defaults to yes.
From ISIHARA Takanori in PR 30330.
2005-06-01 14:11:26 +00:00
wiz
5d165b1a09 Use PKG_SUGGESTED_OPTIONS, not PKG_SUPPORTED_OPTIONS 2005-06-01 14:06:50 +00:00
wiz
932d1e483a Fix typo in variable name, and replace one PKG_SUPPORTED_OPTIONS line
with PKG_SUGGESTED_OPTIONS.
2005-06-01 14:05:54 +00:00
dillo
3d94227174 set PKG_SUGGESTED_OPTIONS, not PKG_DEFAULT_OPTIONS 2005-06-01 14:05:03 +00:00
dillo
eb20da5507 use PKG_OPTIONS_LEGACY_VARS to handle legacy variables 2005-06-01 14:03:15 +00:00
dillo
00f7a6753d use PKG_OPTIONS_LEGACY_VARS to handle legacy variables
set PKG_SUGGESTED_OPTIONS instead of PKG_DEFAULT_OPTIONS (which
	should be set by the user only)
2005-06-01 14:00:55 +00:00
dillo
69fea00b5b test legacy var with `-' in option name 2005-06-01 13:40:46 +00:00
dillo
b05a793493 fix bug in legacy vars handling for option names containing `-',
found by jmmv.
2005-06-01 13:40:14 +00:00
markd
dec666b95e Add build dependency on readline to keep configure happy on platforms that
don't have a libedit or libreadline in the base system (eg Solaris).
Server parts don't actually use readline but configure blows up trying
to find it for the client parts.
OKed by Juan RP.
2005-06-01 13:07:42 +00:00
markd
824b9abbfb Allow build using python 2.4
OKed by Rene Hexel
2005-06-01 12:55:10 +00:00
wiz
e14eaa5810 Formatting improvements. Bump date for previous. New sentence, new line. 2005-06-01 11:38:45 +00:00
abs
7715a5d6f2 update pkg_chk to 1.58
- sort -l output so that dependencies always come before packages
  which depend upon them
- completely rework -u so that a list of packages to be update is generated,
  then all mismatched packages are removed, then the list is processed to
  add in packages. If -u is interrupted, a second run will resume the update
- update (-u) works with binary packages
2005-06-01 11:29:45 +00:00