Sat Dec 19 12:56:45 2009 UTC ()
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@.


(obache)
diff -r1.6 -r1.7 pkgsrc/databases/java-tokyocabinet/Makefile
diff -r1.10 -r1.11 pkgsrc/databases/lua-tokyocabinet/Makefile
diff -r1.19 -r1.20 pkgsrc/databases/p5-tokyocabinet/Makefile
diff -r1.17 -r1.18 pkgsrc/databases/ruby-tokyocabinet/Makefile
diff -r1.35 -r1.36 pkgsrc/databases/tokyocabinet/Makefile
diff -r1.5 -r1.6 pkgsrc/databases/tokyocabinet/buildlink3.mk
diff -r0 -r1.1 pkgsrc/databases/tokyocabinet/options.mk
diff -r1.25 -r1.26 pkgsrc/databases/tokyotyrant/Makefile
diff -r1.297 -r1.298 pkgsrc/mk/defaults/options.description
diff -r1.12 -r1.13 pkgsrc/textproc/tokyodystopia/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/tokyodystopia/buildlink3.mk
cvs diff -r1.6 -r1.7 pkgsrc/databases/java-tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/java-tokyocabinet/Makefile 2009/11/30 21:59:37 1.6
+++ pkgsrc/databases/java-tokyocabinet/Makefile 2009/12/19 12:56:45 1.7
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2009/11/30 21:59:37 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-java-1.22 4DISTNAME= tokyocabinet-java-1.22
 5PKGREVISION= 1
5PKGNAME= java-${DISTNAME:S/-java//} 6PKGNAME= java-${DISTNAME:S/-java//}
6CATEGORIES= databases 7CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
8 9
9MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://1978th.net/tokyocabinet/javadoc/ 11HOMEPAGE= http://1978th.net/tokyocabinet/javadoc/
11COMMENT= Java binding of Tokyo Cabinet 12COMMENT= Java binding of Tokyo Cabinet
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17USE_LANGUAGES= c 18USE_LANGUAGES= c
cvs diff -r1.10 -r1.11 pkgsrc/databases/lua-tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/lua-tokyocabinet/Makefile 2009/11/30 21:59:37 1.10
+++ pkgsrc/databases/lua-tokyocabinet/Makefile 2009/12/19 12:56:45 1.11
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2009/11/30 21:59:37 joerg Exp $ 1# $NetBSD: Makefile,v 1.11 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-lua-1.8 4DISTNAME= tokyocabinet-lua-1.8
 5PKGREVISION= 1
5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/} 6PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/}
6CATEGORIES= databases 7CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
8 9
9MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://1978th.net/tokyocabinet/luadoc/ 11HOMEPAGE= http://1978th.net/tokyocabinet/luadoc/
11COMMENT= Lua binding of Tokyo Cabinet 12COMMENT= Lua binding of Tokyo Cabinet
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17USE_LANGUAGES= c 18USE_LANGUAGES= c
cvs diff -r1.19 -r1.20 pkgsrc/databases/p5-tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/p5-tokyocabinet/Makefile 2009/11/25 11:33:56 1.19
+++ pkgsrc/databases/p5-tokyocabinet/Makefile 2009/12/19 12:56:45 1.20
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.19 2009/11/25 11:33:56 obache Exp $ 1# $NetBSD: Makefile,v 1.20 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-perl-1.32 4DISTNAME= tokyocabinet-perl-1.32
 5PKGREVISION= 1
5PKGNAME= p5-${DISTNAME:S/-perl-/-/} 6PKGNAME= p5-${DISTNAME:S/-perl-/-/}
6CATEGORIES= databases 7CATEGORIES= databases
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
8 9
9MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://1978th.net/tokyocabinet/perldoc/ 11HOMEPAGE= http://1978th.net/tokyocabinet/perldoc/
11COMMENT= Perl binding of Tokyo Cabinet 12COMMENT= Perl binding of Tokyo Cabinet
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16PERL5_PACKLIST= auto/TokyoCabinet/.packlist 17PERL5_PACKLIST= auto/TokyoCabinet/.packlist
17 18
cvs diff -r1.17 -r1.18 pkgsrc/databases/ruby-tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/ruby-tokyocabinet/Makefile 2009/11/25 11:33:56 1.17
+++ pkgsrc/databases/ruby-tokyocabinet/Makefile 2009/12/19 12:56:45 1.18
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.17 2009/11/25 11:33:56 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-ruby-1.29 4DISTNAME= tokyocabinet-ruby-1.29
5PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby-/-/} 5PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby-/-/}
 6PKGREVISION= 1
6CATEGORIES= databases ruby 7CATEGORIES= databases ruby
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
8 9
9MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://1978th.net/tokyocabinet/rubydoc/ 11HOMEPAGE= http://1978th.net/tokyocabinet/rubydoc/
11COMMENT= Ruby binding of Tokyo Cabinet 12COMMENT= Ruby binding of Tokyo Cabinet
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_RUBY_EXTCONF= yes 17USE_RUBY_EXTCONF= yes
17RUBY_HAS_ARCHLIB= yes 18RUBY_HAS_ARCHLIB= yes
18REPLACE_RUBY_DIRS= . 19REPLACE_RUBY_DIRS= .
cvs diff -r1.35 -r1.36 pkgsrc/databases/tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/tokyocabinet/Makefile 2009/11/25 11:33:56 1.35
+++ pkgsrc/databases/tokyocabinet/Makefile 2009/12/19 12:56:45 1.36
@@ -1,43 +1,37 @@ @@ -1,43 +1,37 @@
1# $NetBSD: Makefile,v 1.35 2009/11/25 11:33:56 obache Exp $ 1# $NetBSD: Makefile,v 1.36 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-1.4.32 4DISTNAME= tokyocabinet-1.4.32
 5PKGREVISION= 1
5CATEGORIES= databases 6CATEGORIES= databases
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
7 8
8MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
9HOMEPAGE= http://1978th.net/tokyocabinet/ 10HOMEPAGE= http://1978th.net/tokyocabinet/
10COMMENT= Modern implementation of DBM 11COMMENT= Modern implementation of DBM
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17USE_LANGUAGES= c99 18USE_LANGUAGES= c99
18 19
19PKGCONFIG_OVERRIDE+= tokyocabinet.pc.in 20PKGCONFIG_OVERRIDE+= tokyocabinet.pc.in
20 21
21CONFIGURE_ARGS+= --enable-zlib 22.include "options.mk"
22CONFIGURE_ARGS+= --enable-bzip 
23CONFIGURE_ARGS+= --enable-exlzma 
24CONFIGURE_ARGS+= --enable-exlzo 
25 23
26TEST_TARGET= check 24TEST_TARGET= check
27 25
28.include "../../archivers/bzip2/buildlink3.mk" 
29.include "../../archivers/lzmalib/buildlink3.mk" 
30.include "../../archivers/lzo/buildlink3.mk" 
31.include "../../devel/zlib/buildlink3.mk" 
32.include "../../mk/pthread.buildlink3.mk" 26.include "../../mk/pthread.buildlink3.mk"
33PTHREAD_AUTO_VARS= yes 27PTHREAD_AUTO_VARS= yes
34.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" 28.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
35CONFIGURE_ARGS+= --disable-pthread 29CONFIGURE_ARGS+= --disable-pthread
36.else 30.else
37CONFIGURE_ARGS+= --enable-pthread 31CONFIGURE_ARGS+= --enable-pthread
38SUBST_CLASSES+= pthread 32SUBST_CLASSES+= pthread
39SUBST_STAGE.pthread= pre-configure 33SUBST_STAGE.pthread= pre-configure
40SUBST_FILES.pthread= configure 34SUBST_FILES.pthread= configure
41SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|' 35SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
42.endif 36.endif
43.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/databases/tokyocabinet/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/databases/tokyocabinet/buildlink3.mk 2009/03/21 05:32:04 1.5
+++ pkgsrc/databases/tokyocabinet/buildlink3.mk 2009/12/19 12:56:45 1.6
@@ -1,19 +1,34 @@ @@ -1,19 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.5 2009/03/21 05:32:04 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2009/12/19 12:56:45 obache Exp $
2 2
3BUILDLINK_TREE+= tokyocabinet 3BUILDLINK_TREE+= tokyocabinet
4 4
5.if !defined(TOKYOCABINET_BUILDLINK3_MK) 5.if !defined(TOKYOCABINET_BUILDLINK3_MK)
6TOKYOCABINET_BUILDLINK3_MK:= 6TOKYOCABINET_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.7 8BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.3.7
9BUILDLINK_ABI_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.10 9BUILDLINK_ABI_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.32nb1
10BUILDLINK_PKGSRCDIR.tokyocabinet?= ../../databases/tokyocabinet 10BUILDLINK_PKGSRCDIR.tokyocabinet?= ../../databases/tokyocabinet
11 11
 12pkgbase := tokyocabinet
 13.include "../../mk/pkg-build-options.mk"
 14
 15.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
12.include "../../archivers/bzip2/buildlink3.mk" 16.include "../../archivers/bzip2/buildlink3.mk"
 17.endif
 18
 19.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzma)
13.include "../../archivers/lzmalib/buildlink3.mk" 20.include "../../archivers/lzmalib/buildlink3.mk"
 21.endif
 22
 23.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mlzo)
14.include "../../archivers/lzo/buildlink3.mk" 24.include "../../archivers/lzo/buildlink3.mk"
 25.endif
 26
 27.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
15.include "../../devel/zlib/buildlink3.mk" 28.include "../../devel/zlib/buildlink3.mk"
 29.endif
 30
16.include "../../mk/pthread.buildlink3.mk" 31.include "../../mk/pthread.buildlink3.mk"
17.endif # TOKYOCABINET_BUILDLINK3_MK 32.endif # TOKYOCABINET_BUILDLINK3_MK
18 33
19BUILDLINK_TREE+= -tokyocabinet 34BUILDLINK_TREE+= -tokyocabinet
File Added: pkgsrc/databases/tokyocabinet/options.mk
# $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
cvs diff -r1.25 -r1.26 pkgsrc/databases/tokyotyrant/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/tokyotyrant/Makefile 2009/11/25 11:33:56 1.25
+++ pkgsrc/databases/tokyotyrant/Makefile 2009/12/19 12:56:45 1.26
@@ -1,35 +1,42 @@ @@ -1,35 +1,42 @@
1# $NetBSD: Makefile,v 1.25 2009/11/25 11:33:56 obache Exp $ 1# $NetBSD: Makefile,v 1.26 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyotyrant-1.1.33 4DISTNAME= tokyotyrant-1.1.33
 5PKGREVISION= 1
5CATEGORIES= databases net 6CATEGORIES= databases net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
7 8
8MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
9HOMEPAGE= http://1978th.net/tokyotyrant/ 10HOMEPAGE= http://1978th.net/tokyotyrant/
10COMMENT= Network interface of Tokyo Cabinet 11COMMENT= Network interface of Tokyo Cabinet
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17 18
18PKGCONFIG_OVERRIDE+= tokyotyrant.pc.in 19PKGCONFIG_OVERRIDE+= tokyotyrant.pc.in
19 20
20TEST_TARGET= check 21TEST_TARGET= check
21 22
22.include "options.mk" 23.include "options.mk"
23 24
24BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29 25BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29
25.include "../../databases/tokyocabinet/buildlink3.mk" 26.include "../../databases/tokyocabinet/buildlink3.mk"
26.include "../../devel/zlib/buildlink3.mk" 27CONFIGURE_ARGS+= --with-tc=${BUILDLINK_PREFIX.tokyocabinet}
 28.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
 29CONFIGURE_ARGS+= --with-bzip=${BUILDLINK_PREFIX.bzip2}
 30.endif
 31.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
 32CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
 33.endif
27PTHREAD_AUTO_VARS= yes 34PTHREAD_AUTO_VARS= yes
28.include "../../mk/pthread.buildlink3.mk" 35.include "../../mk/pthread.buildlink3.mk"
29.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" 36.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
30SUBST_CLASSES+= pthread 37SUBST_CLASSES+= pthread
31SUBST_STAGE.pthread= pre-configure 38SUBST_STAGE.pthread= pre-configure
32SUBST_FILES.pthread= configure 39SUBST_FILES.pthread= configure
33SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|' 40SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
34.endif 41.endif
35.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.297 -r1.298 pkgsrc/mk/defaults/options.description (expand / switch to unified diff)

--- pkgsrc/mk/defaults/options.description 2009/12/12 23:43:32 1.297
+++ pkgsrc/mk/defaults/options.description 2009/12/19 12:56:45 1.298
@@ -273,26 +273,28 @@ libofx Enable OFX support. @@ -273,26 +273,28 @@ libofx Enable OFX support.
273libspiff Use libspiff for XML shareable playlist support. 273libspiff Use libspiff for XML shareable playlist support.
274libssh2 Use libssh2 for SSHv2 protocol support. 274libssh2 Use libssh2 for SSHv2 protocol support.
275libwww-aliases Install aliases for p5-libwww (e.g. HEAD, GET etc.) 275libwww-aliases Install aliases for p5-libwww (e.g. HEAD, GET etc.)
276libxml2 Use the libxml2 library for XML support. 276libxml2 Use the libxml2 library for XML support.
277liferea-gtkhtml Use libgtkhtml2 to render HTML. 277liferea-gtkhtml Use libgtkhtml2 to render HTML.
278liferea-mozilla Use xulrunner to render HTML. 278liferea-mozilla Use xulrunner to render HTML.
279links Use and enable support for the links browser. 279links Use and enable support for the links browser.
280links-zlib Enable zlib support for the links WWW browser. 280links-zlib Enable zlib support for the links WWW browser.
281live Enable live555 support. 281live Enable live555 support.
282lprng-priv-ports Connections must be made from privileged ports. 282lprng-priv-ports Connections must be made from privileged ports.
283lprng-suid Install LPRng executables setuid root. 283lprng-suid Install LPRng executables setuid root.
284lua Enable Lua support. 284lua Enable Lua support.
285lynx Use and enable support for the lynx browser. 285lynx Use and enable support for the lynx browser.
 286lzma Enable LZMA (de)compression support.
 287lzo Enable LZO (de)compression support.
286lzw Enable LZW (De)compression support 288lzw Enable LZW (De)compression support
287m17nlib Enable the m17n library support. 289m17nlib Enable the m17n library support.
288m68060-optimized Optimize for m68060 (only). 290m68060-optimized Optimize for m68060 (only).
289mac Enable Monkey's Audio Codec support. 291mac Enable Monkey's Audio Codec support.
290mad Enable usage of the mad library to play MP3 files. 292mad Enable usage of the mad library to play MP3 files.
291maintainer-zts Enable the Zend Thread Safety option for PHP 293maintainer-zts Enable the Zend Thread Safety option for PHP
292mex Enable matlab mex support (Linux and Solaris only). 294mex Enable matlab mex support (Linux and Solaris only).
293mikmod Enable MikMod sound library. 295mikmod Enable MikMod sound library.
294mitshm Enable MIT-SHM X extension support. 296mitshm Enable MIT-SHM X extension support.
295mlib Enable usage of medialib (SunOS only). 297mlib Enable usage of medialib (SunOS only).
296mmx Enable MMX support (i386 only). 298mmx Enable MMX support (i386 only).
297modperl1 Use modperl 1.x as the CGI manager (with Apache 1.x). 299modperl1 Use modperl 1.x as the CGI manager (with Apache 1.x).
298modperl2 Use modperl 2.x as the CGI manager (with Apache 2.x). 300modperl2 Use modperl 2.x as the CGI manager (with Apache 2.x).
cvs diff -r1.12 -r1.13 pkgsrc/textproc/tokyodystopia/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/tokyodystopia/Makefile 2009/11/25 11:33:56 1.12
+++ pkgsrc/textproc/tokyodystopia/Makefile 2009/12/19 12:56:45 1.13
@@ -1,36 +1,44 @@ @@ -1,36 +1,44 @@
1# $NetBSD: Makefile,v 1.12 2009/11/25 11:33:56 obache Exp $ 1# $NetBSD: Makefile,v 1.13 2009/12/19 12:56:45 obache Exp $
2# 2#
3 3
4DISTNAME= tokyodystopia-0.9.13 4DISTNAME= tokyodystopia-0.9.13
 5PKGREVISION= 1
5CATEGORIES= textproc 6CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
7 8
8MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
9HOMEPAGE= http://1978th.net/tokyodystopia/ 10HOMEPAGE= http://1978th.net/tokyodystopia/
10COMMENT= Full-text search system 11COMMENT= Full-text search system
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17 18
18PKGCONFIG_OVERRIDE+= tokyodystopia.pc.in 19PKGCONFIG_OVERRIDE+= tokyodystopia.pc.in
19 20
20CONFIGURE_ARGS+= --enable-zlib 
21CONFIGURE_ARGS+= --enable-bzip 
22 
23TEST_TARGET= check 21TEST_TARGET= check
24 22
25BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29 23BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29
26.include "../../databases/tokyocabinet/buildlink3.mk" 24.include "../../databases/tokyocabinet/buildlink3.mk"
27.include "../../devel/zlib/buildlink3.mk" 25.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mbzip2)
28.include "../../archivers/bzip2/buildlink3.mk" 26CONFIGURE_ARGS+= --enable-bzip
 27CONFIGURE_ARGS+= --with-bzip=${BUILDLINK_PREFIX.bzip2}
 28.else
 29CONFIGURE_ARGS+= --disable-bzip
 30.endif
 31.if !empty(PKG_BUILD_OPTIONS.tokyocabinet:Mzlib)
 32CONFIGURE_ARGS+= --enable-zlib
 33CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
 34.else
 35CONFIGURE_ARGS+= --disable-zlib
 36.endif
29.include "../../mk/pthread.buildlink3.mk" 37.include "../../mk/pthread.buildlink3.mk"
30PTHREAD_AUTO_VARS= yes 38PTHREAD_AUTO_VARS= yes
31CONFIGURE_ARGS+= --enable-pthread 39CONFIGURE_ARGS+= --enable-pthread
32SUBST_CLASSES+= pthread 40SUBST_CLASSES+= pthread
33SUBST_STAGE.pthread= pre-configure 41SUBST_STAGE.pthread= pre-configure
34SUBST_FILES.pthread= configure 42SUBST_FILES.pthread= configure
35SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|' 43SUBST_SED.pthread= -e 's|-lpthread|${PTHREAD_LIBS}|'
36.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/textproc/tokyodystopia/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/tokyodystopia/buildlink3.mk 2009/03/21 05:35:38 1.6
+++ pkgsrc/textproc/tokyodystopia/buildlink3.mk 2009/12/19 12:56:45 1.7
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.6 2009/03/21 05:35:38 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2009/12/19 12:56:45 obache Exp $
2 2
3BUILDLINK_TREE+= tokyodystopia 3BUILDLINK_TREE+= tokyodystopia
4 4
5.if !defined(TOKYODYSTOPIA_BUILDLINK3_MK) 5.if !defined(TOKYODYSTOPIA_BUILDLINK3_MK)
6TOKYODYSTOPIA_BUILDLINK3_MK:= 6TOKYODYSTOPIA_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.5 8BUILDLINK_API_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.5
9BUILDLINK_ABI_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.9nb1 9BUILDLINK_ABI_DEPENDS.tokyodystopia+= tokyodystopia>=0.9.13nb1
10BUILDLINK_PKGSRCDIR.tokyodystopia?= ../../textproc/tokyodystopia 10BUILDLINK_PKGSRCDIR.tokyodystopia?= ../../textproc/tokyodystopia
11 11
12.include "../../databases/tokyocabinet/buildlink3.mk" 12.include "../../databases/tokyocabinet/buildlink3.mk"
13.include "../../devel/zlib/buildlink3.mk" 
14.include "../../archivers/bzip2/buildlink3.mk" 
15.endif # TOKYODYSTOPIA_BUILDLINK3_MK 13.endif # TOKYODYSTOPIA_BUILDLINK3_MK
16 14
17BUILDLINK_TREE+= -tokyodystopia 15BUILDLINK_TREE+= -tokyodystopia