Mark Samba 4 as deprecated, as it's not supported by upstream anymore. Also address prolems with current p5-Parse-Pidl by using bundled version.

7 files changed, 72 insertions, 48 deletions

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 52dc28b66ec..849d750fe40 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		2
+PORTREVISION?=		3
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@@ -13,7 +13,10 @@ COMMENT?=		Free SMB/CIFS and AD/DC server and client for Unix
 
 LICENSE=		GPLv3
 
-CONFLICTS?=		*samba3[2-6]-3.* samba4[1-3]-4.[1-3].*
+CONFLICTS?=		*samba3[2-6]-3.* samba4[1-3]-4.[1-3].* p5-Parse-Pidl-[0-9]*
+
+DEPRECATED=		not supported by the upstream
+EXPIRATION_DATE=	2016-03-01
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
@@ -82,8 +85,6 @@ LIB_DEPENDS+=		libgnutls.so:${PORTSDIR}/security/gnutls
 # NFS4 ACL glue
 LIB_DEPENDS+=		libsunacl.so:${PORTSDIR}/sysutils/libsunacl
 # External Samba dependencies
-# IDL compiler
-BUILD_DEPENDS+=		p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl
 #
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
 RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
@@ -448,8 +449,8 @@ PORTDOCS=		README.FreeBSD
 
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
-post-extract:
-			@${RM} -rf ${WRKSRC}/pidl
+#post-extract:
+#			@${RM} -rf ${WRKSRC}/pidl
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
@@ -493,11 +494,11 @@ pre-build:
 			source4/utils/man/ntlm_auth4.1 \
 			source4/utils/man/oLschema2ldif.1
 			-@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}`
-			@${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
+			${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man}
 .	endfor
 			-@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8}
-			-@${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
+			-${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages
 .	endfor
 .endif
 
@@ -506,7 +507,7 @@ post-install:
 .if ${PORT_OPTIONS:MDOCS}
 			@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .	for doc in ${PORTDOCS}
-			@${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
+			${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR}
 .	endfor
 .endif
 # Run post-install script
diff --git a/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py b/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py
deleted file mode 100644
index 019fd57ad5b..00000000000
--- a/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./buildtools/wafsamba/samba_pidl.py.orig	2013-01-27 23:15:21.739874063 +0000
-+++ ./buildtools/wafsamba/samba_pidl.py	2013-01-27 23:15:50.549893124 +0000
-@@ -88,7 +88,7 @@
-     # 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/samba4/files/patch-pidl__lib__Parse__Pidl__ODL.pm b/net/samba4/files/patch-pidl__lib__Parse__Pidl__ODL.pm
new file mode 100644
index 00000000000..0d7e18fdb41
--- /dev/null
+++ b/net/samba4/files/patch-pidl__lib__Parse__Pidl__ODL.pm
@@ -0,0 +1,11 @@
+--- pidl/lib/Parse/Pidl/ODL.pm.orig	2012-10-02 08:24:41.000000000 +0000
++++ pidl/lib/Parse/Pidl/ODL.pm	2013-06-13 09:21:02.000000000 +0000
+@@ -70,7 +70,7 @@
+ 					next;
+ 				}
+ 				my $podl = Parse::Pidl::IDL::parse_file($idl_path, $opt_incdirs);
+-				if (defined(@$podl)) {
++				if (defined($podl)) {
+ 					require Parse::Pidl::Typelist;
+ 					my $basename = basename($idl_path, ".idl");
+ 
diff --git a/net/samba4/files/patch-pidl__pidl b/net/samba4/files/patch-pidl__pidl
new file mode 100644
index 00000000000..d8359def010
--- /dev/null
+++ b/net/samba4/files/patch-pidl__pidl
@@ -0,0 +1,11 @@
+--- pidl/pidl.orig	2015-12-17 22:15:54.056094416 +0000
++++ pidl/pidl	2015-12-17 22:16:11.261480226 +0000
+@@ -604,7 +604,7 @@
+ 		require Parse::Pidl::IDL;
+ 
+ 		$pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs);
+-		defined @$pidl || die "Failed to parse $idl_file";
++		defined $pidl || die "Failed to parse $idl_file";
+ 	}
+ 
+ 	require Parse::Pidl::Typelist;
diff --git a/net/samba4/files/patch-wscript b/net/samba4/files/patch-wscript
deleted file mode 100644
index 7feb2c4c4f1..00000000000
--- a/net/samba4/files/patch-wscript
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./wscript.orig	2013-01-27 22:58:07.759866676 +0000
-+++ ./wscript	2013-01-27 22:58:27.961081298 +0000
-@@ -43,7 +43,6 @@
-     opt.RECURSE('lib/nss_wrapper')
-     opt.RECURSE('lib/socket_wrapper')
-     opt.RECURSE('lib/uid_wrapper')
--    opt.RECURSE('pidl')
-     opt.RECURSE('source3')
-     opt.RECURSE('lib/util')
- 
-@@ -140,7 +139,6 @@
-     conf.RECURSE('lib/subunit/c')
-     conf.RECURSE('libcli/smbreadline')
-     conf.RECURSE('lib/crypto')
--    conf.RECURSE('pidl')
-     conf.RECURSE('selftest')
-     conf.RECURSE('source3')
- 
diff --git a/net/samba4/files/patch-wscript_build b/net/samba4/files/patch-wscript_build
deleted file mode 100644
index f5f90fd05ff..00000000000
--- a/net/samba4/files/patch-wscript_build
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./wscript_build.orig	2013-01-27 22:58:14.032166250 +0000
-+++ ./wscript_build	2013-01-27 23:03:34.089892588 +0000
-@@ -130,7 +130,6 @@
- if bld.AD_DC_BUILD_IS_ENABLED():
-     bld.RECURSE('source4/setup')
- bld.RECURSE('source4/scripting')
--bld.RECURSE('pidl')
- bld.RECURSE('lib')
- bld.RECURSE('libds/common')
- bld.RECURSE('source3')
diff --git a/net/samba4/pkg-plist b/net/samba4/pkg-plist
index 17554407532..bea33fc8b24 100644
--- a/net/samba4/pkg-plist
+++ b/net/samba4/pkg-plist
@@ -715,6 +715,46 @@ libdata/pkgconfig/wbclient.pc
 @dirrm %%PYTHON_SITELIBDIR%%/samba/external
 @dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
 @dirrm %%PYTHON_SITELIBDIR%%/samba
+bin/pidl
+man/man1/pidl.1.gz
+man/man3/Parse::Pidl::Dump.3.gz
+man/man3/Parse::Pidl::NDR.3.gz
+man/man3/Parse::Pidl::Util.3.gz
+man/man3/Parse::Pidl::Wireshark::Conformance.3.gz
+man/man3/Parse::Pidl::Wireshark::NDR.3.gz
+%%DATADIR%%/perl5/Parse/Pidl.pm
+%%DATADIR%%/perl5/Parse/Pidl/CUtil.pm
+%%DATADIR%%/perl5/Parse/Pidl/Compat.pm
+%%DATADIR%%/perl5/Parse/Pidl/Dump.pm
+%%DATADIR%%/perl5/Parse/Pidl/Expr.pm
+%%DATADIR%%/perl5/Parse/Pidl/IDL.pm
+%%DATADIR%%/perl5/Parse/Pidl/NDR.pm
+%%DATADIR%%/perl5/Parse/Pidl/ODL.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba3/ClientNDR.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba3/ServerNDR.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Header.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Proxy.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Stub.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/Header.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Client.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Parser.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Server.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/Python.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/TDR.pm
+%%DATADIR%%/perl5/Parse/Pidl/Samba4/Template.pm
+%%DATADIR%%/perl5/Parse/Pidl/Typelist.pm
+%%DATADIR%%/perl5/Parse/Pidl/Util.pm
+%%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm
+%%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm
+@dirrm %%DATADIR%%/perl5/Parse/Pidl/Wireshark
+@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR
+@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM
+@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba4
+@dirrm %%DATADIR%%/perl5/Parse/Pidl/Samba3
+@dirrm %%DATADIR%%/perl5/Parse/Pidl
+@dirrm %%DATADIR%%/perl5/Parse
+@dirrm %%DATADIR%%/perl5
 %%DATADIR%%/codepages/de.msg
 %%DATADIR%%/codepages/en.msg
 %%DATADIR%%/codepages/fi.msg