Sat Sep 20 01:20:46 2014 UTC ()
Use "pp" instead "pe" pax option for unprivileged build.


(obache)
diff -r1.21 -r1.22 pkgsrc/databases/lua-tokyocabinet/Makefile
diff -r1.26 -r1.27 pkgsrc/databases/ruby-tokyocabinet/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/databases/lua-tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/lua-tokyocabinet/Makefile 2014/05/03 13:01:24 1.21
+++ pkgsrc/databases/lua-tokyocabinet/Makefile 2014/09/20 01:20:46 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2014/05/03 13:01:24 alnsn Exp $ 1# $NetBSD: Makefile,v 1.22 2014/09/20 01:20:46 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-lua-1.10 4DISTNAME= tokyocabinet-lua-1.10
5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/} 5PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/-lua-/-/}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= databases 7CATEGORIES= databases
8MASTER_SITES= ${HOMEPAGE:S/luadoc/luapkg/} 8MASTER_SITES= ${HOMEPAGE:S/luadoc/luapkg/}
9 9
10MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
11HOMEPAGE= http://fallabs.com/tokyocabinet/luadoc/ 11HOMEPAGE= http://fallabs.com/tokyocabinet/luadoc/
12COMMENT= Lua binding of Tokyo Cabinet 12COMMENT= Lua binding of Tokyo Cabinet
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -19,27 +19,27 @@ USE_TOOLS+= pkg-config pax @@ -19,27 +19,27 @@ USE_TOOLS+= pkg-config pax
19TEST_TARGET= check 19TEST_TARGET= check
20TEST_ENV+= LUA_CDIR=${WRKSRC} 20TEST_ENV+= LUA_CDIR=${WRKSRC}
21 21
22REPLACE_LUA= *.lua 22REPLACE_LUA= *.lua
23 23
24INSTALLATION_DIRS+= ${LUA_DOCDIR} ${LUA_EXAMPLESDIR} 24INSTALLATION_DIRS+= ${LUA_DOCDIR} ${LUA_EXAMPLESDIR}
25 25
26MAKE_ENV+= INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include 26MAKE_ENV+= INCLUDEDIR=${BUILDLINK_PREFIX.tokyocabinet}/include
27 27
28post-extract: 28post-extract:
29 ${CHMOD} -R go-w ${WRKSRC} 29 ${CHMOD} -R go-w ${WRKSRC}
30 30
31post-install: 31post-install:
32 cd ${WRKSRC}/doc && pax -rwpe . \ 32 cd ${WRKSRC}/doc && pax -rwpp . \
33 ${DESTDIR}${PREFIX}/${LUA_DOCDIR} 33 ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
34 mv ${DESTDIR}${PREFIX}/bin/*.lua \ 34 mv ${DESTDIR}${PREFIX}/bin/*.lua \
35 ${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR} 35 ${DESTDIR}${PREFIX}/${LUA_EXAMPLESDIR}
36 36
37BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29 37BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29
38.include "../../databases/tokyocabinet/buildlink3.mk" 38.include "../../databases/tokyocabinet/buildlink3.mk"
39.include "../../lang/lua/application.mk" 39.include "../../lang/lua/application.mk"
40.include "../../lang/lua/module.mk" 40.include "../../lang/lua/module.mk"
41.include "../../lang/lua/tool.mk" 41.include "../../lang/lua/tool.mk"
42PTHREAD_AUTO_VARS= yes 42PTHREAD_AUTO_VARS= yes
43.include "../../mk/pthread.buildlink3.mk" 43.include "../../mk/pthread.buildlink3.mk"
44.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" 44.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
45SUBST_CLASSES+= pthread 45SUBST_CLASSES+= pthread
cvs diff -r1.26 -r1.27 pkgsrc/databases/ruby-tokyocabinet/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/ruby-tokyocabinet/Makefile 2013/10/27 12:49:13 1.26
+++ pkgsrc/databases/ruby-tokyocabinet/Makefile 2014/09/20 01:20:46 1.27
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.26 2013/10/27 12:49:13 obache Exp $ 1# $NetBSD: Makefile,v 1.27 2014/09/20 01:20:46 obache Exp $
2# 2#
3 3
4DISTNAME= tokyocabinet-ruby-1.31 4DISTNAME= tokyocabinet-ruby-1.31
5PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby-/-/} 5PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby-/-/}
6CATEGORIES= databases ruby 6CATEGORIES= databases ruby
7MASTER_SITES= ${HOMEPAGE:S/rubydoc/rubypkg/} 7MASTER_SITES= ${HOMEPAGE:S/rubydoc/rubypkg/}
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://fallabs.com/tokyocabinet/rubydoc/ 10HOMEPAGE= http://fallabs.com/tokyocabinet/rubydoc/
11COMMENT= Ruby binding of Tokyo Cabinet 11COMMENT= Ruby binding of Tokyo Cabinet
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_RUBY_EXTCONF= yes 14USE_RUBY_EXTCONF= yes
15REPLACE_RUBY_DIRS= . 15REPLACE_RUBY_DIRS= .
16USE_TOOLS+= pax 16USE_TOOLS+= pax
17 17
18DOCDIR= share/tokyocabinet/doc/ruby 18DOCDIR= share/tokyocabinet/doc/ruby
19RUBY_DYNAMIC_DIRS= ${DOCDIR} 19RUBY_DYNAMIC_DIRS= ${DOCDIR}
20 20
21do-test: 21do-test:
22 ${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${RUBY} test.rb 22 ${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${RUBY} test.rb
23 23
24post-install: 24post-install:
25 ${INSTALL_DATA_DIR} ${DESTDIR}/${PREFIX}/${DOCDIR} 25 ${INSTALL_DATA_DIR} ${DESTDIR}/${PREFIX}/${DOCDIR}
26 cd ${WRKSRC}/doc && pax -rwpe . ${DESTDIR}${PREFIX}/${DOCDIR} 26 cd ${WRKSRC}/doc && pax -rwpp . ${DESTDIR}${PREFIX}/${DOCDIR}
27 ${RUBY_GENERATE_PLIST} 27 ${RUBY_GENERATE_PLIST}
28 28
29BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29 29BUILDLINK_API_DEPENDS.tokyocabinet+= tokyocabinet>=1.4.29
30.include "../../databases/tokyocabinet/buildlink3.mk" 30.include "../../databases/tokyocabinet/buildlink3.mk"
31.include "../../lang/ruby/modules.mk" 31.include "../../lang/ruby/modules.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"