ports/125622: Update Port: irc/irssi-fish

[Ashish Shukla]

>Number:         125622
>Category:       ports
>Synopsis:       Update Port: irc/irssi-fish
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 15 04:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ashish Shukla
>Release:        FreeBSD 7.0-RELEASE-p2 amd64
>Organization:
N/A
>Environment:
System: FreeBSD chateau.d.lf 7.0-RELEASE-p2 FreeBSD 7.0-RELEASE-p2 #2: Sat Jun 28 14:20:27 IST 2008 root at chateau.d.lf:/usr/obj/usr/src/sys/ULE amd64


>Description:
This port is BROKEN earlier.
>How-To-Repeat:
Following command throws an error:

# make -C /usr/ports/irc/irssi-fish build

>Fix:
Following files are added/updated/removed in this release:
* Makefile
  - incremented PORTREVISION
  - updated MAINTAINER
  - updated BUILD_DEPENDS
  - removed BROKEN markings
* files/patch-*

NOTE: Before applying this diff, please make sure there is a subdirectory named 'files' in irssi-fish
directory.

===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/irc/irssi-fish/Makefile /home/abbe/ports/irssi-fish/Makefile
--- /usr/ports/irc/irssi-fish/Makefile	2008-06-06 19:06:39.000000000 +0530
+++ /home/abbe/ports/irssi-fish/Makefile	2008-07-15 08:47:48.000000000 +0530
@@ -7,17 +7,17 @@
 
 PORTNAME=	irssi-fish
 DISTVERSION=	0.99
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc security
 MASTER_SITES=	http://fish.sekure.us/irssi/
 DISTNAME=	FiSH-irssi.v${DISTVERSION}-source
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	wahjava at gmail.com
 COMMENT=	An encryption plugin for irssi
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glib-2.0/glib.h:${PORTSDIR}/devel/glib20 \
 		${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl \
-		${NONEXISTENT}:${PORTSDIR}/irc/irssi:patch
+		${LOCALBASE}/include/irssi/src/common.h:${PORTSDIR}/irc/irssi
 RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
 
 USE_ZIP=	yes
@@ -25,16 +25,10 @@
 PLIST_FILES=	lib/irssi/modules/libfish.so
 PORTDOCS=	FiSH-irssi.txt FiSH-irssi_History.txt
 
-IRSSI_WRKSRC!=	cd ${.CURDIR}/../irssi && ${MAKE} -V WRKSRC
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 ALL_TARGET=	amd64
-
-.if ${OSVERSION} >= 700042
-BROKEN=		does not compile
-.endif
 .endif
 
 post-patch:
@@ -44,7 +38,7 @@
 		-e 's|-O2|${CFLAGS}|' \
 		-e 's|-shared|-shared -fPIC -DPIC|' \
 		-e 's|[$$][(]HOME[)]/glib-1.2.10|${LOCALBASE}/include/glib-2.0|' \
-		-e 's|[$$][(]HOME[)]/irssi-0.8.9|${IRSSI_WRKSRC}|' \
+		-e 's|[$$][(]HOME[)]/irssi-0.8.9|${LOCALBASE}/include/irssi|' \
 		-e 's|miracl.a|${LOCALBASE}/lib/libmiracl.a|' \
 		-e 's|\@echo \"Press ENTER to continue or CTRL\+C to abort...\"\; read junk||' \
 		${WRKSRC}/Makefile
diff -ruN --exclude=CVS /usr/ports/irc/irssi-fish/files/patch-DH1080.c /home/abbe/ports/irssi-fish/files/patch-DH1080.c
--- /usr/ports/irc/irssi-fish/files/patch-DH1080.c	1970-01-01 05:30:00.000000000 +0530
+++ /home/abbe/ports/irssi-fish/files/patch-DH1080.c	2008-07-15 08:43:01.000000000 +0530
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- DH1080.c.orig
++++ DH1080.c
+@@ -13,6 +13,7 @@
+ 
+ #include <stdio.h>
+ #include <time.h>
++#include <string.h>
+ #include "DH1080.h"
+ 
+ // ### new sophie-germain 1080bit prime number ###
diff -ruN --exclude=CVS /usr/ports/irc/irssi-fish/files/patch-Makefile /home/abbe/ports/irssi-fish/files/patch-Makefile
--- /usr/ports/irc/irssi-fish/files/patch-Makefile	1970-01-01 05:30:00.000000000 +0530
+++ /home/abbe/ports/irssi-fish/files/patch-Makefile	2008-07-15 08:43:01.000000000 +0530
@@ -0,0 +1,18 @@
+
+$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 -ruN --exclude=CVS /usr/ports/irc/irssi-fish/files/patch-SHA-256.c /home/abbe/ports/irssi-fish/files/patch-SHA-256.c
--- /usr/ports/irc/irssi-fish/files/patch-SHA-256.c	1970-01-01 05:30:00.000000000 +0530
+++ /home/abbe/ports/irssi-fish/files/patch-SHA-256.c	2008-07-15 08:43:01.000000000 +0530
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- SHA-256.c.orig
++++ SHA-256.c
+@@ -12,6 +12,7 @@
+  * */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ typedef struct {
+     unsigned int state[8], length, curlen;
diff -ruN --exclude=CVS /usr/ports/irc/irssi-fish/files/patch-base64.c /home/abbe/ports/irssi-fish/files/patch-base64.c
--- /usr/ports/irc/irssi-fish/files/patch-base64.c	1970-01-01 05:30:00.000000000 +0530
+++ /home/abbe/ports/irssi-fish/files/patch-base64.c	2008-07-15 08:43:01.000000000 +0530
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- base64.c.orig
++++ base64.c
+@@ -1,6 +1,9 @@
+ /*
+     Public Base64 conversion tables
+ */
++
++#include <string.h>
++
+ unsigned char B64ABC[]="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ unsigned char b64buf[256];
+ 
diff -ruN --exclude=CVS /usr/ports/irc/irssi-fish/files/patch-blowfish.c /home/abbe/ports/irssi-fish/files/patch-blowfish.c
--- /usr/ports/irc/irssi-fish/files/patch-blowfish.c	1970-01-01 05:30:00.000000000 +0530
+++ /home/abbe/ports/irssi-fish/files/patch-blowfish.c	2008-07-15 08:43:01.000000000 +0530
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- blowfish.c.orig
++++ blowfish.c
+@@ -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])
===> Done

>Release-Note:
>Audit-Trail:
>Unformatted: