From owner-svn-ports-head@freebsd.org Sat Dec 19 22:53:19 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CDAD3A4BE9C; Sat, 19 Dec 2015 22:53:19 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8B13110F; Sat, 19 Dec 2015 22:53:19 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJMrIBB084164; Sat, 19 Dec 2015 22:53:18 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJMrIb8084160; Sat, 19 Dec 2015 22:53:18 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201512192253.tBJMrIb8084160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Sat, 19 Dec 2015 22:53:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404032 - in head/net/samba4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 22:53:20 -0000 Author: timur Date: Sat Dec 19 22:53:18 2015 New Revision: 404032 URL: https://svnweb.freebsd.org/changeset/ports/404032 Log: 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. Added: head/net/samba4/files/patch-pidl__lib__Parse__Pidl__ODL.pm (contents, props changed) head/net/samba4/files/patch-pidl__pidl (contents, props changed) Deleted: head/net/samba4/files/patch-buildtools__wafsamba__samba_pidl.py head/net/samba4/files/patch-wscript head/net/samba4/files/patch-wscript_build Modified: head/net/samba4/Makefile head/net/samba4/pkg-plist Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Sat Dec 19 22:51:10 2015 (r404031) +++ head/net/samba4/Makefile Sat Dec 19 22:53:18 2015 (r404032) @@ -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 serve 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}/ # 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 Added: head/net/samba4/files/patch-pidl__lib__Parse__Pidl__ODL.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba4/files/patch-pidl__lib__Parse__Pidl__ODL.pm Sat Dec 19 22:53:18 2015 (r404032) @@ -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"); + Added: head/net/samba4/files/patch-pidl__pidl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba4/files/patch-pidl__pidl Sat Dec 19 22:53:18 2015 (r404032) @@ -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; Modified: head/net/samba4/pkg-plist ============================================================================== --- head/net/samba4/pkg-plist Sat Dec 19 22:51:10 2015 (r404031) +++ head/net/samba4/pkg-plist Sat Dec 19 22:53:18 2015 (r404032) @@ -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