aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2011-12-18 22:17:06 +0800
committersunpoet <sunpoet@FreeBSD.org>2011-12-18 22:17:06 +0800
commit6982458fae9614a2f22f7a2f4a6106f25eada5ce (patch)
treeeaff68f42028e5fec5653bafd816459ddacb2269
parentba880a82435e69d434dca535237bb24aa0949231 (diff)
downloadfreebsd-ports-graphics-6982458fae9614a2f22f7a2f4a6106f25eada5ce.tar.gz
freebsd-ports-graphics-6982458fae9614a2f22f7a2f4a6106f25eada5ce.tar.zst
freebsd-ports-graphics-6982458fae9614a2f22f7a2f4a6106f25eada5ce.zip
- Bump PORTREVISION for databases/kyotocabinet shlib change
- Fix 'make patch': original files/patch-extconf.rb cannot be applied cleanly
-rw-r--r--databases/ruby-kyotocabinet/Makefile3
-rw-r--r--databases/ruby-kyotocabinet/files/patch-extconf.rb8
2 files changed, 6 insertions, 5 deletions
diff --git a/databases/ruby-kyotocabinet/Makefile b/databases/ruby-kyotocabinet/Makefile
index a23e68b74fb..bce0b1ddfeb 100644
--- a/databases/ruby-kyotocabinet/Makefile
+++ b/databases/ruby-kyotocabinet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kyotocabinet
PORTVERSION= 1.24
+PORTREVISION= 1
CATEGORIES= databases ruby
MASTER_SITES= http://fallabs.com/kyotocabinet/rubypkg/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ DIST_SUBDIR= ruby
MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby (1.9.1+) binding to Kyoto Cabinet
-LIB_DEPENDS= kyotocabinet.9:${PORTSDIR}/databases/kyotocabinet
+LIB_DEPENDS= kyotocabinet:${PORTSDIR}/databases/kyotocabinet
LICENSE= GPLv3
diff --git a/databases/ruby-kyotocabinet/files/patch-extconf.rb b/databases/ruby-kyotocabinet/files/patch-extconf.rb
index 205f0464062..bbb2087fc3c 100644
--- a/databases/ruby-kyotocabinet/files/patch-extconf.rb
+++ b/databases/ruby-kyotocabinet/files/patch-extconf.rb
@@ -1,5 +1,5 @@
---- extconf.rb.orig 2010-04-28 13:27:42.120543437 +0900
-+++ extconf.rb 2010-04-28 13:04:57.387073893 +0900
+--- extconf.rb.orig 2010-11-30 19:41:45.000000000 +0800
++++ extconf.rb 2011-12-18 16:36:33.312316430 +0800
@@ -3,8 +3,9 @@
File::unlink("Makefile") if (File::exist?("Makefile"))
dir_config('kyotocabinet')
@@ -9,6 +9,6 @@
+#home = ENV["HOME"]
+#ENV["PATH"] = ENV["PATH"] + ":/usr/local/bin:$home/bin:."
+ENV["PATH"] = '%s:%s' % [with_config('bindir'), ENV["PATH"]]
- kccflags = `kcutilcodec conf -i 2>/dev/null`.chomp
- kcldflags = `kcutilcodec conf -l 2>/dev/null`.chomp
+ kccflags = `kcutilmgr conf -i 2>/dev/null`.chomp
+ kcldflags = `kcutilmgr conf -l 2>/dev/null`.chomp
kcldflags = kcldflags.gsub(/-l[\S]+/, "").strip