[pkgsrc/trunk]: pkgsrc Introduce PKG_OPTIONS for database/tokyocabinet to sel...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Introduce PKG_OPTIONS for database/tokyocabinet to sel...
From: obache <obache%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 08:45:34 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/31034cad79e9
branches:  trunk
changeset: 568789:31034cad79e9
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Dec 19 12:56:45 2009 +0000

description:
Introduce PKG_OPTIONS for database/tokyocabinet to select compression support
(zlib/bzip2/lzo/lzma and enabled by default for former two).

LZO and LZMA supports are exclusive, optional and should be selected by
user's use-case (priority of data compression ratio, compression speed,
or so on).

Furthermore, Tokyocabinet uses archives/lzmalib for lzma support, but lzmalib
conflicts with archivers/xz.
It means if tokyocabinet is installed with lzma, failed to install xz,
and result in failure of "make extract" for packages using .lzma/.xz distfiles.
This issue also resolved by optionify lzma support and disabled by default.

This changes also make tokyocabinet ABI changes, so bump PKGREVISION
and recursive bump.

OKed to commit in freeze by wiz@.

diffstat:

 databases/java-tokyocabinet/Makefile |   3 +-
 databases/lua-tokyocabinet/Makefile  |   3 +-
 databases/p5-tokyocabinet/Makefile   |   3 +-
 databases/ruby-tokyocabinet/Makefile |   3 +-
 databases/tokyocabinet/Makefile      |  12 ++--------
 databases/tokyocabinet/buildlink3.mk |  19 +++++++++++++++-
 databases/tokyocabinet/options.mk    |  40 ++++++++++++++++++++++++++++++++++++
 databases/tokyotyrant/Makefile       |  11 ++++++++-
 mk/defaults/options.description      |   2 +
 textproc/tokyodystopia/Makefile      |  20 ++++++++++++-----
 textproc/tokyodystopia/buildlink3.mk |   6 +---
 11 files changed, 95 insertions(+), 27 deletions(-)

diffs (272 lines):

diff -r cd6d115b9416 -r 31034cad79e9 databases/java-tokyocabinet/Makefile
--- a/databases/java-tokyocabinet/Makefile      Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/java-tokyocabinet/Makefile      Sat Dec 19 12:56:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/11/30 21:59:37 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyocabinet-java-1.22
+PKGREVISION=   1
 PKGNAME=       java-${DISTNAME:S/-java//}
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
diff -r cd6d115b9416 -r 31034cad79e9 databases/lua-tokyocabinet/Makefile
--- a/databases/lua-tokyocabinet/Makefile       Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/lua-tokyocabinet/Makefile       Sat Dec 19 12:56:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/11/30 21:59:37 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyocabinet-lua-1.8
+PKGREVISION=   1
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/}
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
diff -r cd6d115b9416 -r 31034cad79e9 databases/p5-tokyocabinet/Makefile
--- a/databases/p5-tokyocabinet/Makefile        Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/p5-tokyocabinet/Makefile        Sat Dec 19 12:56:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/11/25 11:33:56 obache Exp $
+# $NetBSD: Makefile,v 1.20 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyocabinet-perl-1.32
+PKGREVISION=   1
 PKGNAME=       p5-${DISTNAME:S/-perl-/-/}
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
diff -r cd6d115b9416 -r 31034cad79e9 databases/ruby-tokyocabinet/Makefile
--- a/databases/ruby-tokyocabinet/Makefile      Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/ruby-tokyocabinet/Makefile      Sat Dec 19 12:56:45 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2009/11/25 11:33:56 obache Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyocabinet-ruby-1.29
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby-/-/}
+PKGREVISION=   1
 CATEGORIES=    databases ruby
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
diff -r cd6d115b9416 -r 31034cad79e9 databases/tokyocabinet/Makefile
--- a/databases/tokyocabinet/Makefile   Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/tokyocabinet/Makefile   Sat Dec 19 12:56:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2009/11/25 11:33:56 obache Exp $
+# $NetBSD: Makefile,v 1.36 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyocabinet-1.4.32
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -18,17 +19,10 @@
 
 PKGCONFIG_OVERRIDE+=   tokyocabinet.pc.in
 
-CONFIGURE_ARGS+=       --enable-zlib
-CONFIGURE_ARGS+=       --enable-bzip
-CONFIGURE_ARGS+=       --enable-exlzma
-CONFIGURE_ARGS+=       --enable-exlzo
+.include "options.mk"
 
 TEST_TARGET=   check
 
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/lzmalib/buildlink3.mk"
-.include "../../archivers/lzo/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 PTHREAD_AUTO_VARS=     yes
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
diff -r cd6d115b9416 -r 31034cad79e9 databases/tokyocabinet/buildlink3.mk
--- a/databases/tokyocabinet/buildlink3.mk      Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/tokyocabinet/buildlink3.mk      Sat Dec 19 12:56:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/03/21 05:32:04 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/12/19 12:56:45 obache Exp $
 
 BUILDLINK_TREE+=       tokyocabinet
 
@@ -6,13 +6,28 @@
 TOKYOCABINET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tokyocabinet+=   tokyocabinet>=1.3.7
-BUILDLINK_ABI_DEPENDS.tokyocabinet+=   tokyocabinet>=1.4.10
+BUILDLINK_ABI_DEPENDS.tokyocabinet+=   tokyocabinet>=1.4.32nb1
 BUILDLINK_PKGSRCDIR.tokyocabinet?=     ../../databases/tokyocabinet
 
+pkgbase := tokyocabinet
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
 .include "../../archivers/bzip2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzma)
 .include "../../archivers/lzmalib/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzo)
 .include "../../archivers/lzo/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
 .include "../../devel/zlib/buildlink3.mk"
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .endif # TOKYOCABINET_BUILDLINK3_MK
 
diff -r cd6d115b9416 -r 31034cad79e9 databases/tokyocabinet/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/tokyocabinet/options.mk Sat Dec 19 12:56:45 2009 +0000
@@ -0,0 +1,40 @@
+# $NetBSD: options.mk,v 1.1 2009/12/19 12:56:45 obache Exp $
+#
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.tokyocabinet
+PKG_SUPPORTED_OPTIONS= zlib bzip2
+PKG_OPTIONS_OPTIONAL_GROUPS=   codec
+PKG_OPTIONS_GROUP.codec=       lzma lzo
+PKG_SUGGESTED_OPTIONS= zlib bzip2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mzlib)
+.include "../../devel/zlib/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-zlib
+CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
+.else
+CONFIGURE_ARGS+=       --disable-zlib
+.endif
+
+.if !empty(PKG_OPTIONS:Mbzip2)
+.include "../../archivers/bzip2/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-bzip
+CONFIGURE_ARGS+=       --with-bzip=${BUILDLINK_PREFIX.bzip2}
+.else
+CONFIGURE_ARGS+=       --disable-bzip
+.endif
+
+.if !empty(PKG_OPTIONS:Mlzma)
+.include "../../archivers/lzmalib/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-exlzma
+.else
+CONFIGURE_ARGS+=       --disable-exlzma
+.endif
+
+.if !empty(PKG_OPTIONS:Mlzo)
+.include "../../archivers/lzo/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-exlzo
+.else
+CONFIGURE_ARGS+=       --disable-exlzo
+.endif
diff -r cd6d115b9416 -r 31034cad79e9 databases/tokyotyrant/Makefile
--- a/databases/tokyotyrant/Makefile    Sat Dec 19 11:56:11 2009 +0000
+++ b/databases/tokyotyrant/Makefile    Sat Dec 19 12:56:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2009/11/25 11:33:56 obache Exp $
+# $NetBSD: Makefile,v 1.26 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyotyrant-1.1.33
+PKGREVISION=   1
 CATEGORIES=    databases net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -23,7 +24,13 @@
 
 BUILDLINK_API_DEPENDS.tokyocabinet+=   tokyocabinet>=1.4.29
 .include "../../databases/tokyocabinet/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tc=${BUILDLINK_PREFIX.tokyocabinet}
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
+CONFIGURE_ARGS+=       --with-bzip=${BUILDLINK_PREFIX.bzip2}
+.endif
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
+CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
+.endif
 PTHREAD_AUTO_VARS=     yes
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
diff -r cd6d115b9416 -r 31034cad79e9 mk/defaults/options.description
--- a/mk/defaults/options.description   Sat Dec 19 11:56:11 2009 +0000
+++ b/mk/defaults/options.description   Sat Dec 19 12:56:45 2009 +0000
@@ -283,6 +283,8 @@
 lprng-suid             Install LPRng executables setuid root.
 lua                    Enable Lua support.
 lynx                   Use and enable support for the lynx browser.
+lzma                   Enable LZMA (de)compression support.
+lzo                    Enable LZO (de)compression support.
 lzw                    Enable LZW (De)compression support
 m17nlib                        Enable the m17n library support.
 m68060-optimized       Optimize for m68060 (only).
diff -r cd6d115b9416 -r 31034cad79e9 textproc/tokyodystopia/Makefile
--- a/textproc/tokyodystopia/Makefile   Sat Dec 19 11:56:11 2009 +0000
+++ b/textproc/tokyodystopia/Makefile   Sat Dec 19 12:56:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/11/25 11:33:56 obache Exp $
+# $NetBSD: Makefile,v 1.13 2009/12/19 12:56:45 obache Exp $
 #
 
 DISTNAME=      tokyodystopia-0.9.13
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -17,15 +18,22 @@
 
 PKGCONFIG_OVERRIDE+=   tokyodystopia.pc.in
 
-CONFIGURE_ARGS+=       --enable-zlib
-CONFIGURE_ARGS+=       --enable-bzip
-
 TEST_TARGET=   check
 
 BUILDLINK_API_DEPENDS.tokyocabinet+=   tokyocabinet>=1.4.29
 .include "../../databases/tokyocabinet/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../archivers/bzip2/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
+CONFIGURE_ARGS+=       --enable-bzip
+CONFIGURE_ARGS+=       --with-bzip=${BUILDLINK_PREFIX.bzip2}
+.else
+CONFIGURE_ARGS+=       --disable-bzip
+.endif
+.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
+CONFIGURE_ARGS+=       --enable-zlib
+CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
+.else
+CONFIGURE_ARGS+=       --disable-zlib
+.endif
 .include "../../mk/pthread.buildlink3.mk"
 PTHREAD_AUTO_VARS=     yes
 CONFIGURE_ARGS+=       --enable-pthread
diff -r cd6d115b9416 -r 31034cad79e9 textproc/tokyodystopia/buildlink3.mk
--- a/textproc/tokyodystopia/buildlink3.mk      Sat Dec 19 11:56:11 2009 +0000
+++ b/textproc/tokyodystopia/buildlink3.mk      Sat Dec 19 12:56:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/21 05:35:38 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/12/19 12:56:45 obache Exp $
 
 BUILDLINK_TREE+=       tokyodystopia
 
@@ -6,12 +6,10 @@
 TOKYODYSTOPIA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tokyodystopia+=  tokyodystopia>=0.9.5
-BUILDLINK_ABI_DEPENDS.tokyodystopia+=  tokyodystopia>=0.9.9nb1
+BUILDLINK_ABI_DEPENDS.tokyodystopia+=  tokyodystopia>=0.9.13nb1
 BUILDLINK_PKGSRCDIR.tokyodystopia?=    ../../textproc/tokyodystopia
 
 .include "../../databases/tokyocabinet/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../archivers/bzip2/buildlink3.mk"
 .endif # TOKYODYSTOPIA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -tokyodystopia
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of atf to 0.7.
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/xterm update to 255
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of atf to 0.7.
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/xterm update to 255
Indexes:
Home | Main Index | Thread Index | Old Index