From nobody@FreeBSD.org  Sat Dec 22 19:38:12 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 02B9372D
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Dec 2012 19:38:12 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id DC3EA8FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Dec 2012 19:38:11 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMJcBk6044052
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Dec 2012 19:38:11 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id qBMJcBDO044051;
	Sat, 22 Dec 2012 19:38:11 GMT
	(envelope-from nobody)
Message-Id: <201212221938.qBMJcBDO044051@red.freebsd.org>
Date: Sat, 22 Dec 2012 19:38:11 GMT
From: Pedro Giffuni <giffunip@tutopia.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update textproc/libxslt to version 1.1.28
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         174643
>Category:       ports
>Synopsis:       Update textproc/libxslt to version 1.1.28
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 22 19:40:00 UTC 2012
>Closed-Date:    Fri Dec 28 21:14:21 UTC 2012
>Last-Modified:  Fri Dec 28 21:20:01 UTC 2012
>Originator:     Pedro Giffuni
>Release:        9.1-PRERELEASE
>Organization:
>Environment:
FreeBSD pcbsd-8555 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #7: Sun Oct  7 00:05:03 COT 2012     Pedro@pcbsd-8555:/usr/src/sys/amd64/compile/GENERIC  amd64
>Description:
Update libxslt from 1.1.26 to 1.1.28
ChangeLog here:
     http://xmlsoft.org/XSLT/news.html
- Includes our local patches.
- Add LICENSE information.
- Pet portlint.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: libxslt/distinfo
===================================================================
--- libxslt/distinfo	(revision 309402)
+++ libxslt/distinfo	(working copy)
@@ -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
Index: libxslt/files/patch-ab
===================================================================
--- libxslt/files/patch-ab	(revision 309402)
+++ libxslt/files/patch-ab	(working copy)
@@ -1,8 +0,0 @@
---- libxslt/xsltconfig.h.in.orig	Mon Mar 26 20:55:08 2001
-+++ libxslt/xsltconfig.h.in	Thu Apr 19 22:20:46 2001
-@@ -23,3 +23,5 @@
- #ifdef __GNUC__
-+#ifndef __FreeBSD__
- #include <ansidecl.h>
-+#endif
- #ifndef ATTRIBUTE_UNUSED
Index: libxslt/files/patch-libexslt_date.c
===================================================================
--- libxslt/files/patch-libexslt_date.c	(revision 309402)
+++ libxslt/files/patch-libexslt_date.c	(working copy)
@@ -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
Index: libxslt/files/patch-python::Makefile.in
===================================================================
--- libxslt/files/patch-python::Makefile.in	(revision 309402)
+++ libxslt/files/patch-python::Makefile.in	(working copy)
@@ -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) \
- 	-I../libexslt
- 
+--- python/Makefile.in.orig	2012-12-22 13:55:57.000000000 -0500
++++ python/Makefile.in	2012-12-22 13:58:03.000000000 -0500
+@@ -362,7 +362,7 @@
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ SUBDIRS = . tests
+ 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 @@
+@@ -377,8 +377,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_CPPFLAGS = \
Index: libxslt/files/patch-libxslt::extra.c
===================================================================
--- libxslt/files/patch-libxslt::extra.c	(revision 309402)
+++ libxslt/files/patch-libxslt::extra.c	(working copy)
@@ -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.
Index: libxslt/files/patch-python::tests::Makefile.in
===================================================================
--- libxslt/files/patch-python::tests::Makefile.in	(revision 309402)
+++ libxslt/files/patch-python::tests::Makefile.in	(working copy)
@@ -1,6 +1,6 @@
 --- 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
-@@ -204,7 +204,7 @@
+@@ -250,7 +250,7 @@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
Index: libxslt/files/patch-configure
===================================================================
--- libxslt/files/patch-configure	(revision 309402)
+++ libxslt/files/patch-configure	(working copy)
@@ -1,7 +1,7 @@
 --- configure.orig	2009-09-18 15:31:26.000000000 -0400
 +++ configure	2009-09-18 15:35:31.000000000 -0400
-@@ -4770,7 +4770,7 @@ fi
- if test "${with_html_subdir+set}" = set; then
+@@ -4421,7 +4421,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"
@@ -9,7 +9,7 @@
  fi
  
  
-@@ -15572,11 +15572,12 @@ except: print 0"`
+@@ -13455,11 +13455,12 @@ except: print 0"`
      fi
      if test "$PYTHON_VERSION" != ""
      then
Index: libxslt/files/patch-aa
===================================================================
--- libxslt/files/patch-aa	(revision 309402)
+++ libxslt/files/patch-aa	(working copy)
@@ -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-12-22 13:41:11.000000000 -0500
++++ Makefile.in	2012-12-22 13:41:29.000000000 -0500
+@@ -349,8 +349,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)
Index: libxslt/Makefile
===================================================================
--- libxslt/Makefile	(revision 309402)
+++ libxslt/Makefile	(working copy)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxslt
-PORTVERSION=	1.1.26
-PORTREVISION?=	3
+PORTVERSION=	1.1.28
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://fr.rpmfind.net/pub/libxml/ \
 		ftp://gd.tuwien.ac.at/pub/libxml/ \
@@ -17,6 +16,8 @@
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	The XSLT C library for GNOME
 
+LICENSE=	MIT
+
 .if !defined(REFERENCE_PORT)
 
 USE_GMAKE=	yes
@@ -35,7 +36,7 @@
 MAN1=		xsltproc.1
 
 OPTIONS=	MEM_DEBUG "Enable memory debugging" off \
-		CRYPTO "Enable crypto support for exslt" on
+		CRYPTO "Enable gcrypt support for exslt" on
 .endif
 
 .include <bsd.port.pre.mk>
@@ -45,7 +46,7 @@
 .endif
 
 .if defined(WITH_CRYPTO)
-LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 .else
 CONFIGURE_ARGS+=--without-crypto
 .endif
@@ -57,6 +58,6 @@
 		s|[$$](bindir)/xmllint|../xmllint/xmllint|g' \
 		${WRKSRC}/doc/Makefile.in
 
+.endif
+
 .include <bsd.port.post.mk>
-
-.endif


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Dec 22 19:40:09 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174643 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Fri Dec 28 21:14:10 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174643 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174643: commit references a PR
Date: Fri, 28 Dec 2012 21:10:19 +0000 (UTC)

 Author: mezz
 Date: Fri Dec 28 21:10:04 2012
 New Revision: 309586
 URL: http://svnweb.freebsd.org/changeset/ports/309586
 
 Log:
   - 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 <giffunip@tutopia.com> [1]
   		kwm@ [2]
 
 Deleted:
   head/textproc/libxslt/files/patch-libexslt_date.c
   head/textproc/libxslt/files/patch-libxslt::extra.c
 Modified:
   head/textproc/libxslt/Makefile   (contents, props changed)
   head/textproc/libxslt/distinfo   (contents, props changed)
   head/textproc/libxslt/files/patch-aa   (contents, props changed)
   head/textproc/libxslt/files/patch-python::Makefile.in   (contents, props changed)
   head/textproc/libxslt/pkg-plist   (contents, props changed)
 
 Modified: head/textproc/libxslt/Makefile
 ==============================================================================
 --- head/textproc/libxslt/Makefile	Fri Dec 28 20:21:38 2012	(r309585)
 +++ head/textproc/libxslt/Makefile	Fri Dec 28 21:10:04 2012	(r309586)
 @@ -1,16 +1,11 @@
 -# New ports collection makefile for:	libxslt
 -# Date created:				9th February 2001
 -# Whom:					Ade Lovett <ade@FreeBSD.org>
 -#
 +# Created by: Ade Lovett <ade@FreeBSD.org>
  # $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
  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 <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.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 <bsd.port.post.mk>
 +.include <bsd.port.mk>
  
  .endif
 
 Modified: head/textproc/libxslt/distinfo
 ==============================================================================
 --- head/textproc/libxslt/distinfo	Fri Dec 28 20:21:38 2012	(r309585)
 +++ head/textproc/libxslt/distinfo	Fri Dec 28 21:10:04 2012	(r309586)
 @@ -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
 
 Modified: head/textproc/libxslt/files/patch-aa
 ==============================================================================
 --- head/textproc/libxslt/files/patch-aa	Fri Dec 28 20:21:38 2012	(r309585)
 +++ head/textproc/libxslt/files/patch-aa	Fri Dec 28 21:10:04 2012	(r309586)
 @@ -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)
 
 Modified: head/textproc/libxslt/files/patch-python::Makefile.in
 ==============================================================================
 --- head/textproc/libxslt/files/patch-python::Makefile.in	Fri Dec 28 20:21:38 2012	(r309585)
 +++ head/textproc/libxslt/files/patch-python::Makefile.in	Fri Dec 28 21:10:04 2012	(r309586)
 @@ -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
 
 Modified: head/textproc/libxslt/pkg-plist
 ==============================================================================
 --- head/textproc/libxslt/pkg-plist	Fri Dec 28 20:21:38 2012	(r309585)
 +++ head/textproc/libxslt/pkg-plist	Fri Dec 28 21:10:04 2012	(r309586)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
