5 files changed, 33 insertions, 33 deletions

diff --git a/mail/hashcash/Makefile b/mail/hashcash/Makefile
index d24df2c9caf5..9773bd4a87c8 100644
--- a/mail/hashcash/Makefile
+++ b/mail/hashcash/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	hashcash
-PORTVERSION=	0.28
+PORTVERSION=	1.02
 CATEGORIES=	mail
-MASTER_SITES=	http://www.cypherspace.org/hashcash/source/
+MASTER_SITES=	http://www.hashcash.org/source/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bremner@unb.ca
 COMMENT=	Anti-spam / denial of service counter-measure tool
 
-MAN1=		hashcash.1 sha1.1
+MAN1=		hashcash.1 sha1-hashcash.1
 
 .include <bsd.port.mk>
diff --git a/mail/hashcash/distinfo b/mail/hashcash/distinfo
index 446afe2aca6e..7733d80425a2 100644
--- a/mail/hashcash/distinfo
+++ b/mail/hashcash/distinfo
@@ -1,2 +1,2 @@
-MD5 (hashcash-0.28.tgz) = 8c929d963fcb6240af251cca5990d741
-SIZE (hashcash-0.28.tgz) = 88924
+MD5 (hashcash-1.02.tgz) = eef0ff5ab7387983ecc4074ae254a948
+SIZE (hashcash-1.02.tgz) = 136241
diff --git a/mail/hashcash/files/patch-Makefile b/mail/hashcash/files/patch-Makefile
index d5de85cba777..20954da87765 100644
--- a/mail/hashcash/files/patch-Makefile
+++ b/mail/hashcash/files/patch-Makefile
@@ -1,16 +1,31 @@
---- Makefile.orig	Fri Sep 26 07:28:03 2003
-+++ Makefile	Sun Feb  1 18:23:29 2004
-@@ -1,10 +1,9 @@
- HC_VERS = 0.28
--INSTALL_PATH = /usr/local/bin
+--- Makefile.orig	Wed Aug 11 04:01:24 2004
++++ Makefile	Sat Aug 28 11:23:16 2004
+@@ -1,6 +1,6 @@
+ HC_VERS = 1.02
+-INSTALL_PATH = /usr/bin
 -MAN_INSTALL_PATH = /usr/share/man/man1
 +INSTALL_PATH = ${PREFIX}/bin
 +MAN_INSTALL_PATH = ${PREFIX}/man/man1
+ DOC_INSTALL_PATH = /usr/share/doc/hashcash-$(HC_VERS)
  MAKEDEPEND = makedepend
--COPT = -O3
+ # add -DCHROMATIX for libfastmint integration
+@@ -12,8 +12,8 @@
+ # if no POSIX or BSD, disable, still have builtin basic wildcard support
+ # OPT = -O
  LDFLAGS = $(CARCH)
--CFLAGS = $(COPT) $(CWARN) $(CARCH)
-+CFLAGS += $(CWARN) $(CARCH)
- EXES = hashcash sha1 sha1test
+-CFLAGS = $(COPT) $(OPT) $(CWARN) $(CARCH)
+-EXES = hashcash sha1 sha1test fastmint_benchtest
++CFLAGS += $(COPT) $(OPT) $(CWARN) $(CARCH)
++EXES = hashcash sha1 sha1test
  INSTALL = /usr/bin/install
  POD2MAN = pod2man
+ POD2HTML = pod2html
+@@ -31,7 +31,7 @@
+ 
+ DIST = ../dist.csh
+ 
+-build:	hashcash sha1 #fastmint_benchtest
++build:	hashcash sha1
+ 
+ hashcash:	$(OBJS)
+ 	$(CC) $(LDFLAGS) $(OBJS) -o $@
diff --git a/mail/hashcash/files/patch-hashcash-h b/mail/hashcash/files/patch-hashcash-h
deleted file mode 100644
index 42496fec9e37..000000000000
--- a/mail/hashcash/files/patch-hashcash-h
+++ /dev/null
@@ -1,19 +0,0 @@
-*** hashcash.h~	Fri Sep 26 02:28:03 2003
---- hashcash.h	Fri Jan 30 14:13:22 2004
-***************
-*** 130,136 ****
-  /* simple function calling hashcash_parse, hashcash_count for convenience */
-  
-  int hashcash_check( const char* token, const char* resource, time_t now_time, 
-! 		    time_t validity_period, long grace_period, 
-  		    int required_bits );
-  
-  /* return how many tries per second the machine can do */
---- 130,136 ----
-  /* simple function calling hashcash_parse, hashcash_count for convenience */
-  
-  int hashcash_check( const char* token, const char* resource, time_t now_time, 
-! 		    time_t validity_period, time_t grace_period, 
-  		    int required_bits );
-  
-  /* return how many tries per second the machine can do */
diff --git a/mail/hashcash/pkg-plist b/mail/hashcash/pkg-plist
index 3a4b284ea95b..271fc87388b1 100644
--- a/mail/hashcash/pkg-plist
+++ b/mail/hashcash/pkg-plist
@@ -1,2 +1,6 @@
 bin/hashcash
 bin/sha1
+share/doc/hashcash/CHANGELOG
+share/doc/hashcash/LICENSE
+share/doc/hashcash/README
+@dirrm share/doc/hashcash