3 files changed, 71 insertions, 33 deletions

diff --git a/security/bugs/Makefile b/security/bugs/Makefile
index 414de5b17de6..993bcffc37fd 100644
--- a/security/bugs/Makefile
+++ b/security/bugs/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=		bugs
-PORTVERSION=		3.3.2
+PORTVERSION=		4.0.1
 CATEGORIES=		security
-MASTER_SITES=		http://www.bcrypt.com/crypto/
+MASTER_SITES=		http://www.bcrypt.com/english/download/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		stephane.legrand@bigfoot.com
 
+PLIST_SUB+=		PORTVERSION=${PORTVERSION}
+
 # No Manual page
 
 # Cryptography = be extra careful...
@@ -27,6 +29,9 @@ post-configure:
 		-e 's/^install: instchoice all/install: instchoice/' \
 		< ${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
 
+post-build:
+	${CP} ${WRKSRC}/lib/unix/*.a ${WRKSRC}/lib/
+
 pre-install:
 	(cd ${WRKSRC}; ${MAKE} test)
 
diff --git a/security/bugs/distinfo b/security/bugs/distinfo
index 9fae9cc2cf89..9f6c02f92aa1 100644
--- a/security/bugs/distinfo
+++ b/security/bugs/distinfo
@@ -1 +1 @@
-MD5 (bugs-3.3.2.tgz) = a0cf6198892c6c751997603da44066df
+MD5 (bugs-4.0.1.tgz) = 6d2b40477c19c0f2a12fcbc92eedaa16
diff --git a/security/bugs/pkg-plist b/security/bugs/pkg-plist
index c685764085d7..e974853927bf 100644
--- a/security/bugs/pkg-plist
+++ b/security/bugs/pkg-plist
@@ -1,30 +1,63 @@
-bugs-3.3.2/bchat
-bugs-3.3.2/bcrypt
-bugs-3.3.2/bhide
-bugs-3.3.2/bkey
-bugs-3.3.2/block
-bugs-3.3.2/blogin
-bugs-3.3.2/bmore
-bugs-3.3.2/bpass
-bugs-3.3.2/bpassdel
-bugs-3.3.2/bunlock
-bugs-3.3.2/libcrypt.a
-bugs-3.3.2/doc/HOWTO
-bugs-3.3.2/doc/README
-bugs-3.3.2/doc/dev_english.txt
-bugs-3.3.2/doc/dev_french.txt
-bugs-3.3.2/doc/index.html
-bugs-3.3.2/doc/techbugs.html
-bugs-3.3.2/doc/cv/cv_fr.html
-bugs-3.3.2/doc/cv/cv_uk.html
-bugs-3.3.2/doc/cv/note_fr.html
-bugs-3.3.2/doc/cv/note_uk.html
-bugs-3.3.2/doc/history/old_french.txt
-bugs-3.3.2/include/extra.h
-bugs-3.3.2/include/isaac.h
-bugs-3.3.2/include/libcrypt.h
-@dirrm bugs-3.3.2/doc/cv
-@dirrm bugs-3.3.2/doc/history
-@dirrm bugs-3.3.2/doc
-@dirrm bugs-3.3.2/include
-@dirrm bugs-3.3.2
+bugs-%%PORTVERSION%%/bchat
+bugs-%%PORTVERSION%%/bcrypt
+bugs-%%PORTVERSION%%/bhide
+bugs-%%PORTVERSION%%/bkey
+bugs-%%PORTVERSION%%/block
+bugs-%%PORTVERSION%%/blogin
+bugs-%%PORTVERSION%%/bmore
+bugs-%%PORTVERSION%%/bpass
+bugs-%%PORTVERSION%%/bpassdel
+bugs-%%PORTVERSION%%/bunlock
+bugs-%%PORTVERSION%%/bugscrypt.a
+bugs-%%PORTVERSION%%/doc/CHANGES
+bugs-%%PORTVERSION%%/doc/HOWTO
+bugs-%%PORTVERSION%%/doc/README
+bugs-%%PORTVERSION%%/doc/index.html
+bugs-%%PORTVERSION%%/doc/cv/cv.html
+bugs-%%PORTVERSION%%/doc/cv/note.html
+bugs-%%PORTVERSION%%/doc/fulldoc/bssl.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/bugs_intro.html
+bugs-%%PORTVERSION%%/doc/fulldoc/bugs_intro_main.html
+bugs-%%PORTVERSION%%/doc/fulldoc/bugs_intro_menu.html
+bugs-%%PORTVERSION%%/doc/fulldoc/bugs_tech.html
+bugs-%%PORTVERSION%%/doc/fulldoc/bugs_tech_main.html
+bugs-%%PORTVERSION%%/doc/fulldoc/bugs_tech_menu.html
+bugs-%%PORTVERSION%%/doc/fulldoc/contest2.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/contest3.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/dev_english.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/dev_french.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/history_unix.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/history_win.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/index.html
+bugs-%%PORTVERSION%%/doc/fulldoc/lib_hist.txt
+bugs-%%PORTVERSION%%/doc/fulldoc/images/2_1.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/2_2.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/2_3.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_1.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_10.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_11.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_2.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_3.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_4.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_5.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_6.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_7.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_8.gif
+bugs-%%PORTVERSION%%/doc/fulldoc/images/3_9.gif
+bugs-%%PORTVERSION%%/doc/history/old_french.txt
+bugs-%%PORTVERSION%%/include/bstandard.h
+bugs-%%PORTVERSION%%/include/extra.h
+bugs-%%PORTVERSION%%/include/isaac.h
+bugs-%%PORTVERSION%%/include/main.h
+bugs-%%PORTVERSION%%/include/misc.h
+bugs-%%PORTVERSION%%/include/seed.h
+bugs-%%PORTVERSION%%/include/shuffle.h
+bugs-%%PORTVERSION%%/include/utils.h
+bugs-%%PORTVERSION%%/include/wrapper.h
+@dirrm bugs-%%PORTVERSION%%/doc/fulldoc/images/
+@dirrm bugs-%%PORTVERSION%%/doc/fulldoc/
+@dirrm bugs-%%PORTVERSION%%/doc/cv
+@dirrm bugs-%%PORTVERSION%%/doc/history
+@dirrm bugs-%%PORTVERSION%%/doc
+@dirrm bugs-%%PORTVERSION%%/include
+@dirrm bugs-%%PORTVERSION%%