cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair conflict between -main and -docs, introduced in previous.

Browse Source 
The intended diff had this conflict resolved, but I ended up committing
the previous diff...  Problem spotted by Markus Lude.
This commit is contained in:
jca 2015-02-05 02:04:00 +00:00
parent 58dfc8201e
commit e769be4eba
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/samba/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.197 2015/02/04 11:50:21 jca Exp $
# $OpenBSD: Makefile,v 1.198 2015/02/05 02:04:00 jca Exp $
SHARED_ONLY= Yes
@ -9,8 +9,8 @@ DISTNAME= samba-3.6.15
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs
REVISION-main= 11
REVISION-docs= 0
REVISION-main= 12
REVISION-docs= 1
SHARED_LIBS= smbclient 3.0 \
smbsharemodes 1.0 \

4
net/samba/pkg/PLIST-docs
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-docs,v 1.20 2015/02/04 11:50:21 jca Exp $
@conflict samba-<=3.6.15p10
@comment $OpenBSD: PLIST-docs,v 1.21 2015/02/05 02:04:00 jca Exp $
@conflict samba-<=3.6.15p11
@pkgpath net/samba,-docs,ads
@pkgpath net/samba,-docs,cups
@pkgpath net/samba,-docs,cups,ads

4
net/samba/pkg/PLIST-main
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.26 2015/02/04 11:50:21 jca Exp $
@conflict samba-docs-<=3.6.15
@comment $OpenBSD: PLIST-main,v 1.27 2015/02/05 02:04:00 jca Exp $
@conflict samba-docs-<3.6.15p1
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},ads,-main
@pkgpath ${BASE_PKGPATH},cups[,ads][,ldap]