Commit graph

23 commits

Author SHA1 Message Date
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
cube
533f02971b Remove useless command that breaks on read-only pkgsrc trees. I wonder
what was the point of this in the first place...

Closes PR#27529.
2004-10-28 06:36:51 +00:00
adrianp
59c0f10a8f - s/uname/${UNAME}/g 2004-08-30 20:48:47 +00:00
adrianp
af2fe9f34b Update libmilter to reflect new sendmail 8.13.x branch in pkgsrc 2004-08-30 20:26:18 +00:00
tron
549308aff4 Added missing package version handling. Pointed out by Mark Davies. 2004-07-18 15:41:35 +00:00
tron
34b6981b17 Use "libmilter" in base system if it is available. 2004-06-30 13:48:55 +00:00
snj
844b08fcd4 No longer used. 2004-05-09 21:15:16 +00:00
snj
218f5937b3 Convert to buildlink3. 2004-05-09 21:14:42 +00:00
tv
5fe59636fa Add a bl3 for libmilter. 2004-04-14 14:52:16 +00:00
tv
2331bb58d9 Quickly revert previous. I didn't see that libmilter had already been
changed in a CVS merge somewhere.
2004-04-06 14:01:51 +00:00
tv
c746c0152b Make libmilter a build-time dependency only (it's a static library); bump
PKGREVISION of its dependencies.
2004-04-06 13:50:57 +00:00
tron
334179076b Update "sendmail" and "libmilter" packages to version 8.12.11.
Changes since version 8.12.10:
Use QueueFileMode when opening qf files.  This error was a
	regression in 8.12.10.  Problem detected and diagnosed
	Lech Szychowski of the Polish Power Grid Company.
Properly count the number of queue runners in a work group and
	make sure the total limit of MaxQueueChildren is not
	exceeded.  Based on patch from Takayuki Yoshizawa of
	Techfirm, Inc.
Take care of systems that can generate time values where the
	seconds can exceed the usual range of 0 to 59.
	Problem noted by Randy Diffenderfer of EDS.
Avoid regeneration of identical queue identifiers by processes
	whose process id is the same as that of the initial
	sendmail process that was used to start the daemon.
	Problem noted by Randy Diffenderfer of EDS.
When a milter invokes smfi_delrcpt() compare the supplied
	recipient address also against the printable addresses
	of the current list to deal with rewritten addresses.
	Based on patch from Sean Hanson of The Asylum.
BadRcptThrottle now also works for addresses which return the
	error mailer, e.g., virtusertable entries with the
	right hand side error:.  Patch from Per Hedeland.
Fix printing of 8 bit characters as octals in log messages.
	Based on patch by Andrey J. Melnikoff.
Undo change of algorithm for MIME 7-bit base64 encoding to 8-bit
	text that has been introduced in 8.12.3.  There are some
	examples where the new code fails, but the old code works.
	To get the 8.12.3-8.12.10 version, compile sendmail with
	-DMIME7TO8_OLD=0.  If you have an example of improper
	7 to 8 bit conversion please send it to us.
Return normal error code for unknown SMTP commands instead of
	the one specified by check_relay or a milter for a
	connection.  Problem noted by Andrzej Filip.
Some ident responses contain data after the terminating CRLF which
	causes sendmail to log "POSSIBLE ATTACK...newline in string".
	To avoid this everything after LF is ignored.
If the operating system supports O_EXLOCK and HASFLOCK is set
	then a possible race condition for creating qf files
	can be avoided.  Note: the race condition does not
	exist within sendmail, but between sendmail and an
	external application that accesses qf files.
Log the proper options name for TLS related mising files for
	the CACertPath, CACertFile, and DHParameters options.
Do not split an envelope if it will be discarded, otherwise df
	files could be left behind.  Problem found by Wolfgang
	Breyha.
The use of the environment variables HOME and HOSTALIASES has been
	deprecated and will be removed in version 8.13.  This only
	effects configuration which preserve those variable via the
	'E' command in the cf file as sendmail clears out its entire
	environment.
Portability:
	Add support for Darwin 7.0/Mac OS X 10.3 (a.k.a. Panther).
	Solaris 10 has unsetenv(), patch from Craig Mohrman of
		Sun Microsystems.
LIBMILTER: Add extra checks in case a broken MTA sends bogus data
	to libmilter.  Based on code review by Rob Grzywinski.
SMRSH: Properly assemble commands that contain '&&' or '||'.
	Problem noted by Eric Lee of Talking Heads.
New Files:
	devtools/OS/Darwin.7.0
2004-03-27 22:07:32 +00:00
markd
3e8b17faf1 "PTHREAD_OPTS+= require" as some sort of thread library is required.
Should fix PR pkg/24610
2004-03-07 11:40:53 +00:00
jlam
d2b62c66fb Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC.  Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE.  If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
2004-02-12 02:35:06 +00:00
jlam
1edfa505ed Reorganize code so that any dependencies are checked as part of deciding
whether the software is built-in or not.  This facilitates implementing
the forthcoming PKGSRC_NATIVE variable.
2004-02-12 01:59:37 +00:00
jlam
317cc72791 Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
2004-02-05 07:17:14 +00:00
jlam
e7133cac25 Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
2004-02-05 07:06:15 +00:00
jlam
07a9d8dfb2 Support a new global variable:
BUILDLINK_PREFER_PKGSRC
	This variable determines whether or not to prefer the pkgsrc
	versions of software that is also present in the base system.

	This variable is multi-state:
		defined, or "yes"	always prefer the pkgsrc versions
		not defined, or "no"	only use the pkgsrc versions if
					needed by dependency requirements

	This can also take a list of packages for which to prefer the
	pkgsrc-installed software.  The package names may be found by
	consulting the value added to BUILDLINK_PACKAGES in the
	buildlink[23].mk files for that package.
2004-02-05 06:58:02 +00:00
markd
663e862985 Allow use of base system libmilter if it exists and is complete enough.
Closes PR 22708 from wiz.
2003-09-24 12:43:57 +00:00
markd
e77c8279fb Remove PKGREVISION as base version incremented with sendmail update to
8.12.10.
2003-09-18 10:39:12 +00:00
markd
e4c27c734b USE_MILTER no longer needed. 2003-09-15 12:22:31 +00:00
wiz
7166660e08 Dependency bumps, needed because of devel/pth's major bump, and related
dependency bumps.
2003-05-02 11:53:34 +00:00
markd
cc878eae0b Initial import of libmilter-8.12.6
The sendmail Mail Filter API (Milter) is designed to allow third-party
programs access to mail messages as they are being processed in order to
filter meta-information and content.

libmilter provides the implementation of this API.
2002-09-23 13:03:31 +00:00