Eliminate use of external p5-Parse-Pidl, as 4.4-, 4.5 and 4.6 are incompatiable in the output cross the Samba versions.

4 files changed, 6 insertions, 46 deletions

diff --git a/net/samba46/Makefile b/net/samba46/Makefile
index a57099c7e83b..7ac954d24dd0 100644
--- a/net/samba46/Makefile
+++ b/net/samba46/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=			${SAMBA4_BASENAME}46
 PORTVERSION?=			${SAMBA4_VERSION}
-PORTREVISION?=			0
+PORTREVISION?=			1
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -13,7 +13,7 @@ COMMENT?=			Free SMB/CIFS and AD/DC server and client for Unix
 
 LICENSE=			GPLv3
 
-CONFLICTS?=			*samba3[2-6]-3.* samba4-4.0.* samba4[1-5]-4.*
+CONFLICTS?=			*samba3[2-6]-3.* samba4-4.0.* samba4[1-5]-4.* p5-Parse-Pidl-4.*
 
 #EXTRA_PATCHES=		${PATCHDIR}/extra-patch-security:-p1
 
@@ -119,9 +119,9 @@ LIB_DEPENDS+=			libsunacl.so:sysutils/libsunacl
 BUILD_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 RUN_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
 # External Samba dependencies
-# IDL compiler
-BUILD_DEPENDS+=			p5-Parse-Pidl>=4.6.0:devel/p5-Parse-Pidl
-PLIST_SUB+=			PIDL="@comment "
+# Needed for IDL compiler
+BUILD_DEPENDS+=			p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
+PLIST_SUB+=			PIDL=""
 # External Python modules
 BUILD_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
 RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython
@@ -329,13 +329,12 @@ PORTDOCS=			README.FreeBSD
 IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
-				@${RM} -r ${WRKSRC}/pidl
+				@${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp
 
 post-patch:
 				@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
 					${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
 				@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-					${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \
 					${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py
 				@${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \
 					${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh
diff --git a/net/samba46/files/patch-buildtools__wafsamba__samba_pidl.py b/net/samba46/files/patch-buildtools__wafsamba__samba_pidl.py
deleted file mode 100644
index 52c188e4048a..000000000000
--- a/net/samba46/files/patch-buildtools__wafsamba__samba_pidl.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- buildtools/wafsamba/samba_pidl.py.orig	2016-01-26 11:45:46 UTC
-+++ buildtools/wafsamba/samba_pidl.py
-@@ -89,7 +89,7 @@ def SAMBA_PIDL(bld, pname, source,
-     # prime the list of nodes we are dependent on with the cached pidl sources
-     t.allnodes = pidl_src_nodes
- 
--    t.env.PIDL = os.path.join(bld.srcnode.abspath(), 'pidl/pidl')
-+    t.env.PIDL = os.path.join('%%LOCALBASE%%', 'bin/pidl')
-     t.env.OPTIONS = TO_LIST(options)
-     t.env.OUTPUTDIR = bld.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env)
- 
diff --git a/net/samba46/files/patch-wscript b/net/samba46/files/patch-wscript
deleted file mode 100644
index 9bd3abe45dc6..000000000000
--- a/net/samba46/files/patch-wscript
+++ /dev/null
@@ -1,18 +0,0 @@
---- wscript.orig	2016-08-11 07:51:05.000000000 +0000
-+++ wscript	2017-03-24 17:15:07.836567000 +0000
-@@ -40,7 +40,6 @@
-     opt.RECURSE('selftest')
-     opt.RECURSE('source4/lib/tls')
-     opt.RECURSE('source4/dsdb/samdb/ldb_modules')
--    opt.RECURSE('pidl')
-     opt.RECURSE('source3')
-     opt.RECURSE('lib/util')
-     opt.RECURSE('ctdb')
-@@ -161,7 +160,6 @@
-     conf.RECURSE('nsswitch')
-     conf.RECURSE('libcli/smbreadline')
-     conf.RECURSE('lib/crypto')
--    conf.RECURSE('pidl')
-     conf.RECURSE('selftest')
-     if conf.CONFIG_GET('ENABLE_SELFTEST'):
-         conf.RECURSE('lib/nss_wrapper')
diff --git a/net/samba46/files/patch-wscript_build b/net/samba46/files/patch-wscript_build
deleted file mode 100644
index 1d66b008a3be..000000000000
--- a/net/samba46/files/patch-wscript_build
+++ /dev/null
@@ -1,10 +0,0 @@
---- wscript_build.orig	2016-01-26 11:45:47 UTC
-+++ wscript_build
-@@ -141,7 +141,6 @@ if bld.AD_DC_BUILD_IS_ENABLED():
- if bld.env.with_ctdb:
-     bld.RECURSE('ctdb')
- bld.RECURSE('source4/scripting')
--bld.RECURSE('pidl')
- bld.RECURSE('lib')
- bld.RECURSE('libds/common')
- bld.RECURSE('source3')