Ian McWilliam <kaosa...@tpg.com.au> writes:
>> On 27 Jan 2015, at 10:49 pm, Stuart Henderson <st...@openbsd.org> wrote:
>>
>> On 2015/01/27 21:54, Ian McWilliam wrote:
>>> The attached patch moves the share/examples/samba/LDAP/* files
>>> (mainly schema stuff) from the docs package to the main package.
>>>
>>> This was requested some time back by Marcus Merighi so that they
>>> do not have to install the docs package just for the schema files.
>>>
>>> No other functional change.
>>>
>>> Ian McWilliam
>>>
>>>
>>
>>
>> This change requires conflict markers in order that updates work.
>>
>
>
> Hopefully something like the attached with updated conflict markers.
Hmm, I think this is needed for the upgrade path to work:
-+@conflict samba-docs-<=3.6.15
++@conflict samba-docs-<3.6.15p0
Updated diff, please test the upgrade path on your systems. Looks like
a valuable modification for 5.7
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.196
diff -u -p -r1.196 Makefile
--- Makefile 8 Dec 2014 10:57:09 -0000 1.196
+++ Makefile 31 Jan 2015 16:43:52 -0000
@@ -9,7 +9,8 @@ DISTNAME= samba-3.6.15
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs
-REVISION-main= 10
+REVISION-main= 11
+REVISION-docs= 0
SHARED_LIBS= smbclient 3.0 \
smbsharemodes 1.0 \
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-docs,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST-docs
--- pkg/PLIST-docs 25 Sep 2012 20:11:11 -0000 1.19
+++ pkg/PLIST-docs 31 Jan 2015 12:26:01 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-docs,v 1.19 2012/09/25 20:11:11 brad Exp $
-@conflict samba-<3.6.0
+@conflict samba-<=3.6.15p10
@pkgpath net/samba,-docs,ads
@pkgpath net/samba,-docs,cups
@pkgpath net/samba,-docs,cups,ads
@@ -27,19 +27,6 @@ share/doc/samba/pdf/
share/doc/samba/pdf/Samba3-ByExample.pdf
share/doc/samba/pdf/Samba3-Developers-Guide.pdf
share/doc/samba/pdf/Samba3-HOWTO.pdf
-share/examples/samba/LDAP/
-share/examples/samba/LDAP/README
-share/examples/samba/LDAP/convertSambaAccount
-share/examples/samba/LDAP/get_next_oid
-share/examples/samba/LDAP/ol-schema-migrate.pl
-share/examples/samba/LDAP/samba-nds.schema
-share/examples/samba/LDAP/samba-schema-FDS.ldif
-share/examples/samba/LDAP/samba-schema-netscapeds5.x.README
-share/examples/samba/LDAP/samba-schema.IBMSecureWay
-share/examples/samba/LDAP/samba.ldif
-share/examples/samba/LDAP/samba.schema
-share/examples/samba/LDAP/samba.schema.at.IBM-DS
-share/examples/samba/LDAP/samba.schema.oc.IBM-DS
share/examples/samba/README
share/examples/samba/VFS/
share/examples/samba/VFS/Makefile.in
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST-main
--- pkg/PLIST-main 21 Apr 2014 22:24:17 -0000 1.25
+++ pkg/PLIST-main 31 Jan 2015 15:50:55 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.25 2014/04/21 22:24:17 sthen Exp $
-@conflict samba-docs-<3.6.0
+@conflict samba-docs-<3.6.15p0
@pkgpath ${BASE_PKGPATH}
@pkgpath ${BASE_PKGPATH},ads,-main
@pkgpath ${BASE_PKGPATH},cups[,ads][,ldap]
@@ -190,6 +190,19 @@ share/doc/samba/
share/doc/samba/README
share/examples/samba/
@sample ${SYSCONFDIR}/samba/
+share/examples/samba/LDAP/
+share/examples/samba/LDAP/README
+share/examples/samba/LDAP/convertSambaAccount
+share/examples/samba/LDAP/get_next_oid
+share/examples/samba/LDAP/ol-schema-migrate.pl
+share/examples/samba/LDAP/samba-nds.schema
+share/examples/samba/LDAP/samba-schema-FDS.ldif
+share/examples/samba/LDAP/samba-schema-netscapeds5.x.README
+share/examples/samba/LDAP/samba-schema.IBMSecureWay
+share/examples/samba/LDAP/samba.ldif
+share/examples/samba/LDAP/samba.schema
+share/examples/samba/LDAP/samba.schema.at.IBM-DS
+share/examples/samba/LDAP/samba.schema.oc.IBM-DS
share/examples/samba/ad-bench/
share/examples/samba/ad-bench/README
share/examples/samba/ad-bench/ad-bench.sh
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
