CVS commit: pkgsrc/net/samba4

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 11 12:28:17 UTC 2016

Modified Files:
        pkgsrc/net/samba4: Makefile PLIST

Log Message:
If py-dns or py-iso8601 are installed, the PLIST is wrong because
the separate copy coming with samba4 is not installed.

Depend on the two packages and never install the separate copies.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/samba4/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.21 pkgsrc/net/samba4/Makefile:1.22
--- pkgsrc/net/samba4/Makefile:1.21     Sat Jul  9 13:04:02 2016
+++ pkgsrc/net/samba4/Makefile  Mon Jul 11 12:28:17 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 13:04:02 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/07/11 12:28:17 wiz Exp $
 
 DISTNAME=      samba-${VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  http://download.samba.org/pub/samba/stable/
 
@@ -16,6 +16,8 @@ VERSION=      4.3.11
 CONFLICTS+=    ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]*
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+DEPENDS+=      ${PYPKGPREFIX}-iso8601-[0-9]*:../../time/py-iso8601
+DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 
 BUILD_DEFS+=           VARBASE
 

Index: pkgsrc/net/samba4/PLIST
diff -u pkgsrc/net/samba4/PLIST:1.8 pkgsrc/net/samba4/PLIST:1.9
--- pkgsrc/net/samba4/PLIST:1.8 Thu Jul  7 16:44:14 2016
+++ pkgsrc/net/samba4/PLIST     Mon Jul 11 12:28:17 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/07/07 16:44:14 taca Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/07/11 12:28:17 wiz Exp $
 bin/cifsdd
 bin/dbwrap_tool
 bin/eventlogadm
@@ -449,89 +449,6 @@ ${PYSITELIB}/samba/tests/upgradeprovisio
 ${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py
 ${PYSITELIB}/samba/tests/xattr.py
 ${PYSITELIB}/samba/third_party/__init__.py
-${PYSITELIB}/samba/third_party/dns/__init__.py
-${PYSITELIB}/samba/third_party/dns/dnssec.py
-${PYSITELIB}/samba/third_party/dns/e164.py
-${PYSITELIB}/samba/third_party/dns/edns.py
-${PYSITELIB}/samba/third_party/dns/entropy.py
-${PYSITELIB}/samba/third_party/dns/exception.py
-${PYSITELIB}/samba/third_party/dns/flags.py
-${PYSITELIB}/samba/third_party/dns/hash.py
-${PYSITELIB}/samba/third_party/dns/inet.py
-${PYSITELIB}/samba/third_party/dns/ipv4.py
-${PYSITELIB}/samba/third_party/dns/ipv6.py
-${PYSITELIB}/samba/third_party/dns/message.py
-${PYSITELIB}/samba/third_party/dns/name.py
-${PYSITELIB}/samba/third_party/dns/namedict.py
-${PYSITELIB}/samba/third_party/dns/node.py
-${PYSITELIB}/samba/third_party/dns/opcode.py
-${PYSITELIB}/samba/third_party/dns/query.py
-${PYSITELIB}/samba/third_party/dns/rcode.py
-${PYSITELIB}/samba/third_party/dns/rdata.py
-${PYSITELIB}/samba/third_party/dns/rdataclass.py
-${PYSITELIB}/samba/third_party/dns/rdataset.py
-${PYSITELIB}/samba/third_party/dns/rdatatype.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/AFSDB.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/CERT.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/CNAME.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DLV.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DNAME.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DNSKEY.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/DS.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/GPOS.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/HINFO.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/HIP.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/ISDN.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/LOC.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/MX.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NS.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NSEC.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NSEC3.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/NSEC3PARAM.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/PTR.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/RP.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/RRSIG.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/RT.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/SOA.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/SPF.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/SSHFP.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/TXT.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/X25.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/ANY/__init__.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/A.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/AAAA.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/APL.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/DHCID.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/IPSECKEY.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/KX.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/NAPTR.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/NSAP.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/NSAP_PTR.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/PX.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/SRV.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/WKS.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/IN/__init__.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/__init__.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/dsbase.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/mxbase.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/nsbase.py
-${PYSITELIB}/samba/third_party/dns/rdtypes/txtbase.py
-${PYSITELIB}/samba/third_party/dns/renderer.py
-${PYSITELIB}/samba/third_party/dns/resolver.py
-${PYSITELIB}/samba/third_party/dns/reversename.py
-${PYSITELIB}/samba/third_party/dns/rrset.py
-${PYSITELIB}/samba/third_party/dns/set.py
-${PYSITELIB}/samba/third_party/dns/tokenizer.py
-${PYSITELIB}/samba/third_party/dns/tsig.py
-${PYSITELIB}/samba/third_party/dns/tsigkeyring.py
-${PYSITELIB}/samba/third_party/dns/ttl.py
-${PYSITELIB}/samba/third_party/dns/update.py
-${PYSITELIB}/samba/third_party/dns/version.py
-${PYSITELIB}/samba/third_party/dns/wiredata.py
-${PYSITELIB}/samba/third_party/dns/zone.py
-${PYSITELIB}/samba/third_party/iso8601/__init__.py
-${PYSITELIB}/samba/third_party/iso8601/iso8601.py
-${PYSITELIB}/samba/third_party/iso8601/test_iso8601.py
 ${PYSITELIB}/samba/upgrade.py
 ${PYSITELIB}/samba/upgradehelpers.py
 ${PYSITELIB}/samba/web_server/__init__.py