@conflict lines also needed updating for the EPOCH bump

This commit is contained in:
sthen 2015-03-30 22:22:18 +00:00
parent 150ecac61c
commit 80fbf41506
4 changed files with 10 additions and 5 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2015/03/21 13:02:35 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2015/03/30 22:22:18 sthen Exp $
REV= 1.0
VERSION= ${REV}.2a
EPOCH= 0
REVISION= 0
SHARED_LIBS= net 0.0
PKGSPEC = libnet->=1.0v0,<1.1v0

View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:52 naddy Exp $
@comment $OpenBSD: PLIST,v 1.4 2015/03/30 22:22:18 sthen Exp $
@option no-default-conflict
@pkgpath net/libnet
@conflict libnet-1.0->=1.0
@conflict libnet-1.0->=1.0v0
bin/libnet-config-1.0
include/libnet-1.0/
include/libnet-1.0/libnet/

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.12 2015/03/21 13:02:35 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2015/03/30 22:22:18 sthen Exp $
REV= 1.1
VERSION= ${REV}.2.1
REVISION= 0
EPOCH= 0
SHARED_LIBS= net 11.0
PKGSPEC = libnet->=1.1v0,<1.2v0
PKGSPEC= libnet->=1.1v0,<1.2v0
WRKDIST= ${WRKDIR}/libnet
MASTER_SITES= http://www.packetfactory.net/libnet/dist/

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2015/03/16 18:07:52 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/03/30 22:22:18 sthen Exp $
@option no-default-conflict
@conflict libnet-1.1->=1.1
@conflict libnet-1.1->=1.1v0
bin/libnet-config-1.1
include/libnet-1.1/
include/libnet-1.1/libnet/