Deprecate in favor of forthcoming php4-xslt. This mirrors the change in

PHP-4.1.0, which no longer offers the sablot code as an extension.

5 files changed, 1 insertions, 58 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 6c139531b58..6025cbcfb73 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2001/12/19 13:23:46 abs Exp $
+# $NetBSD: Makefile,v 1.130 2001/12/31 23:34:43 jlam Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -80,7 +80,6 @@ SUBDIR+=	p5-XML-XSLT
 SUBDIR+=	p5-libxml
 SUBDIR+=	p5-libxml-enno
 SUBDIR+=	par
-SUBDIR+=	php4-sablot
 SUBDIR+=	php4-wddx
 SUBDIR+=	php4-xml
 SUBDIR+=	py-dtml
diff --git a/textproc/php4-sablot/DESCR b/textproc/php4-sablot/DESCR
deleted file mode 100644
index 1286375b471..00000000000
--- a/textproc/php4-sablot/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides PHP4 XSLT extensions using the Sablotron XSL processor.
diff --git a/textproc/php4-sablot/Makefile b/textproc/php4-sablot/Makefile
deleted file mode 100644
index ee7d058587d..00000000000
--- a/textproc/php4-sablot/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:04 jlam Exp $
-
-.include "../../www/php4/Makefile.module"
-
-MODNAME=		sablot
-CATEGORIES+=		textproc
-PKGREVISION=		# empty
-
-MAINTAINER=		uithuis@dds.nl
-COMMENT=		PHP4 XSLT functions using Sablotron
-
-CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-expat-dir=shared,${BUILDLINK_DIR}
-CONFIGURE_ENV+=		PHP_ICONV=${BUILDLINK_DIR}
-LIBS+=			-lm
-
-.include "../../textproc/sablotron/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php4-sablot/distinfo b/textproc/php4-sablot/distinfo
deleted file mode 100644
index e0790953e7a..00000000000
--- a/textproc/php4-sablot/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/16 06:23:08 jlam Exp $
-
-SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03
-Size (php-4.0.6.tar.gz) = 3157346 bytes
-SHA1 (patch-aa) = 803f25788c9a41545e7c4d9e02fa00b76dea1017
diff --git a/textproc/php4-sablot/patches/patch-aa b/textproc/php4-sablot/patches/patch-aa
deleted file mode 100644
index 2e52d082701..00000000000
--- a/textproc/php4-sablot/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 06:23:08 jlam Exp $
-
---- config.m4.orig	Fri Jun  1 02:42:55 2001
-+++ config.m4
-@@ -36,7 +36,8 @@
-   for i in $PHP_EXPAT_DIR $SABLOT_DIR; do
-     if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then
-       AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
--      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib)
-+      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, SABLOT_SHARED_LIBADD)
-+      PHP_ADD_LIBRARY_WITH_PATH(m, /usr/lib, SABLOT_SHARED_LIBADD)
-       PHP_ADD_INCLUDE($i/include)
-       AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING,1,[ ]))
-       testval=yes
-@@ -51,14 +52,12 @@
-   found_iconv=no
-   AC_CHECK_LIB(c, iconv_open, found_iconv=yes)
-   if test "$found_iconv" = "no"; then
--    if test "$PHP_ICONV" = "no"; then
--      for i in /usr /usr/local; do
-+      for i in $PHP_ICONV /usr /usr/local; do
-         if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.s?; then
--          PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib)
-+          PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib, SABLOT_SHARED_LIBADD)
-           found_iconv=yes
-         fi
-       done
--    fi
-   fi
-   
-   if test "$found_iconv" = "no"; then