diff options
| author | tron <tron@pkgsrc.org> | 2004-12-30 16:42:22 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2004-12-30 16:42:22 +0000 |
| commit | ba4e641442fb87770cef0635c8e0ca20b447f5c2 (patch) | |
| tree | d8fa8f1b233bc89457f6b34325942d8155cb0e7e /textproc | |
| parent | 86f721b0dc32ec2a1e2b5c1b8191cc85a07ef2bd (diff) | |
| download | pkgsrc-ba4e641442fb87770cef0635c8e0ca20b447f5c2.tar.gz | |
Backout last change because the check in "buildlink3.mk" doesn't work
and therefore causes build failures in e.g. the "kdewebdev3" package.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/libxslt/Makefile | 15 | ||||
| -rw-r--r-- | textproc/libxslt/buildlink3.mk | 9 |
2 files changed, 4 insertions, 20 deletions
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index c56e4bb3789..57b066fdc65 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -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 @@ TEST_TARGET= check 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 --git a/textproc/libxslt/buildlink3.mk b/textproc/libxslt/buildlink3.mk index 5a66246862f..757965494a6 100644 --- a/textproc/libxslt/buildlink3.mk +++ b/textproc/libxslt/buildlink3.mk @@ -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_RECOMMENDED.libxslt+= libxslt>=1.1.10nb1 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/+$//} |