diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2012-06-25 12:27:00 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2012-06-25 12:27:00 +0000 |
| commit | 8edc07bcb9f80357fc8a55bec6c0522739810f99 (patch) | |
| tree | 15eab12b728e810098b9611e3fe2f049e4a018ea /share | |
| parent | ee4734fca2dfdfbaa345e63924b9e1611dd9696d (diff) | |
automake has different naming rules, I was mistaken, those require conflict
markers...
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man5/bsd.port.mk.5 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5 index 9657d0842d1..984f6cd3eb7 100644 --- a/share/man/man5/bsd.port.mk.5 +++ b/share/man/man5/bsd.port.mk.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: bsd.port.mk.5,v 1.342 2012/06/18 12:16:19 espie Exp $ +.\" $OpenBSD: bsd.port.mk.5,v 1.343 2012/06/25 12:26:59 espie Exp $ .\" .\" Copyright (c) 2000-2008 Marc Espie .\" @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 18 2012 $ +.Dd $Mdocdate: June 25 2012 $ .Dt BSD.PORT.MK 5 .Os .Sh NAME @@ -2923,9 +2923,7 @@ Any other version or .Ev FLAVOR won't conflict. This is generally an error, apart from very few ports like -.Pa devel/autoconf/* -and -.Pa devel/automake/* . +.Pa devel/autoconf/* . .It "groff produced empty result for <manpage>..." Warning message comes from .Xr pkg_create 1 . |