summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/java-tokyocabinet/Makefile3
-rw-r--r--databases/lua-tokyocabinet/Makefile3
-rw-r--r--databases/p5-tokyocabinet/Makefile3
-rw-r--r--databases/ruby-tokyocabinet/Makefile3
-rw-r--r--databases/tokyocabinet/Makefile12
-rw-r--r--databases/tokyocabinet/buildlink3.mk19
-rw-r--r--databases/tokyocabinet/options.mk40
-rw-r--r--databases/tokyotyrant/Makefile11
-rw-r--r--mk/defaults/options.description2
-rw-r--r--textproc/tokyodystopia/Makefile20
-rw-r--r--textproc/tokyodystopia/buildlink3.mk6
11 files changed, 95 insertions, 27 deletions
diff --git a/databases/java-tokyocabinet/Makefile b/databases/java-tokyocabinet/Makefile
index cd7009f906b..94fa298bce3 100644
--- a/databases/java-tokyocabinet/Makefile
+++ b/databases/java-tokyocabinet/Makefile
@@ -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 --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile
index 6dc12b04b5f..ff59a613b95 100644
--- a/databases/lua-tokyocabinet/Makefile
+++ b/databases/lua-tokyocabinet/Makefile
@@ -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 --git a/databases/p5-tokyocabinet/Makefile b/databases/p5-tokyocabinet/Makefile
index 9520c7d17bd..d1a548f35e4 100644
--- a/databases/p5-tokyocabinet/Makefile
+++ b/databases/p5-tokyocabinet/Makefile
@@ -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 --git a/databases/ruby-tokyocabinet/Makefile b/databases/ruby-tokyocabinet/Makefile
index 6fce21c4fd9..db40d81ff16 100644
--- a/databases/ruby-tokyocabinet/Makefile
+++ b/databases/ruby-tokyocabinet/Makefile
@@ -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 --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index fd0c058d2f1..97b05a7ba23 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -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 @@ USE_LANGUAGES= c99
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 --git a/databases/tokyocabinet/buildlink3.mk b/databases/tokyocabinet/buildlink3.mk
index 71ff54918d9..9d1b90e81f9 100644
--- a/databases/tokyocabinet/buildlink3.mk
+++ b/databases/tokyocabinet/buildlink3.mk
@@ -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 @@ BUILDLINK_TREE+= tokyocabinet
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 --git a/databases/tokyocabinet/options.mk b/databases/tokyocabinet/options.mk
new file mode 100644
index 00000000000..23621721ee1
--- /dev/null
+++ b/databases/tokyocabinet/options.mk
@@ -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 --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index b9bb08c8717..f78dfcb5dc7 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -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 @@ TEST_TARGET= check
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 --git a/mk/defaults/options.description b/mk/defaults/options.description
index fa2d9724192..2c6a3243e43 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -283,6 +283,8 @@ lprng-priv-ports Connections must be made from privileged ports.
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 --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index 2a536206fab..f608ef1908f 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -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 @@ USE_TOOLS+= gmake pkg-config
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 --git a/textproc/tokyodystopia/buildlink3.mk b/textproc/tokyodystopia/buildlink3.mk
index 7b9fde7fc53..3aad0937c48 100644
--- a/textproc/tokyodystopia/buildlink3.mk
+++ b/textproc/tokyodystopia/buildlink3.mk
@@ -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 @@ BUILDLINK_TREE+= tokyodystopia
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 07:19:42 +0000