8 files changed, 8 insertions, 66 deletions

diff --git a/irc/irssi-fish/Makefile b/irc/irssi-fish/Makefile
index dae8db1b67cc..269a6786738e 100644
--- a/irc/irssi-fish/Makefile
+++ b/irc/irssi-fish/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	irssi-fish
-DISTVERSION=	0.99
-PORTREVISION=	2
+DISTVERSION=	1.00-RC5
 CATEGORIES=	irc security
-MASTER_SITES=	http://fish.sekure.la/irssi/
+MASTER_SITES=	http://fish.secure.la/irssi/
 DISTNAME=	FiSH-irssi.v${DISTVERSION}-source
 
 MAINTAINER=	wahjava@gmail.com
@@ -34,6 +33,8 @@ ALL_TARGET=	amd64
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -E -e 's|||' {} \;
+	@${GREP} -Rl 'fish[.]sekure[.]us' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -E \
+		-e 's|fish[.]sekure[.]us|fish.secure.la|g'
 	@${REINPLACE_CMD} -E \
 		-e 's|gcc|${CC}|' \
 		-e 's|-O2|${CFLAGS}|' \
diff --git a/irc/irssi-fish/distinfo b/irc/irssi-fish/distinfo
index 985706119363..9e7ddf44112e 100644
--- a/irc/irssi-fish/distinfo
+++ b/irc/irssi-fish/distinfo
@@ -1,3 +1,3 @@
-MD5 (FiSH-irssi.v0.99-source.zip) = 15d60f1f1f9af12d5b1db7d7e8a95543
-SHA256 (FiSH-irssi.v0.99-source.zip) = fe5ec748886620494c51e568093ff226b663a3a7ee7716ab06c24e29bf828e3c
-SIZE (FiSH-irssi.v0.99-source.zip) = 43491
+MD5 (FiSH-irssi.v1.00-RC5-source.zip) = 9ee14941eb4db813101236b1b6ae98cc
+SHA256 (FiSH-irssi.v1.00-RC5-source.zip) = 528e56aa4b81c22b2d7f4ce76340b4ddaac800952846c9824cf1f42d3adf1b25
+SIZE (FiSH-irssi.v1.00-RC5-source.zip) = 48146
diff --git a/irc/irssi-fish/files/patch-DH1080.c b/irc/irssi-fish/files/patch-DH1080.c
deleted file mode 100644
index edfd835bb3f0..000000000000
--- a/irc/irssi-fish/files/patch-DH1080.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- DH1080.c.orig	2005-01-16 14:59:10.000000000 -0900
-+++ DH1080.c	2008-07-14 21:26:25.000000000 -0800
-@@ -13,6 +13,7 @@
- 

- #include <stdio.h>

- #include <time.h>

-+#include <string.h>

- #include "DH1080.h"

- 

- // ### new sophie-germain 1080bit prime number ###

diff --git a/irc/irssi-fish/files/patch-Makefile b/irc/irssi-fish/files/patch-Makefile
deleted file mode 100644
index 7294137d3a81..000000000000
--- a/irc/irssi-fish/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
-@@ -124,10 +124,10 @@
- 	gcc -c -static -fPIC cfgopts.c
- 
- 	gcc -static -c -fPIC DH1080.c
--	gcc -static -fPIC -shared DH1080.o miracl.a SHA-256.o base64.o -o DH1080.so
-+	gcc -fPIC -shared DH1080.o miracl.a SHA-256.o base64.o -o DH1080.so
- 
- 	gcc -I. -I$(glib_dir) -I$(glib_dir)/include -I$(glib_dir)/glib -I$(irssi_dir) -I$(irssi_dir)/src -I$(irssi_dir)/src/core -I$(irssi_dir)/src/fe-common/core -static -O2 -Wall -c FiSH.c -fPIC -DPIC -o FiSH.o
--	gcc -static -fPIC -shared FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o miracl.a -o libfish.so
-+	gcc -fPIC -shared FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o miracl.a -o libfish.so
- 
- 	@echo 
- 	@ls -l libfish.so
diff --git a/irc/irssi-fish/files/patch-SHA-256.c b/irc/irssi-fish/files/patch-SHA-256.c
deleted file mode 100644
index e93b5fdabcdb..000000000000
--- a/irc/irssi-fish/files/patch-SHA-256.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- SHA-256.c.orig	2005-01-16 14:51:34.000000000 -0900
-+++ SHA-256.c	2008-07-14 21:34:42.000000000 -0800
-@@ -12,6 +12,7 @@
-  * */

- 

- #include <stdio.h>

-+#include <string.h>

- 

- typedef struct {

-     unsigned int state[8], length, curlen;

diff --git a/irc/irssi-fish/files/patch-base64.c b/irc/irssi-fish/files/patch-base64.c
deleted file mode 100644
index 91312cc2529a..000000000000
--- a/irc/irssi-fish/files/patch-base64.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- base64.c.orig	2005-01-17 14:19:18.000000000 -0900
-+++ base64.c	2008-07-14 21:41:47.000000000 -0800
-@@ -1,6 +1,9 @@
- /*

-     Public Base64 conversion tables

- */

-+

-+#include <string.h>

-+

- unsigned char B64ABC[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

- unsigned char b64buf[256];

- 

diff --git a/irc/irssi-fish/files/patch-blowfish.c b/irc/irssi-fish/files/patch-blowfish.c
deleted file mode 100644
index 95f2298b4ebf..000000000000
--- a/irc/irssi-fish/files/patch-blowfish.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- blowfish.c.orig	2005-01-16 14:59:16.000000000 -0900
-+++ blowfish.c	2008-07-14 21:46:38.000000000 -0800
-@@ -1,4 +1,6 @@
- #include "blowfish.h"

-+#include <string.h>

-+#include <stdlib.h>

- 

- /* #define S(x,i) (bf_S[i][x.w.byte##i]) */

- #define S0(x) (bf_S[0][x.w.byte0])

diff --git a/irc/irssi-fish/pkg-descr b/irc/irssi-fish/pkg-descr
index 0819c334b152..33bdc14f8728 100644
--- a/irc/irssi-fish/pkg-descr
+++ b/irc/irssi-fish/pkg-descr
@@ -4,4 +4,4 @@ encryption. A secure key-exchange system is included as well. Please read the
 file FiSH-irssi.txt, especially the 'Installation' section, before installing
 it!
 
-WWW: http://fish.sekure.la/
+WWW: http://fish.secure.la/