Add new ports required for deskutils/kdepim4.

Reminded by:	rakuco
Pointyhat to: 	me

devel/Makefile

@@ -991,6 +991,7 @@
     SUBDIR += libixp
     SUBDIR += libjson++
     SUBDIR += libk8055
+    SUBDIR += libkolab
     SUBDIR += liblas
     SUBDIR += liblcfg
     SUBDIR += libleaftag
@@ -4297,6 +4298,7 @@
     SUBDIR += xmltooling
     SUBDIR += xorg-macros
     SUBDIR += xparam
+    SUBDIR += xsd
     SUBDIR += xtl
     SUBDIR += xtla
     SUBDIR += xwpe

devel/libkolab/Makefile

+# $FreeBSD$
+
+PORTNAME=	libkolab
+PORTVERSION=	0.4.1
+CATEGORIES=	devel kde
+MASTER_SITES=	http://mirror.kolabsys.com/pub/releases/
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Advanced Kolab Object Handling Library
+
+# The code in kolabformatV2 is LGPL21, but we consider the library
+# itself to be LGPL3-licensed (and so are all the installed headers).
+LICENSE=	LGPL3
+
+LIB_DEPENDS=	kolabxml:${PORTSDIR}/textproc/libkolabxml
+
+# TODO: Conditionally enable the bindings based on OPTIONs.
+CMAKE_ARGS=	-DBUILD_TESTS:BOOL=OFF \
+		-DPHP_BINDINGS:BOOL=OFF \
+		-DPYTHON_BINDINGS:BOOL=OFF \
+		-DUSE_LIBCALENDARING:BOOL=OFF
+MAKE_JOBS_SAFE=	yes
+USE_CMAKE=	yes
+USE_KDE4=	automoc4 kdelibs pimlibs
+USE_LDCONFIG=	yes
+USE_QT4=	corelib gui xml \
+		moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>

devel/libkolab/distinfo

+SHA256 (libkolab-0.4.1.tar.gz) = 88a4e4905cb3ae955a3d4d8cd785f4b97cce9868db6d97ef89f5535da25d1b67
+SIZE (libkolab-0.4.1.tar.gz) = 162041

devel/libkolab/pkg-descr

+Libkolab provides advanced calendaring functionality including:
+
+ * Recurrence handling
+ * Timezone handling
+ * iTip/iMip parsing/generation
+ * Freebusy generation
+
+WWW:	http://www.kolab.org/about/libkolab

devel/libkolab/pkg-plist

+include/kolab/commonconversion.h
+include/kolab/errorhandler.h
+include/kolab/formathelpers.h
+include/kolab/freebusy.h
+include/kolab/kabcconversion.h
+include/kolab/kcalconversion.h
+include/kolab/kolab_export.h
+include/kolab/kolabdefinitions.h
+include/kolab/kolabobject.h
+lib/cmake/Libkolab/LibkolabConfig.cmake
+lib/cmake/Libkolab/LibkolabConfigVersion.cmake
+lib/cmake/Libkolab/LibkolabTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Libkolab/LibkolabTargets.cmake
+lib/libkolab.so
+lib/libkolab.so.0
+lib/libkolab.so.0.4.1
+@dirrm lib/cmake/Libkolab
+@dirrmtry lib/cmake
+@dirrm include/kolab

devel/xsd/Makefile

+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	xsd
+PORTVERSION=	3.3.0
+DISTVERSIONSUFFIX=	-2+dep
+CATEGORIES=	devel
+MASTER_SITES=	http://www.codesynthesis.com/download/${PORTNAME}/${PORTVERSION:R}/
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	A W3C XML Schema to C++ translator
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/xsd/LICENSE
+
+# FIXME: One could patch all the `#!/usr/bin/env bash' invocations in the build scripts and
+#        check if things still work to get rid of the shells/bash dependency.
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs \
+		xerces-c.3:${PORTSDIR}/textproc/xerces-c3
+
+ALL_TARGET=	# no default target should be passed to gmake.
+CXXFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+MAKEFILE=	makefile
+MAKE_ARGS=	install_prefix=${PREFIX} \
+		verbose=1
+MAKE_JOBS_SAFE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+
+MAN1=		xsdcxx.1
+
+.include <bsd.port.options.mk>
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/xsd/documentation/xsd.1 ${MANPREFIX}/man/man1/xsdcxx.1
+
+.if ${PORT_OPTIONS:MDOCS}
+	(cd ${WRKSRC}/xsd/documentation && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	${INSTALL_DATA} ${WRKSRC}/xsd/FLOSSE ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/xsd/NEWS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/xsd/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/xsd/dist/README-UNIX ${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${FIND} ${WRKSRC}/xsd/examples -type f -name makefile -delete
+	(cd ${WRKSRC}/xsd/examples && ${COPYTREE_SHARE} cxx ${EXAMPLESDIR})
+.endif
+
+.include <bsd.port.mk>

devel/xsd/distinfo

+SHA256 (xsd-3.3.0-2+dep.tar.bz2) = d9da367b4d101242990c6ae06d9dc3232e2603dde29d827f9186041c4275e0dc
+SIZE (xsd-3.3.0-2+dep.tar.bz2) = 1199833

devel/xsd/files/patch-build-0.3__m4__m4.make

+Use gm4 from devel/m4, as base m4 lacks some features needed by this build
+system.
+--- build-0.3/m4/m4.make~	2012-08-10 22:56:20.000000000 -0300
++++ build-0.3/m4/m4.make	2012-08-10 22:56:27.000000000 -0300
+@@ -3,7 +3,7 @@
+ # copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+ # license   : GNU GPL v2; see accompanying LICENSE file
+ 
+-$(out_base)/%: m4 := m4
++$(out_base)/%: m4 := gm4
+ $(out_base)/%: m4_options +=
+ 
+ ifeq ($(out_base),$(src_base))

devel/xsd/files/patch-libbackend-elements__backend-elements__indentation__cxx.hxx

+C++11 build fix.
+
+Operations such as insert() and erase() in sequential vectors such as
+std::vector now take a const_iterator instead of an iterator in C++11, and
+implicitly converting a Container::Vector::Iterator into a const_iterator
+fails.  We thus resort to just passing the wrapped std::$CONTAINER::iterator
+which can then be converted as expected.
+--- libbackend-elements/backend-elements/indentation/cxx.hxx~	2010-01-01 09:17:20.000000000 -0200
++++ libbackend-elements/backend-elements/indentation/cxx.hxx	2012-08-10 23:36:46.000000000 -0300
+@@ -580,7 +580,7 @@
+                   if (*i == '}')
+                   {
+                     ++i;
+-                    hold_.erase (i);
++                    hold_.erase (i.base ());
+                     break;
+                   }
+                 }

devel/xsd/files/patch-libcult__cli__file-arguments.hxx

+C++11 build fix.
+
+Operations such as insert() and erase() in sequential vectors such as
+std::vector now take a const_iterator instead of an iterator in C++11, and
+implicitly converting a Container::Vector::Iterator into a const_iterator
+fails.  We thus resort to just passing the wrapped std::$CONTAINER::iterator
+which can then be converted as expected.
+--- libcult/cult/cli/file-arguments.hxx~	2012-08-10 23:14:36.000000000 -0300
++++ libcult/cult/cli/file-arguments.hxx	2012-08-10 23:12:30.000000000 -0300
+@@ -47,7 +47,7 @@
+         if (i >= size ())
+           throw Bounds ();
+ 
+-        args_.erase (args_.begin () + i);
++        args_.erase (args_.begin ().base () + i);
+       }
+ 
+     private:

devel/xsd/files/patch-libcult__cli__mapper.hxx.m4

+Also build when GNU keyword extensions are turned off.
+
+This is the case when, for example, `-std=c++0x' is passed to a recent GCC or
+`-std=c++11' is passed to clang.
+--- libcult/cult/cli/mapper.hxx.m4~	2012-08-10 20:06:09.000000000 -0300
++++ libcult/cult/cli/mapper.hxx.m4	2012-08-10 20:06:20.000000000 -0300
+@@ -35,7 +35,7 @@
+   template <char const* x>
+   struct Selector
+   {
+-    typedef typeof (Mapper::f ((Tag<x>*) (0))) Type;
++    typedef __typeof__ (Mapper::f ((Tag<x>*) (0))) Type;
+   };
+ `#else'
+   template <char const* x>

devel/xsd/files/patch-libcult__containers__graph.txx

+C++11 build fix.
+
+Operations such as insert() and erase() in sequential vectors such as
+std::vector now take a const_iterator instead of an iterator in C++11, and
+implicitly converting a Container::Vector::Iterator into a const_iterator
+fails.  We thus resort to just passing the wrapped std::$CONTAINER::iterator
+which can then be converted as expected.
+--- libcult/cult/containers/graph.txx~	2010-04-15 03:52:59.000000000 -0300
++++ libcult/cult/containers/graph.txx	2012-08-10 23:21:50.000000000 -0300
+@@ -307,7 +307,7 @@
+       edge.clear_right_node (r);
+       edge.clear_left_node (l);
+ 
+-      edges_.erase (i);
++      edges_.erase (i.base ());
+     }
+   }
+ }

devel/xsd/files/patch-libcult__cult__mm__bits__evptr.hxx

+clang build fix: cult/mm/evptr.hxx has
+  using Base::p_;
+  using Base::cp_;
+  using Base::c_;
+in a public section, but these members are private here.
+--- libcult/cult/mm/bits/evptr.hxx~	2012-08-06 20:07:10.000000000 -0300
++++ libcult/cult/mm/bits/evptr.hxx	2012-08-06 20:11:24.000000000 -0300
+@@ -227,6 +227,7 @@
+         template <typename>
+         friend class Transfer;
+ 
++      protected:
+         mutable X* p_;
+         mutable X const* cp_;
+         mutable Counter* c_;
+@@ -337,6 +338,7 @@
+         template <typename>
+         friend class Transfer;
+ 
++      protected:
+         mutable X const* p_;
+         mutable X const* cp_;
+         mutable Counter* c_;

devel/xsd/files/patch-libcult__cult__mm__static-ptr.hxx

+clang build fix. It complained about using a function declaration as the object
+for the placement new call.
+--- libcult/cult/mm/static-ptr.hxx~	2012-08-06 19:57:49.000000000 -0300
++++ libcult/cult/mm/static-ptr.hxx	2012-08-06 19:58:19.000000000 -0300
+@@ -60,7 +60,8 @@
+       static X*
+       instance_ ()
+       {
+-        static X* i = new (KeyList ()) X;
++        KeyList k;
++        static X* i = new (k) X;
+         return i;
+       }
+ 

devel/xsd/files/patch-libfrontend-elements__frontend-elements__context.hxx

+C++11 build fix.
+
+Operations such as insert() and erase() in sequential vectors such as
+std::vector now take a const_iterator instead of an iterator in C++11, and
+implicitly converting a Container::Vector::Iterator into a const_iterator
+fails.  We thus resort to just passing the wrapped std::$CONTAINER::iterator
+which can then be converted as expected.
+--- libfrontend-elements/frontend-elements/context.hxx~	2012-08-10 23:30:34.000000000 -0300
++++ libfrontend-elements/frontend-elements/context.hxx	2012-08-10 23:30:49.000000000 -0300
+@@ -122,7 +122,7 @@
+       if (i == map_.end ())
+         throw NoEntry ();
+ 
+-      map_.erase (i);
++      map_.erase (i.base ());
+     }
+ 
+   private:

devel/xsd/files/patch-libxsd-frontend__xsd-frontend__semantic-graph__elements.cxx

+C++11 build fix.
+
+Operations such as insert() and erase() in sequential vectors such as
+std::vector now take a const_iterator instead of an iterator in C++11, and
+implicitly converting a Container::Vector::Iterator into a const_iterator
+fails.  We thus resort to just passing the wrapped std::$CONTAINER::iterator
+which can then be converted as expected.
+--- libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx~	2012-06-03 06:02:29.000000000 -0300
++++ libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx	2012-08-10 23:45:53.000000000 -0300
+@@ -43,7 +43,7 @@
+         std::find (argumented_.begin (), argumented_.end (), &a));
+ 
+       assert (i != argumented_.end ());
+-      argumented_.erase (i);
++      argumented_.erase (i.base ());
+     }
+ 
+     namespace RTTI = Cult::RTTI;

devel/xsd/files/patch-libxsd-frontend__xsd-frontend__semantic-graph__elements.hxx

+C++11 build fix.
+
+Operations such as insert() and erase() in sequential vectors such as
+std::vector now take a const_iterator instead of an iterator in C++11, and
+implicitly converting a Container::Vector::Iterator into a const_iterator
+fails.  We thus resort to just passing the wrapped std::$CONTAINER::iterator
+which can then be converted as expected.
+--- libxsd-frontend/xsd-frontend/semantic-graph/elements.hxx~	2010-04-27 16:31:24.000000000 -0300
++++ libxsd-frontend/xsd-frontend/semantic-graph/elements.hxx	2012-08-10 23:18:42.000000000 -0300
+@@ -553,7 +553,7 @@
+         assert (i != iterator_map_.end ());
+ 
+         names_.erase (i->second);
+-        iterator_map_.erase (i);
++        iterator_map_.erase (i.base ());
+ 
+         NamesMap::Iterator j (names_map_.find (e.name ()));
+ 
+@@ -1143,7 +1143,7 @@
+       Void
+       add_edge_right (Arguments& a, ArgumentedIterator const& pos)
+       {
+-        argumented_.insert (pos.base (), &a);
++        argumented_.insert (pos.base ().base (), &a);
+       }
+ 
+     private:

devel/xsd/files/patch-libxsd-frontend__xsd-frontend__semantic-graph__schema.hxx

+Fix clang error due to an ambiguity in the name lookup (Node is also defined by
+libcult).
+--- libxsd-frontend/xsd-frontend/semantic-graph/schema.hxx~	2012-08-06 23:55:53.000000000 -0300
++++ libxsd-frontend/xsd-frontend/semantic-graph/schema.hxx	2012-08-06 23:56:33.000000000 -0300
+@@ -241,7 +241,7 @@
+       friend class Bits::Graph<SemanticGraph::Node, Edge>;
+ 
+       using Scope::add_edge_left;
+-      using Node::add_edge_right;
++      using SemanticGraph::Node::add_edge_right;
+ 
+       Void
+       add_edge_left (Uses& e)

devel/xsd/files/patch-xsd__documentation__makefile

+Do not install the man page with make install, as it might not be called if
+NOPORTDOCS is set. We install the man page manually.
+--- xsd/documentation/makefile~	2012-08-10 19:07:34.000000000 -0300
++++ xsd/documentation/makefile	2012-08-10 19:07:48.000000000 -0300
+@@ -21,7 +21,6 @@
+ 	$(call install-data,$(src_base)/schema-authoring-guide.xhtml,$(install_doc_dir)/xsd/schema-authoring-guide.xhtml)
+ 	$(call install-data,$(src_base)/xsd.xhtml,$(install_doc_dir)/xsd/xsd.xhtml)
+ 	$(call install-data,$(src_base)/custom-literals.xsd,$(install_doc_dir)/xsd/custom-literals.xsd)
+-	$(call install-data,$(src_base)/xsd.1,$(install_man_dir)/man1/xsd.1)
+ 
+ # Dist.
+ #

devel/xsd/files/patch-xsd__documentation__xsd.1

+Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
+called `xsd'.
+--- xsd/documentation/xsd.1~	2012-08-10 14:28:12.000000000 -0300
++++ xsd/documentation/xsd.1	2012-08-10 14:30:50.000000000 -0300
+@@ -1,16 +1,16 @@
+ .\" Process this file with
+-.\" groff -man -Tascii xsd.1
++.\" groff -man -Tascii xsdcxx.1
+ .\"
+ .TH XSD 1 "April 2010" "XSD 3.3.0"
+ .SH NAME
+-xsd \- W3C XML Schema to C++ Compiler
++xsdcxx \- W3C XML Schema to C++ Compiler
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH SYNOPSIS
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ .I command
+ .B [
+ .I options
+@@ -20,19 +20,19 @@
+ .I file
+ .B ...]
+ .in
+-.B xsd help
++.B xsdcxx help
+ .B [
+ .I command
+ .B ]
+ .in
+-.B xsd version
++.B xsdcxx version
+ .\"
+ .\"
+ .\"
+ .\"--------------------------------------------------------------------
+ .SH DESCRIPTION
+ .\"--------------------------------------------------------------------
+-.B xsd
++.B xsdcxx
+ generates vocabulary-specific, statically-typed C++ mapping from W3C XML
+ Schema definitions. Particular mapping to produce is selected by a
+ .IR command .
+@@ -96,7 +96,7 @@
+ .PP
+ .RS
+ .RS 3
+-.B xsd help
++.B xsdcxx help
+ .I command
+ .RE
+ .PP
+@@ -203,7 +203,7 @@
+ with namespace
+ .B http://example.com/hello
+ and you run
+-.B xsd
++.B xsdcxx
+ on this file, then the string in question will be:
+ 
+ .B hello.xsd. http://example.com/hello
+@@ -1877,7 +1877,7 @@
+ .\"
+ .SH DIAGNOSTICS
+ If the input file is not a valid W3C XML Schema definition,
+-.B xsd
++.B xsdcxx
+ will issue diagnostic messages to
+ .B STDERR
+ and exit with non-zero exit code.