Fri Mar 19 22:09:55 2021 UTC ()
xsd: use external libcutl

fixes regexp processing on NetBSD.


(markd)
diff -r1.40 -r1.41 pkgsrc/devel/xsd/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/xsd/distinfo
diff -r0 -r1.1 pkgsrc/devel/xsd/patches/patch-libxsd-frontend_xsd-frontend_semantic-graph_elements.cxx
cvs diff -r1.40 -r1.41 pkgsrc/devel/xsd/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xsd/Makefile 2021/03/08 14:33:44 1.40
+++ pkgsrc/devel/xsd/Makefile 2021/03/19 22:09:55 1.41
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.40 2021/03/08 14:33:44 nia Exp $ 1# $NetBSD: Makefile,v 1.41 2021/03/19 22:09:55 markd Exp $
2 2
3DISTNAME= xsd-4.0.0+dep 3DISTNAME= xsd-4.0.0+dep
4PKGNAME= ${DISTNAME:S/+dep//1} 4PKGNAME= ${DISTNAME:S/+dep//1}
 5PKGREVISION= 1
5CATEGORIES= devel textproc 6CATEGORIES= devel textproc
6MASTER_SITES= https://www.codesynthesis.com/download/xsd/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= https://www.codesynthesis.com/download/xsd/${PKGVERSION_NOREV:R}/
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.codesynthesis.com/products/xsd/ 11HOMEPAGE= https://www.codesynthesis.com/products/xsd/
11COMMENT= W3C XML Schema to C++ data binding compiler 12COMMENT= W3C XML Schema to C++ data binding compiler
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14USE_TOOLS+= bash gmake gm4 15USE_TOOLS+= bash gmake gm4
15USE_LANGUAGES= c c++11 16USE_LANGUAGES= c c++11
16 17
17GCC_REQD+= 4.7 # C++11 18GCC_REQD+= 4.7 # C++11
18 19
19MAKE_FILE= makefile 20MAKE_FILE= makefile
20 21
21BUILD_TARGET= # no default target should be passed to gmake. 22BUILD_TARGET= # no default target should be passed to gmake.
22 23
23MAKE_FLAGS+= verbose=1 24MAKE_FLAGS+= verbose=1
 25MAKE_FLAGS+= EXTERNAL_LIBCUTL=y
24MAKE_FLAGS+= install_prefix=${DESTDIR}${PREFIX} 26MAKE_FLAGS+= install_prefix=${DESTDIR}${PREFIX}
25MAKE_FLAGS+= install_man_dir=${DESTDIR}${PREFIX}/${PKGMANDIR} 27MAKE_FLAGS+= install_man_dir=${DESTDIR}${PREFIX}/${PKGMANDIR}
26 28
27post-patch: 29post-patch:
28 # Avoid conflict with C++20 <version> 30 # Avoid conflict with C++20 <version>
29 ${RM} -f ${WRKSRC}/version 31 ${RM} -f ${WRKSRC}/version
30 ${RM} -f ${WRKSRC}/build/import/lib*/version 32 ${RM} -f ${WRKSRC}/build/import/lib*/version
31 33
32.include "../../devel/boost-libs/buildlink3.mk" 34.include "../../devel/libcutl/buildlink3.mk"
33.include "../../textproc/xerces-c/buildlink3.mk" 35.include "../../textproc/xerces-c/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/devel/xsd/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xsd/distinfo 2021/03/08 14:33:44 1.7
+++ pkgsrc/devel/xsd/distinfo 2021/03/19 22:09:55 1.8
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.7 2021/03/08 14:33:44 nia Exp $ 1$NetBSD: distinfo,v 1.8 2021/03/19 22:09:55 markd Exp $
2 2
3SHA1 (xsd-4.0.0+dep.tar.bz2) = ad3de699eb140e747a0a214462d95fc81a21b494 3SHA1 (xsd-4.0.0+dep.tar.bz2) = ad3de699eb140e747a0a214462d95fc81a21b494
4RMD160 (xsd-4.0.0+dep.tar.bz2) = d1af702e6feb7216e04c2f30173311e2d4629313 4RMD160 (xsd-4.0.0+dep.tar.bz2) = d1af702e6feb7216e04c2f30173311e2d4629313
5SHA512 (xsd-4.0.0+dep.tar.bz2) = 1b7f5f7a50007e0c739e23c46cf34657845038c3c58f2da4f9978a9486a30674d829e4dfe428af32669207af79375eb8d413ac471c4ffd1c2bc842411f454ae9 5SHA512 (xsd-4.0.0+dep.tar.bz2) = 1b7f5f7a50007e0c739e23c46cf34657845038c3c58f2da4f9978a9486a30674d829e4dfe428af32669207af79375eb8d413ac471c4ffd1c2bc842411f454ae9
6Size (xsd-4.0.0+dep.tar.bz2) = 1642625 bytes 6Size (xsd-4.0.0+dep.tar.bz2) = 1642625 bytes
 7SHA1 (patch-libxsd-frontend_xsd-frontend_semantic-graph_elements.cxx) = a4af6f1f10167577df591edc252a48c228979a43
7SHA1 (patch-xsd_doc_makefile) = 2440ca86fbcbe040e45a1859d76d0cad1b8c3865 8SHA1 (patch-xsd_doc_makefile) = 2440ca86fbcbe040e45a1859d76d0cad1b8c3865
8SHA1 (patch-xsd_doc_xsd.1) = 1660f480c8410133ae490b64c9a0fb52b5b3466f 9SHA1 (patch-xsd_doc_xsd.1) = 1660f480c8410133ae490b64c9a0fb52b5b3466f
9SHA1 (patch-xsd_doc_xsd.xhtml) = 52e4bcdcccf16cc32fffb3e81688a73558bf0a1b 10SHA1 (patch-xsd_doc_xsd.xhtml) = 52e4bcdcccf16cc32fffb3e81688a73558bf0a1b
10SHA1 (patch-xsd_libxsd_makefile) = 16dee6ed96f7840cf2ae42e1c46b319b195f66a9 11SHA1 (patch-xsd_libxsd_makefile) = 16dee6ed96f7840cf2ae42e1c46b319b195f66a9
11SHA1 (patch-xsd_xsd_makefile) = 165b76f812069b7924c6f4422de7575031b095f6 12SHA1 (patch-xsd_xsd_makefile) = 165b76f812069b7924c6f4422de7575031b095f6
File Added: pkgsrc/devel/xsd/patches/patch-libxsd-frontend_xsd-frontend_semantic-graph_elements.cxx
$NetBSD: patch-libxsd-frontend_xsd-frontend_semantic-graph_elements.cxx,v 1.1 2021/03/19 22:09:55 markd Exp $

fix  error: no match for 'operator<<'

--- libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx.orig	2014-07-16 08:14:03.000000000 +0000
+++ libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx
@@ -2,6 +2,7 @@
 // copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
+#include <iostream>
 #include <algorithm>
 
 #include <cutl/compiler/type-info.hxx>