From 9c0caae1c20155b432bb0feb074a8fd9cc1c12bc Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Thu, 18 Sep 2003 06:49:37 +0000 Subject: Update to GNOME 2.4.0. For all the goodies on what's changed, known issues, future plans, etc., please see http://www.gnome.org/start/2.4/. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents work done by adamw, bland, and myself as well as many other contributers: Koop Mast Akifyev Sergey Franz Klammer Øyvind Kolbu Thomas E. Zander Jeremy Messenger Without these contirbuters, and our faithful users, GNOME 2.4.0 would not be possible. Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as general FAQs and documentation (GNOME 2.4 updates to be posted soon). The best way to upgrade so that you get all shared library dependencies is: portupgrade -rf -m BATCH=yes atk portupgrade -R -m BATCH=yes gnome2 Approved by: portmgr (kris, will, myself implicitly) Requested by: re as well as many other users --- textproc/libxslt/Makefile | 3 ++- textproc/libxslt/distinfo | 2 +- textproc/libxslt/files/patch-aa | 13 ++++++++----- textproc/libxslt/files/patch-configure | 18 ++++++++++++------ .../libxslt/files/patch-python::tests::Makefile.in | 15 ++++++--------- textproc/libxslt/pkg-plist | 4 +++- 6 files changed, 32 insertions(+), 23 deletions(-) (limited to 'textproc/libxslt') diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 48023c861f18..7f5ea6fa3711 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxslt -PORTVERSION= 1.0.32 +PORTVERSION= 1.0.33 CATEGORIES= textproc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 @@ -29,6 +29,7 @@ MAN1= xsltproc.1 .if !defined(WITHOUT_PYTHON) USE_PYTHON= yes PLIST_SUB+= PYTHON:="" +CONFIGURE_ARGS+= --with-python=${LOCALBASE} .else CONFIGURE_ARGS+= --without-python PLIST_SUB+= PYTHON:="@comment " diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo index 3212611e4dbb..19196123260b 100644 --- a/textproc/libxslt/distinfo +++ b/textproc/libxslt/distinfo @@ -1 +1 @@ -MD5 (gnome2/libxslt-1.0.32.tar.bz2) = 4cfebed101914dd7ef3d3f13d467a80a +MD5 (gnome2/libxslt-1.0.33.tar.bz2) = 699e52b3eb862224d5f5b84c03f08676 diff --git a/textproc/libxslt/files/patch-aa b/textproc/libxslt/files/patch-aa index 3b6e73087588..759d51f2d130 100644 --- a/textproc/libxslt/files/patch-aa +++ b/textproc/libxslt/files/patch-aa @@ -1,13 +1,15 @@ ---- Makefile.in.orig Thu Sep 26 14:59:25 2002 -+++ Makefile.in Tue Oct 8 01:09:21 2002 -@@ -123,19 +123,17 @@ +--- Makefile.in.orig Fri Sep 12 15:22:17 2003 ++++ Makefile.in Fri Sep 12 15:24:38 2003 +@@ -139,21 +139,20 @@ @WITH_DEBUGGER_TRUE@ libexslt \ @WITH_DEBUGGER_TRUE@ xsltproc \ @WITH_DEBUGGER_TRUE@ doc \ -@WITH_DEBUGGER_TRUE@ @PYTHON_SUBDIR@ \ -@WITH_DEBUGGER_TRUE@ tests -+@WITH_DEBUGGER_TRUE@ @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ \ - @WITH_DEBUGGER_FALSE@SUBDIRS = @WITH_DEBUGGER_FALSE@\ ++@WITH_DEBUGGER_TRUE@ @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ ++ + + @WITH_DEBUGGER_FALSE@SUBDIRS = \ @WITH_DEBUGGER_FALSE@ libxslt \ @WITH_DEBUGGER_FALSE@ libexslt \ @WITH_DEBUGGER_FALSE@ xsltproc \ @@ -16,6 +18,7 @@ -@WITH_DEBUGGER_FALSE@ tests +@WITH_DEBUGGER_FALSE@ @WITH_PYTHON_TRUE@ @PYTHON_SUBDIR@ + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests breakpoint -confexecdir = $(libdir) diff --git a/textproc/libxslt/files/patch-configure b/textproc/libxslt/files/patch-configure index 7b6b036578e7..e644cf75e11d 100644 --- a/textproc/libxslt/files/patch-configure +++ b/textproc/libxslt/files/patch-configure @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure 2002/04/26 09:54:14 1.1 -+++ configure 2002/04/26 09:54:23 -@@ -5341,6 +5341,7 @@ +--- configure.orig Fri Sep 12 08:23:19 2003 ++++ configure Fri Sep 12 15:29:42 2003 +@@ -8644,6 +8644,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,3 +8,12 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -10300,7 +10301,7 @@ + fi + if test "$with_python" != "" + then +- pythondir='$(PYTHON_SITE_PACKAGES)' ++ pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages' + else + pythondir='$(libdir)/python${PYTHON_VERSION}/site-packages' + fi diff --git a/textproc/libxslt/files/patch-python::tests::Makefile.in b/textproc/libxslt/files/patch-python::tests::Makefile.in index da548b13d60b..b2b22d6ee478 100644 --- a/textproc/libxslt/files/patch-python::tests::Makefile.in +++ b/textproc/libxslt/files/patch-python::tests::Makefile.in @@ -1,12 +1,9 @@ - -$FreeBSD$ - ---- python/tests/Makefile.in.orig Mon Apr 15 21:07:35 2002 -+++ python/tests/Makefile.in Thu Apr 18 14:25:35 2002 -@@ -117,7 +117,7 @@ - XSLT_LIBDIR = @XSLT_LIBDIR@ - XSLT_LIBS = @XSLT_LIBS@ - +--- python/tests/Makefile.in.orig Fri Sep 12 15:25:00 2003 ++++ python/tests/Makefile.in Fri Sep 12 15:25:38 2003 +@@ -133,7 +133,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + pythondir = @pythondir@ -EXAMPLE_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)/examples +EXAMPLE_DIR = $(datadir)/doc/libxslt-python/examples diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist index d3e29d94f299..379423f136aa 100644 --- a/textproc/libxslt/pkg-plist +++ b/textproc/libxslt/pkg-plist @@ -3,6 +3,7 @@ bin/xsltproc etc/xsltConf.sh include/libexslt/exslt.h include/libexslt/exsltconfig.h +include/libexslt/exsltexports.h include/libxslt/attributes.h include/libxslt/documents.h include/libxslt/extensions.h @@ -21,6 +22,7 @@ include/libxslt/variables.h include/libxslt/xslt.h include/libxslt/xsltInternals.h include/libxslt/xsltconfig.h +include/libxslt/xsltexports.h include/libxslt/xsltutils.h lib/libexslt.a lib/libexslt.so @@ -38,6 +40,7 @@ share/aclocal/libxslt.m4 %%PYTHON:%%share/doc/libxslt-python/TODO %%PYTHON:%%share/doc/libxslt-python/examples/basic.py %%PYTHON:%%share/doc/libxslt-python/examples/exslt.py +%%PYTHON:%%share/doc/libxslt-python/examples/extelem.py %%PYTHON:%%share/doc/libxslt-python/examples/extfunc.py %%PYTHON:%%share/doc/libxslt-python/examples/pyxsltproc.py %%PYTHON:%%share/doc/libxslt-python/examples/test.xml @@ -85,7 +88,6 @@ share/doc/libxslt/html/libxslt-transform.html share/doc/libxslt/html/libxslt-variables.html share/doc/libxslt/html/libxslt-xslt.html share/doc/libxslt/html/libxslt-xsltInternals.html -share/doc/libxslt/html/libxslt-xsltinternals.html share/doc/libxslt/html/libxslt-xsltutils.html share/doc/libxslt/html/news.html share/doc/libxslt/html/node.gif -- cgit v1.2.3