Index: textproc/libxslt/Makefile =================================================================== --- textproc/libxslt/Makefile (revision 502263) +++ textproc/libxslt/Makefile (working copy) @@ -1,51 +1,51 @@ # Created by: Ade Lovett # $FreeBSD$ PORTNAME= libxslt -PORTVERSION= 1.1.32 +PORTVERSION= 1.1.33 PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= http://xmlsoft.org/sources/ \ https://mirror.umd.edu/xbmc/build-deps/sources/ DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org COMMENT?= The XSLT C library for GNOME .if !defined(REFERENCE_PORT) -USES+= cpe gmake localbase libtool pathfix +LICENSE= MIT + +USES+= cpe gmake gnome localbase libtool pathfix CPE_VENDOR= xmlsoft GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USE_GNOME?= libxml2 CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python - -LICENSE= MIT .if defined(MASTERDIR) _SLAVE_PORT= yes .else OPTIONS_DEFINE= MEM_DEBUG CRYPTO OPTIONS_DEFAULT=CRYPTO MEM_DEBUG_DESC= Enable memory debugging CRYPTO_DESC= Enable crypto support for exslt .endif MEM_DEBUG_CONFIGURE_ON= --with-mem-debug CRYPTO_CONFIGURE_WITH= crypto CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt post-patch: @${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \ ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e 's|[$$](bindir)/xsltproc|../xsltproc/xsltproc|g ; \ s|[$$](bindir)/xmllint|../xmllint/xmllint|g' \ ${WRKSRC}/doc/Makefile.in .include .endif Index: textproc/libxslt/distinfo =================================================================== --- textproc/libxslt/distinfo (revision 502263) +++ textproc/libxslt/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522146585 -SHA256 (gnome2/libxslt-1.1.32.tar.gz) = 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460 -SIZE (gnome2/libxslt-1.1.32.tar.gz) = 3440715 +TIMESTAMP = 1558518038 +SHA256 (gnome2/libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8 +SIZE (gnome2/libxslt-1.1.33.tar.gz) = 3444093 Index: textproc/libxslt/files/patch-Makefile.in =================================================================== --- textproc/libxslt/files/patch-Makefile.in (revision 502263) +++ textproc/libxslt/files/patch-Makefile.in (working copy) @@ -1,12 +1,12 @@ ---- Makefile.in.orig 2012-10-22 16:13:46.000000000 +0000 -+++ Makefile.in 2012-10-22 16:14:29.000000000 +0000 +--- Makefile.in.orig 2012-10-22 16:13:46 UTC ++++ Makefile.in @@ -327,8 +327,7 @@ libexslt \ xsltproc \ doc \ - $(PYTHON_SUBDIR) \ - tests + $(PYTHON_SUBDIR) DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests confexecdir = $(libdir) Index: textproc/libxslt/files/patch-configure =================================================================== --- textproc/libxslt/files/patch-configure (revision 502263) +++ textproc/libxslt/files/patch-configure (working copy) @@ -1,25 +1,25 @@ ---- configure.orig 2009-09-18 15:31:26.000000000 -0400 -+++ configure 2009-09-18 15:35:31.000000000 -0400 +--- configure.orig 2009-09-18 11:31:26 UTC ++++ configure @@ -4770,7 +4770,7 @@ fi if test "${with_html_subdir+set}" = set; then withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval" else - HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html" + HTML_DIR="$HTML_DIR/\$(PACKAGE)" fi @@ -15572,11 +15572,12 @@ except: print 0"` fi if test "$PYTHON_VERSION" != "" then + with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ -d $with_python/lib/python$PYTHON_VERSION/site-packages then PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages else if test -r $prefix/include/python$PYTHON_VERSION/Python.h then Index: textproc/libxslt/files/patch-libxslt__xsltconfig.h.in =================================================================== --- textproc/libxslt/files/patch-libxslt__xsltconfig.h.in (revision 502263) +++ textproc/libxslt/files/patch-libxslt__xsltconfig.h.in (working copy) @@ -1,8 +1,8 @@ ---- libxslt/xsltconfig.h.in.orig Mon Mar 26 20:55:08 2001 -+++ libxslt/xsltconfig.h.in Thu Apr 19 22:20:46 2001 +--- libxslt/xsltconfig.h.in.orig 2001-03-26 20:55:08 UTC ++++ libxslt/xsltconfig.h.in @@ -23,3 +23,5 @@ #ifdef __GNUC__ +#ifndef __FreeBSD__ #include +#endif #ifndef ATTRIBUTE_UNUSED Index: textproc/libxslt/files/patch-python__Makefile.in =================================================================== --- textproc/libxslt/files/patch-python__Makefile.in (revision 502263) +++ textproc/libxslt/files/patch-python__Makefile.in (working copy) @@ -1,22 +1,22 @@ ---- python/Makefile.in.orig 2012-10-22 16:16:50.000000000 +0000 -+++ python/Makefile.in 2012-10-22 16:17:40.000000000 +0000 +--- python/Makefile.in.orig 2012-10-22 16:16:50 UTC ++++ python/Makefile.in @@ -344,7 +344,7 @@ -I../libexslt AM_CFLAGS = $(LIBXML_CFLAGS) -DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) +DOCS_DIR = $(datadir)/doc/py-libxslt # libxsltclass.txt is generated DOCS = TODO EXTRA_DIST = \ @@ -359,8 +359,8 @@ libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version @WITH_PYTHON_TRUE@mylibs = \ -@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \ -@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la +@WITH_PYTHON_TRUE@ -lxslt \ +@WITH_PYTHON_TRUE@ -lexslt @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la @WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c Index: textproc/libxslt/files/patch-python__tests__Makefile.in =================================================================== --- textproc/libxslt/files/patch-python__tests__Makefile.in (revision 502263) +++ textproc/libxslt/files/patch-python__tests__Makefile.in (working copy) @@ -1,11 +1,11 @@ ---- python/tests/Makefile.in.orig 2008-05-23 23:11:10.000000000 -0500 -+++ python/tests/Makefile.in 2008-05-23 23:11:33.000000000 -0500 +--- python/tests/Makefile.in.orig 2008-05-23 18:11:10 UTC ++++ python/tests/Makefile.in @@ -204,7 +204,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples +EXAMPLE_DIR = $(datadir)/examples/py-libxslt TESTSPY = \ basic.py \ exslt.py \ Index: textproc/libxslt/pkg-plist =================================================================== --- textproc/libxslt/pkg-plist (revision 502263) +++ textproc/libxslt/pkg-plist (working copy) @@ -1,42 +1,42 @@ bin/xslt-config bin/xsltproc include/libexslt/exslt.h include/libexslt/exsltconfig.h include/libexslt/exsltexports.h include/libxslt/attributes.h include/libxslt/documents.h include/libxslt/extensions.h include/libxslt/extra.h include/libxslt/functions.h include/libxslt/imports.h include/libxslt/keys.h include/libxslt/namespaces.h include/libxslt/numbersInternals.h include/libxslt/pattern.h include/libxslt/preproc.h include/libxslt/security.h include/libxslt/templates.h include/libxslt/transform.h include/libxslt/variables.h include/libxslt/xslt.h include/libxslt/xsltInternals.h include/libxslt/xsltconfig.h include/libxslt/xsltexports.h include/libxslt/xsltlocale.h include/libxslt/xsltutils.h lib/libexslt.a lib/libexslt.so lib/libexslt.so.0 lib/libexslt.so.0.8.20 lib/libxslt.a lib/libxslt.so lib/libxslt.so.1 -lib/libxslt.so.1.1.32 +lib/libxslt.so.1.1.33 lib/xsltConf.sh libdata/pkgconfig/libexslt.pc libdata/pkgconfig/libxslt.pc -share/aclocal/libxslt.m4 man/man1/xsltproc.1.gz man/man3/libexslt.3.gz man/man3/libxslt.3.gz +share/aclocal/libxslt.m4 @dir lib/libxslt-plugins