15:15 Stefan Eßer (se) 

Fix CONFLICTS entries of multiple ports

There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)

    bcaf25a

08:09 Mathieu Arnold (mat) 

One more small cleanup, forgotten yesterday.
Reported by:	lwhsu

    cf118cc

14:31 Mathieu Arnold (mat) 

Remove # $FreeBSD$ from Makefiles.

    305f148

18:42 wg 

security/barnyard2-sguil: enable staging on slave port

PR:		ports/183403
Submitted by:	Paul Schmehl <pauls utdallas.edu> (maintainer)

 

22:55 bapt 

Add NO_STAGE all over the place in preparation for the staging support (cat:
security)

 

12:56 rm 

- update to 1.11
- add new port options

PR:		174024
Submitted by:	Paul Schmehl <pauls@utdallas.edu> (maintainer)
Feature safe:	yes

 

11:10 jhale 

- Update to 1.10
- Convert to new options framework
- Allow for any available version of TCL to be used
- Add LICENSE
- Remove indefinite article from COMMENT, update
- Mark MAKE_JOBS_SAFE
- Trim Makefile header

PR:		ports/172456
Submitted by:	Paul Schmehl <pauls@utdallas.edu> (maintainer)
Approved by:	makc (mentor)
Feature safe:	yes

 

17:09 ohauer 

- add patch to barnyard2 to allow build with postgresql and tcl
  (reported and fixed upstream)
- display option TCL only for Master port, it makes no sense if
  the slave can de-select a required option
- remove broken barnyard-sguil (master port was removed 2011-04-04)
- add new port barnyard2-sguil [1]
- add entry to MOVED

PR:             ports/156188 [1]
Submitted by:   me
Approved by:    maintainer timeout