diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 077be5e0799b7..53034d6f12d50 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,17 +1,12 @@ -# $NetBSD: Makefile,v 1.101 2015/07/08 10:34:46 richard Exp $ +# $NetBSD: Makefile,v 1.106 2017/09/10 20:56:24 wiz Exp $ -DISTNAME= libxslt-1.1.28 -PKGREVISION= 5 -CATEGORIES= textproc -MASTER_SITES= ftp://xmlsoft.org/libxslt/ \ - http://xmlsoft.org/sources/ +.include "Makefile.common" -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://xmlsoft.org/XSLT/ -COMMENT= XSLT parser library from the GNOME project -LICENSE= mit # with advertisement clause +BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml +BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl USE_LIBTOOL= yes +USE_MULTIARCH= bin lib USE_TOOLS+= gmake perl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2} @@ -22,21 +17,13 @@ PKGCONFIG_OVERRIDE= libxslt.pc.in PKGCONFIG_OVERRIDE+= libexslt.pc.in TEST_TARGET= check +BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms + .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MIRIX-5*) CPPFLAGS+= -Dsocklen_t=int .endif -post-extract: - cp ${WRKSRC}/libxslt/libxslt.syms ${WRKSRC}/libxslt/libxslt_solaris.syms - -.if ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= opt:-Wl,./libxslt.syms:-Wl,./libxslt_solaris.syms -.endif - -BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml -BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl - BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.27 .include "../../security/libgcrypt/buildlink3.mk" diff --git a/textproc/libxslt/Makefile.common b/textproc/libxslt/Makefile.common new file mode 100644 index 0000000000000..7e6916b7722b0 --- /dev/null +++ b/textproc/libxslt/Makefile.common @@ -0,0 +1,20 @@ +# $NetBSD: Makefile.common,v 1.4 2017/11/23 15:48:10 wiz Exp $ +# +# used by textproc/libxslt/Makefile +# used by textproc/py-libxslt/Makefile + +DISTNAME= libxslt-1.1.32 +CATEGORIES= textproc +MASTER_SITES= ftp://xmlsoft.org/libxslt/ +MASTER_SITES+= http://xmlsoft.org/sources/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://xmlsoft.org/XSLT/ +COMMENT= XSLT parser library from the GNOME project +LICENSE= mit # with advertisement clause + +PATCHDIR= ${.CURDIR}/../../textproc/libxslt/patches +DISTINFO_FILE= ${.CURDIR}/../../textproc/libxslt/distinfo + +post-extract: + cp ${WRKSRC}/libxslt/libxslt.syms ${WRKSRC}/libxslt/libxslt_solaris.syms diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 0222cb3ac9dee..2cbb800beca4b 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.56 2015/11/04 01:59:39 agc Exp $ +$NetBSD: distinfo,v 1.63 2017/11/23 15:48:10 wiz Exp $ -SHA1 (libxslt-1.1.28.tar.gz) = 4df177de629b2653db322bfb891afa3c0d1fa221 -RMD160 (libxslt-1.1.28.tar.gz) = a4e2f9c3ac235284cc58a37ed26707a870e0f976 -SHA512 (libxslt-1.1.28.tar.gz) = 20b65bdaceaac5bd11d509bf683ce8e344030bc95164639266ae705d41659bcba47b5be1b059d0d67681e6428b0710db675d1749c06aa531bc2212ed3d0511b1 -Size (libxslt-1.1.28.tar.gz) = 3435907 bytes +SHA1 (libxslt-1.1.32.tar.gz) = c47969f16747a72f9095b6a7a56d3afdd1e6e9ac +RMD160 (libxslt-1.1.32.tar.gz) = fc65b2730625eca4e9fda62fd9a91210b2bee368 +SHA512 (libxslt-1.1.32.tar.gz) = e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39 +Size (libxslt-1.1.32.tar.gz) = 3440715 bytes SHA1 (patch-ae) = 40ce3940a93b6a2dc804f62676909d3313e0ea52 -SHA1 (patch-ah) = f92809ab34e53962ec8b62e50ded7a27c89f10f8 diff --git a/textproc/libxslt/patches/patch-ah b/textproc/libxslt/patches/patch-ah deleted file mode 100644 index 305e36af49ba8..0000000000000 --- a/textproc/libxslt/patches/patch-ah +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2012/11/27 12:17:51 adam Exp $ - -Fix syms file for stricter solaris ld - ---- libxslt/libxslt_solaris.syms.orig 2012-11-27 12:04:43.000000000 +0000 -+++ libxslt/libxslt_solaris.syms -@@ -107,7 +107,7 @@ LIBXML2_1.0.11 { - xsltFreeCompMatchList; - xsltFreeTemplateHashes; - xsltGetTemplate; -- xsltMatchPattern; -+# xsltMatchPattern; - xsltTestCompMatchList; - - # preproc -@@ -407,7 +407,7 @@ LIBXML2_1.1.18 { - global: - - # xsltInternals -- xsltConstNamespaceNameXSLT; # variable -+# xsltConstNamespaceNameXSLT; # variable - xsltExtensionInstructionResultFinalize; - xsltExtensionInstructionResultRegister; - xsltInitCtxtKey; -@@ -416,24 +416,24 @@ LIBXML2_1.1.18 { - xsltInit; - - # xsltInternals -- xsltParseAnyXSLTElem; -- xsltParseSequenceConstructor; -- xsltPointerListAddSize; -- xsltPointerListClear; -- xsltPointerListCreate; -- xsltPointerListFree; -+# xsltParseAnyXSLTElem; -+# xsltParseSequenceConstructor; -+# xsltPointerListAddSize; -+# xsltPointerListClear; -+# xsltPointerListCreate; -+# xsltPointerListFree; - xsltRegisterLocalRVT; - xsltReleaseRVT; -- xsltRestoreDocumentNamespaces; -+# xsltRestoreDocumentNamespaces; - - # extensions -- xsltStyleStylesheetLevelGetExtData; -+# xsltStyleStylesheetLevelGetExtData; - - # xsltInternals - # xsltTransStorageAdd; removed in 1.1.28 - # xsltTransStorageRemove; removed in 1.1.28 - xsltUninit; -- xsltXSLTAttrMarker; # variable -+# xsltXSLTAttrMarker; # variable - } LIBXML2_1.1.9; - - LIBXML2_1.1.20 { -@@ -476,6 +476,10 @@ LIBXML2_1.1.26 { - - # transform - xsltProcessOneNode; -+ -+# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") -+ local: -+ *; - } LIBXML2_1.1.25; - - LIBXML2_1.1.27 {