From 66857d69e75d9a513cb500cffcebefbd11376aa8 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 28 Dec 2012 21:10:04 +0000 Subject: - Update to 1.1.28. [1] - Add LICENSE. [1] - Convert to OPTIONSng. [2] - Update the header. [2] PR: ports/174643 [1] Submitted by: Pedro Giffuni [1] kwm@ [2] --- textproc/libxslt/Makefile | 31 ++++++++++++------------ textproc/libxslt/distinfo | 4 +-- textproc/libxslt/files/patch-aa | 19 ++++++--------- textproc/libxslt/files/patch-libexslt_date.c | 11 --------- textproc/libxslt/files/patch-libxslt::extra.c | 19 --------------- textproc/libxslt/files/patch-python::Makefile.in | 14 +++++------ textproc/libxslt/pkg-plist | 2 +- 7 files changed, 32 insertions(+), 68 deletions(-) delete mode 100644 textproc/libxslt/files/patch-libexslt_date.c delete mode 100644 textproc/libxslt/files/patch-libxslt::extra.c (limited to 'textproc') diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 6b93f871d1ba..720f5b0f2385 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,16 +1,11 @@ -# New ports collection makefile for: libxslt -# Date created: 9th February 2001 -# Whom: Ade Lovett -# +# Created by: Ade Lovett # $FreeBSD$ -# PORTNAME= libxslt -PORTVERSION= 1.1.26 -PORTREVISION?= 3 +PORTVERSION= 1.1.28 +PORTREVISION?= 0 CATEGORIES?= textproc gnome -MASTER_SITES= ftp://fr.rpmfind.net/pub/libxml/ \ - ftp://gd.tuwien.ac.at/pub/libxml/ \ +MASTER_SITES= ftp://gd.tuwien.ac.at/pub/libxml/ \ ftp://xmlsoft.org/libxml2/ DIST_SUBDIR= gnome2 @@ -28,24 +23,28 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +LICENSE= MIT + .if defined(MASTERDIR) _SLAVE_PORT= yes .else MAN3= libexslt.3 libxslt.3 MAN1= xsltproc.1 -OPTIONS= MEM_DEBUG "Enable memory debugging" off \ - CRYPTO "Enable crypto support for exslt" on +OPTIONS_DEFINE= MEM_DEBUG CRYPTO +OPTIONS_DEFAULT=CRYPTO +MEM_DEBUG_DESC= Enable memory debugging +CRYPTO_DESC= Enable crypto support for exslt .endif -.include +.include -.if defined(WITH_MEM_DEBUG) +.if ${PORT_OPTIONS:MMEM_DEBUG} CONFIGURE_ARGS+= --with-mem-debug .endif -.if defined(WITH_CRYPTO) -LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt +.if ${PORT_OPTIONS:MCRYPTO} +LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt .else CONFIGURE_ARGS+=--without-crypto .endif @@ -57,6 +56,6 @@ post-patch: s|[$$](bindir)/xmllint|../xmllint/xmllint|g' \ ${WRKSRC}/doc/Makefile.in -.include +.include .endif diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 69b52c6c0e72..3afda2ff9af3 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome2/libxslt-1.1.26.tar.gz) = 55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1 -SIZE (gnome2/libxslt-1.1.26.tar.gz) = 3401513 +SHA256 (gnome2/libxslt-1.1.28.tar.gz) = 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c +SIZE (gnome2/libxslt-1.1.28.tar.gz) = 3435907 diff --git a/textproc/libxslt/files/patch-aa b/textproc/libxslt/files/patch-aa index 5ee76fe5178e..3abe36878a76 100644 --- a/textproc/libxslt/files/patch-aa +++ b/textproc/libxslt/files/patch-aa @@ -1,17 +1,12 @@ ---- Makefile.in.orig Tue Mar 30 12:22:50 2004 -+++ Makefile.in Tue Mar 30 12:24:16 2004 -@@ -230,11 +230,10 @@ +--- Makefile.in.orig 2012-10-22 16:13:46.000000000 +0000 ++++ Makefile.in 2012-10-22 16:14:29.000000000 +0000 +@@ -327,8 +327,7 @@ libexslt \ xsltproc \ doc \ -- @PYTHON_SUBDIR@ \ +- $(PYTHON_SUBDIR) \ - tests -+ @PYTHON_SUBDIR@ ++ $(PYTHON_SUBDIR) --DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests --confexecdir = $(libdir) -+DIST_SUBDIRS = libxslt libexslt xsltproc python doc -+confexecdir = $(sysconfdir) - confexec_DATA = xsltConf.sh - bin_SCRIPTS = xslt-config - EXTRA_DIST = xsltConf.sh.in xslt-config.in libxslt.spec libxslt.spec.in \ + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests + confexecdir = $(libdir) diff --git a/textproc/libxslt/files/patch-libexslt_date.c b/textproc/libxslt/files/patch-libexslt_date.c deleted file mode 100644 index 6012e7eaf958..000000000000 --- a/textproc/libxslt/files/patch-libexslt_date.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libexslt/date.c.orig 2007-09-07 10:59:04.000000000 -0500 -+++ libexslt/date.c 2007-09-07 10:59:21.000000000 -0500 -@@ -28,7 +28,7 @@ - #include "config.h" - #endif - --#if HAVE_LOCALTIME_R /* _POSIX_SOURCE required by gnu libc */ -+#if defined(HAVE_LOCALTIME_R) && defined(__GLIBC__) /* _POSIX_SOURCE required by gnu libc */ - #ifndef _AIX51 /* but on AIX we're not using gnu libc */ - #define _POSIX_SOURCE - #endif diff --git a/textproc/libxslt/files/patch-libxslt::extra.c b/textproc/libxslt/files/patch-libxslt::extra.c deleted file mode 100644 index b4039d8b49e8..000000000000 --- a/textproc/libxslt/files/patch-libxslt::extra.c +++ /dev/null @@ -1,19 +0,0 @@ - -$FreeBSD$ - ---- libxslt/extra.c.orig Wed Aug 15 05:55:12 2001 -+++ libxslt/extra.c Mon Aug 27 13:24:28 2001 -@@ -235,7 +235,12 @@ - * Calling localtime() has the side-effect of setting timezone. - * After we know the timezone, we can adjust for it - */ -- lmt = gmt - timezone; -+ /* -+ * May be on some stupid Linux localtime() have such side-effect, -+ * but FreeBSD DOESN'T HAVE such side-ffect, so we should use -+ * local_tm. -+ */ -+ lmt = gmt - local_tm->tm_gmtoff; - - /* - * FIXME: it's been too long since I did manual memory management. diff --git a/textproc/libxslt/files/patch-python::Makefile.in b/textproc/libxslt/files/patch-python::Makefile.in index f30b906feb64..dbd7d8e76bcd 100644 --- a/textproc/libxslt/files/patch-python::Makefile.in +++ b/textproc/libxslt/files/patch-python::Makefile.in @@ -1,17 +1,17 @@ ---- python/Makefile.in.orig 2008-05-23 23:03:51.000000000 -0500 -+++ python/Makefile.in 2008-05-23 23:09:55.000000000 -0500 -@@ -258,7 +258,7 @@ - -I$(top_srcdir) \ +--- python/Makefile.in.orig 2012-10-22 16:16:50.000000000 +0000 ++++ python/Makefile.in 2012-10-22 16:17:40.000000000 +0000 +@@ -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 = \ -@@ -273,8 +273,8 @@ +@@ -359,8 +359,8 @@ - libxsltmod_la_LDFLAGS = -module -avoid-version + 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 @@ -19,4 +19,4 @@ +@WITH_PYTHON_TRUE@ -lexslt @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la - @WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c + @WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist index 355b34632deb..23a4084c73c5 100644 --- a/textproc/libxslt/pkg-plist +++ b/textproc/libxslt/pkg-plist @@ -1,6 +1,5 @@ bin/xslt-config bin/xsltproc -etc/xsltConf.sh include/libexslt/exslt.h include/libexslt/exsltconfig.h include/libexslt/exsltexports.h @@ -33,6 +32,7 @@ lib/libxslt.a lib/libxslt.la lib/libxslt.so lib/libxslt.so.2 +lib/xsltConf.sh @exec mkdir -p %D/lib/libxslt-plugins libdata/pkgconfig/libexslt.pc libdata/pkgconfig/libxslt.pc -- cgit