missed conflicts after the EPOCH change

This commit is contained in:
espie 2015-06-10 10:58:24 +00:00
parent bdcf3f3717
commit ec74dae3e9
4 changed files with 8 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2015/03/30 22:22:18 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2015/06/10 10:58:24 espie Exp $
REV= 1.0
VERSION= ${REV}.2a
EPOCH= 0
REVISION= 0
REVISION= 1
SHARED_LIBS= net 0.0
PKGSPEC = libnet->=1.0v0,<1.1v0

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2015/03/30 22:22:18 sthen Exp $
@comment $OpenBSD: PLIST,v 1.5 2015/06/10 10:58:24 espie Exp $
@option no-default-conflict
@pkgpath net/libnet
@conflict libnet-1.0->=1.0
@conflict libnet-1.0->=1.0v0
@conflict libnet-<1.1
bin/libnet-config-1.0
include/libnet-1.0/
include/libnet-1.0/libnet/

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2015/03/30 22:22:18 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2015/06/10 10:58:24 espie Exp $
REV= 1.1
VERSION= ${REV}.2.1
REVISION= 0
REVISION= 1
EPOCH= 0
SHARED_LIBS= net 11.0
PKGSPEC= libnet->=1.1v0,<1.2v0

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/30 22:22:18 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2015/06/10 10:58:24 espie Exp $
@option no-default-conflict
@conflict libnet-1.1->=1.1
@conflict libnet-1.1->=1.1v0
@conflict libnet->=1.1,<1.0v0
bin/libnet-config-1.1
include/libnet-1.1/
include/libnet-1.1/libnet/