[pkgsrc/trunk]: pkgsrc/textproc/libxslt Backout last change because the check...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3de30741b73
branches:  trunk
changeset: 486605:c3de30741b73
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Dec 30 16:42:22 2004 +0000

description:
Backout last change because the check in "buildlink3.mk" doesn't work
and therefore causes build failures in e.g. the "kdewebdev3" package.

diffstat:

 textproc/libxslt/Makefile      |  15 ++-------------
 textproc/libxslt/buildlink3.mk |   9 ++-------
 2 files changed, 4 insertions(+), 20 deletions(-)

diffs (53 lines):

diff -r ebf2526528ba -r c3de30741b73 textproc/libxslt/Makefile
--- a/textproc/libxslt/Makefile Thu Dec 30 16:20:31 2004 +0000
+++ b/textproc/libxslt/Makefile Thu Dec 30 16:42:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/12/28 04:37:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.53 2004/12/30 16:42:22 tron Exp $
 
 DISTNAME=      libxslt-1.1.12
 PKGNAME=       ${DISTNAME}
@@ -28,18 +28,7 @@
 
 BUILDLINK_DEPENDS.libxml2+=    libxml2>=2.6.8
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libxslt
-PKG_SUPPORTED_OPTIONS= crypto
-PKG_DEFAULT_OPTIONS+=  crypto
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mcrypto)
-.  include "../../security/libgcrypt/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-crypto
-.else
-CONFIGURE_ARGS+=       --without-crypto
-.endif
-
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ebf2526528ba -r c3de30741b73 textproc/libxslt/buildlink3.mk
--- a/textproc/libxslt/buildlink3.mk    Thu Dec 30 16:20:31 2004 +0000
+++ b/textproc/libxslt/buildlink3.mk    Thu Dec 30 16:42:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/12/28 04:44:56 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/12/30 16:42:22 tron Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 LIBXSLT_BUILDLINK3_MK:=        ${LIBXSLT_BUILDLINK3_MK}+
@@ -16,13 +16,8 @@
 BUILDLINK_PKGSRCDIR.libxslt?=  ../../textproc/libxslt
 .endif # LIBXSLT_BUILDLINK3_MK
 
-PKG_OPTIONS.libxslt?=       ${PKG_DEFAULT_OPTIONS}
-
-.if !empty(PKG_OPTIONS.libxslt:Mcrypto)
-.  include "../../security/libgcrypt/buildlink3.mk"
-.endif
-
 .include "../../lang/perl5/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}