Update to 0.3.0.

4 files changed, 3 insertions, 82 deletions

diff --git a/security/ruby-password/Makefile b/security/ruby-password/Makefile
index 7b306c980f3..2cf23aa7467 100644
--- a/security/ruby-password/Makefile
+++ b/security/ruby-password/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	password
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	security ruby
 MASTER_SITES=	http://www.caliban.org/files/ruby/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -29,7 +29,7 @@ DOCS_EN=	CHANGES README doc/password.html
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/example/*.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
diff --git a/security/ruby-password/distinfo b/security/ruby-password/distinfo
index 9534b2d62b4..72d1a9b8a6a 100644
--- a/security/ruby-password/distinfo
+++ b/security/ruby-password/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-password-0.2.0.tar.gz) = cb6525ae6ba61ed5dba07f0fd185094b
+MD5 (ruby/ruby-password-0.3.0.tar.gz) = 6072cbc46b2c609c10f0c021672d906d
diff --git a/security/ruby-password/files/patch-extconf.rb b/security/ruby-password/files/patch-extconf.rb
deleted file mode 100644
index 04476b3e990..00000000000
--- a/security/ruby-password/files/patch-extconf.rb
+++ /dev/null
@@ -1,64 +0,0 @@
---- extconf.rb.orig	Wed Jun 19 09:29:52 2002
-+++ extconf.rb	Fri Sep 20 04:47:59 2002
-@@ -4,34 +4,44 @@
- 
- require 'mkmf'
- 
--CRACK_DICT = 'cracklib_dict.pwd'
-+search_dicts = %w(
-+/usr/local/lib/pw_dict.pwd
-+/usr/lib/pw_dict.pwd
-+/opt/lib/pw_dict.pwd
-+/usr/local/lib/cracklib_dict.pwd
-+/usr/lib/cracklib_dict.pwd
-+/opt/lib/cracklib_dict.pwd
-+)
- 
--dict = []
--search_dirs = %w(/usr/local /usr /opt)
-+if dict = with_config('crack-dict')
-+  search_dicts.unshift(dict)
-+end
- 
--# find the crack dictionary
--print "checking for #{CRACK_DICT}... "
--search_dirs.each do |d|
--  dict = Dir.glob(File.join(d, "lib", CRACK_DICT))
-+crack_dict = nil
- 
-+# find the crack dictionary
-+print "checking for cracklib dictionary... "
-+search_dicts.each do |dict|
-   # create a header file pointing to the crack dictionary
--  unless dict.empty?
--    puts "yes"
--    path = dict[0].sub(/\.pwd/, '')
--    hfile = File.new("rbcrack.h", 'w')
--    hfile.printf("#define CRACK_DICT \"%s\"\n", path)
--    hfile.close
-+  if File.exist?(dict)
-+    puts dict
-+    crack_dict = dict.sub(/\.pwd/, '')
-     break
-   end
--
- end
- 
--if dict.empty?
--  puts "no\nCouldn't find #{CRACK_DICT} on this system"
-+if crack_dict.nil?
-+  puts "no\nCouldn't find a cracklib dictionary on this system"
-   exit 1
- end
- 
--have_library('crack', 'FascistCheck')
-+hfile = File.new("rbcrack.h", 'w')
-+hfile.printf("#define CRACK_DICT \"%s\"\n", crack_dict)
-+hfile.close
-+
-+(have_header('packer.h') || have_header('crack.h')) &&
-+  have_library('crack', 'FascistCheck') or exit 1
-+
- create_makefile('crack')
- 
- File.open('Makefile', 'a') do |f|
diff --git a/security/ruby-password/files/patch-rbcrack.c b/security/ruby-password/files/patch-rbcrack.c
deleted file mode 100644
index e47328ea5f6..00000000000
--- a/security/ruby-password/files/patch-rbcrack.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- rbcrack.c.orig	Wed Sep 18 16:45:57 2002
-+++ rbcrack.c	Fri Sep 20 04:46:38 2002
-@@ -5,7 +5,11 @@
-  */
- 
- #include "ruby.h"
--#include "crack.h"
-+#ifdef HAVE_PACKER_H
-+#include <packer.h>
-+#else
-+#include <crack.h>
-+#endif
- #include "rbcrack.h"
- 
- #define CRACK_VERSION "0.2.0"