Attachment #204539 for bug #238049




# Created by: Ade Lovett <ade@FreeBSD.org>
# $FreeBSD$

PORTNAME=	libxslt
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)

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 <bsd.port.mk>

.endif

Lines 1-3 Link Here

(-)textproc/libxslt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1522146585	1	TIMESTAMP = 1558518038
2	SHA256 (gnome2/libxslt-1.1.32.tar.gz) = 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460	2	SHA256 (gnome2/libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
3	SIZE (gnome2/libxslt-1.1.32.tar.gz) = 3440715	3	SIZE (gnome2/libxslt-1.1.33.tar.gz) = 3444093




--- 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)




--- 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

Lines 1-8 Link Here

(-)textproc/libxslt/files/patch-libxslt__xsltconfig.h.in (-2 / +2 lines)
1	--- libxslt/xsltconfig.h.in.orig Mon Mar 26 20:55:08 2001	1	--- libxslt/xsltconfig.h.in.orig 2001-03-26 20:55:08 UTC
2	+++ libxslt/xsltconfig.h.in Thu Apr 19 22:20:46 2001	2	+++ libxslt/xsltconfig.h.in
3	@@ -23,3 +23,5 @@	3	@@ -23,3 +23,5 @@
4	#ifdef __GNUC__	4	#ifdef __GNUC__
5	+#ifndef __FreeBSD__	5	+#ifndef __FreeBSD__
6	#include <ansidecl.h>	6	#include <ansidecl.h>
7	+#endif	7	+#endif
8	#ifndef ATTRIBUTE_UNUSED	8	#ifndef ATTRIBUTE_UNUSED




--- 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

Lines 1-11 Link Here

(-)textproc/libxslt/files/patch-python__tests__Makefile.in (-2 / +2 lines)
1	--- python/tests/Makefile.in.orig 2008-05-23 23:11:10.000000000 -0500	1	--- python/tests/Makefile.in.orig 2008-05-23 18:11:10 UTC
2	+++ python/tests/Makefile.in 2008-05-23 23:11:33.000000000 -0500	2	+++ python/tests/Makefile.in
3	@@ -204,7 +204,7 @@	3	@@ -204,7 +204,7 @@
4	target_alias = @target_alias@	4	target_alias = @target_alias@
5	top_builddir = @top_builddir@	5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@	6	top_srcdir = @top_srcdir@
7	-EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples	7	-EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples
8	+EXAMPLE_DIR = $(datadir)/examples/py-libxslt	8	+EXAMPLE_DIR = $(datadir)/examples/py-libxslt
9	TESTSPY = \	9	TESTSPY = \
10	basic.py \	10	basic.py \
11	exslt.py \	11	exslt.py \




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.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

Return to bug 238049

Lines 1-51 Link Here

(-)textproc/libxslt/Makefile (-4 / +4 lines)
1	# Created by: Ade Lovett <ade@FreeBSD.org>	1	# Created by: Ade Lovett <ade@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libxslt	4	PORTNAME= libxslt
5	PORTVERSION= 1.1.32	5	PORTVERSION= 1.1.33
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES?= textproc gnome	7	CATEGORIES?= textproc gnome
8	MASTER_SITES= http://xmlsoft.org/sources/ \	8	MASTER_SITES= http://xmlsoft.org/sources/ \
9	https://mirror.umd.edu/xbmc/build-deps/sources/	9	https://mirror.umd.edu/xbmc/build-deps/sources/
10	DIST_SUBDIR= gnome2	10	DIST_SUBDIR= gnome2
11		11
12	MAINTAINER?= gnome@FreeBSD.org	12	MAINTAINER?= gnome@FreeBSD.org
13	COMMENT?= The XSLT C library for GNOME	13	COMMENT?= The XSLT C library for GNOME
14		14
15	.if !defined(REFERENCE_PORT)	15	.if !defined(REFERENCE_PORT)
16		16
17	USES+= cpe gmake localbase libtool pathfix	17	LICENSE= MIT
		18
		19	USES+= cpe gmake gnome localbase libtool pathfix
18	CPE_VENDOR= xmlsoft	20	CPE_VENDOR= xmlsoft
19	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
20	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
21	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
22	USE_GNOME?= libxml2	24	USE_GNOME?= libxml2
23	CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \	25	CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
24	--without-python	26	--without-python
25
26	LICENSE= MIT
27		27
28	.if defined(MASTERDIR)	28	.if defined(MASTERDIR)
29	_SLAVE_PORT= yes	29	_SLAVE_PORT= yes
30	.else	30	.else
31		31
32	OPTIONS_DEFINE= MEM_DEBUG CRYPTO	32	OPTIONS_DEFINE= MEM_DEBUG CRYPTO
33	OPTIONS_DEFAULT=CRYPTO	33	OPTIONS_DEFAULT=CRYPTO
34	MEM_DEBUG_DESC= Enable memory debugging	34	MEM_DEBUG_DESC= Enable memory debugging
35	CRYPTO_DESC= Enable crypto support for exslt	35	CRYPTO_DESC= Enable crypto support for exslt
36	.endif	36	.endif
37		37
38	MEM_DEBUG_CONFIGURE_ON= --with-mem-debug	38	MEM_DEBUG_CONFIGURE_ON= --with-mem-debug
39	CRYPTO_CONFIGURE_WITH= crypto	39	CRYPTO_CONFIGURE_WITH= crypto
40	CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt	40	CRYPTO_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
41		41
42	post-patch:	42	post-patch:
43	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \	43	@${REINPLACE_CMD} -e '/^install-data-am:/ s\|install-data-local\|\|' \
44	${WRKSRC}/doc/Makefile.in	44	${WRKSRC}/doc/Makefile.in
45	@${REINPLACE_CMD} -e 's\|[$$](bindir)/xsltproc\|../xsltproc/xsltproc\|g ; \	45	@${REINPLACE_CMD} -e 's\|[$$](bindir)/xsltproc\|../xsltproc/xsltproc\|g ; \
46	s\|[$$](bindir)/xmllint\|../xmllint/xmllint\|g' \	46	s\|[$$](bindir)/xmllint\|../xmllint/xmllint\|g' \
47	${WRKSRC}/doc/Makefile.in	47	${WRKSRC}/doc/Makefile.in
48		48
49	.include <bsd.port.mk>	49	.include <bsd.port.mk>
50		50
51	.endif	51	.endif

Lines 1-12 Link Here

(-)textproc/libxslt/files/patch-Makefile.in (-2 / +2 lines)
1	--- Makefile.in.orig 2012-10-22 16:13:46.000000000 +0000	1	--- Makefile.in.orig 2012-10-22 16:13:46 UTC
2	+++ Makefile.in 2012-10-22 16:14:29.000000000 +0000	2	+++ Makefile.in
3	@@ -327,8 +327,7 @@	3	@@ -327,8 +327,7 @@
4	libexslt \	4	libexslt \
5	xsltproc \	5	xsltproc \
6	doc \	6	doc \
7	- $(PYTHON_SUBDIR) \	7	- $(PYTHON_SUBDIR) \
8	- tests	8	- tests
9	+ $(PYTHON_SUBDIR)	9	+ $(PYTHON_SUBDIR)
10		10
11	DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests	11	DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
12	confexecdir = $(libdir)	12	confexecdir = $(libdir)

Lines 1-25 Link Here

(-)textproc/libxslt/files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2009-09-18 15:31:26.000000000 -0400	1	--- configure.orig 2009-09-18 11:31:26 UTC
2	+++ configure 2009-09-18 15:35:31.000000000 -0400	2	+++ configure
3	@@ -4770,7 +4770,7 @@ fi	3	@@ -4770,7 +4770,7 @@ fi
4	if test "${with_html_subdir+set}" = set; then	4	if test "${with_html_subdir+set}" = set; then
5	withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"	5	withval=$with_html_subdir; test "x$withval" != "x" && HTML_DIR="$HTML_DIR/$withval"
6	else	6	else
7	- HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"	7	- HTML_DIR="$HTML_DIR/\$(PACKAGE)-\$(VERSION)/html"
8	+ HTML_DIR="$HTML_DIR/\$(PACKAGE)"	8	+ HTML_DIR="$HTML_DIR/\$(PACKAGE)"
9	fi	9	fi
10		10
11		11
12	@@ -15572,11 +15572,12 @@ except: print 0"`	12	@@ -15572,11 +15572,12 @@ except: print 0"`
13	fi	13	fi
14	if test "$PYTHON_VERSION" != ""	14	if test "$PYTHON_VERSION" != ""
15	then	15	then
16	+ with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`	16	+ with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
17	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \	17	if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
18	-d $with_python/lib/python$PYTHON_VERSION/site-packages	18	-d $with_python/lib/python$PYTHON_VERSION/site-packages
19	then	19	then
20	PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION	20	PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
21	- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'	21	- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
22	+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages	22	+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
23	else	23	else
24	if test -r $prefix/include/python$PYTHON_VERSION/Python.h	24	if test -r $prefix/include/python$PYTHON_VERSION/Python.h
25	then	25	then

Lines 1-22 Link Here

(-)textproc/libxslt/files/patch-python__Makefile.in (-2 / +2 lines)
1	--- python/Makefile.in.orig 2012-10-22 16:16:50.000000000 +0000	1	--- python/Makefile.in.orig 2012-10-22 16:16:50 UTC
2	+++ python/Makefile.in 2012-10-22 16:17:40.000000000 +0000	2	+++ python/Makefile.in
3	@@ -344,7 +344,7 @@	3	@@ -344,7 +344,7 @@
4	-I../libexslt	4	-I../libexslt
5		5
6	AM_CFLAGS = $(LIBXML_CFLAGS)	6	AM_CFLAGS = $(LIBXML_CFLAGS)
7	-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)	7	-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
8	+DOCS_DIR = $(datadir)/doc/py-libxslt	8	+DOCS_DIR = $(datadir)/doc/py-libxslt
9	# libxsltclass.txt is generated	9	# libxsltclass.txt is generated
10	DOCS = TODO	10	DOCS = TODO
11	EXTRA_DIST = \	11	EXTRA_DIST = \
12	@@ -359,8 +359,8 @@	12	@@ -359,8 +359,8 @@
13		13
14	libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version	14	libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
15	@WITH_PYTHON_TRUE@mylibs = \	15	@WITH_PYTHON_TRUE@mylibs = \
16	-@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \	16	-@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \
17	-@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la	17	-@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la
18	+@WITH_PYTHON_TRUE@ -lxslt \	18	+@WITH_PYTHON_TRUE@ -lxslt \
19	+@WITH_PYTHON_TRUE@ -lexslt	19	+@WITH_PYTHON_TRUE@ -lexslt
20		20
21	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la	21	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la
22	@WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c	22	@WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c

Lines 1-42 Link Here

(-)textproc/libxslt/pkg-plist (-2 / +2 lines)
1	bin/xslt-config	1	bin/xslt-config
2	bin/xsltproc	2	bin/xsltproc
3	include/libexslt/exslt.h	3	include/libexslt/exslt.h
4	include/libexslt/exsltconfig.h	4	include/libexslt/exsltconfig.h
5	include/libexslt/exsltexports.h	5	include/libexslt/exsltexports.h
6	include/libxslt/attributes.h	6	include/libxslt/attributes.h
7	include/libxslt/documents.h	7	include/libxslt/documents.h
8	include/libxslt/extensions.h	8	include/libxslt/extensions.h
9	include/libxslt/extra.h	9	include/libxslt/extra.h
10	include/libxslt/functions.h	10	include/libxslt/functions.h
11	include/libxslt/imports.h	11	include/libxslt/imports.h
12	include/libxslt/keys.h	12	include/libxslt/keys.h
13	include/libxslt/namespaces.h	13	include/libxslt/namespaces.h
14	include/libxslt/numbersInternals.h	14	include/libxslt/numbersInternals.h
15	include/libxslt/pattern.h	15	include/libxslt/pattern.h
16	include/libxslt/preproc.h	16	include/libxslt/preproc.h
17	include/libxslt/security.h	17	include/libxslt/security.h
18	include/libxslt/templates.h	18	include/libxslt/templates.h
19	include/libxslt/transform.h	19	include/libxslt/transform.h
20	include/libxslt/variables.h	20	include/libxslt/variables.h
21	include/libxslt/xslt.h	21	include/libxslt/xslt.h
22	include/libxslt/xsltInternals.h	22	include/libxslt/xsltInternals.h
23	include/libxslt/xsltconfig.h	23	include/libxslt/xsltconfig.h
24	include/libxslt/xsltexports.h	24	include/libxslt/xsltexports.h
25	include/libxslt/xsltlocale.h	25	include/libxslt/xsltlocale.h
26	include/libxslt/xsltutils.h	26	include/libxslt/xsltutils.h
27	lib/libexslt.a	27	lib/libexslt.a
28	lib/libexslt.so	28	lib/libexslt.so
29	lib/libexslt.so.0	29	lib/libexslt.so.0
30	lib/libexslt.so.0.8.20	30	lib/libexslt.so.0.8.20
31	lib/libxslt.a	31	lib/libxslt.a
32	lib/libxslt.so	32	lib/libxslt.so
33	lib/libxslt.so.1	33	lib/libxslt.so.1
34	lib/libxslt.so.1.1.32	34	lib/libxslt.so.1.1.33
35	lib/xsltConf.sh	35	lib/xsltConf.sh
36	libdata/pkgconfig/libexslt.pc	36	libdata/pkgconfig/libexslt.pc
37	libdata/pkgconfig/libxslt.pc	37	libdata/pkgconfig/libxslt.pc
38	share/aclocal/libxslt.m4
39	man/man1/xsltproc.1.gz	38	man/man1/xsltproc.1.gz
40	man/man3/libexslt.3.gz	39	man/man3/libexslt.3.gz
41	man/man3/libxslt.3.gz	40	man/man3/libxslt.3.gz
		41	share/aclocal/libxslt.m4
42	@dir lib/libxslt-plugins	42	@dir lib/libxslt-plugins