- update to 0.98

- take maintainership

irc/xchat-fish/Makefile

@@ -6,14 +6,13 @@
 #    $MCom: ports/irc/xchat-fish/Makefile,v 1.1 2006/10/04 22:30:07 ahze Exp $
 
 PORTNAME=	fish
-DISTVERSION=	0.97a
+DISTVERSION=	0.98
-PORTREVISION=	2
 CATEGORIES=	irc security
 MASTER_SITES=	http://fish.sekure.us/xchat/
 PKGNAMEPREFIX=	xchat-
-DISTNAME=	FiSH-xchat.v${DISTVERSION}-source
+DISTNAME=	FiSH-XChat.v${DISTVERSION}-source
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An encryption plugin for XChat
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl
@@ -21,34 +20,24 @@ RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
-
-#
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+CCFLAGS+=	-Wall -O2 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_ENV+=	CCFLAGS="${CCFLAGS}"
+MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-PLIST_FILES=	\
+PLIST_FILES=	lib/xchat/plugins/xfish.so
-		lib/xchat/plugins/xfish.so
+PORTDOCS=	FiSH-xchat.txt \
-
-PORTDOCS=	\
-		FiSH-xchat.txt \
 		FiSH-xchat_History.txt
 
 post-patch:
+	@${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/
+	@${RM} -f ${WRKSRC}/mir*
 # \r\n -> \n
 	@${FIND} ${WRKSRC} -type f -exec \
 		${REINPLACE_CMD} -E \
 		-e 's|
||' \
 		{} \;
-# CC safeness
-# CFLAGS safeness
-	@${REINPLACE_CMD} -E \
-		-e 's|gcc|${CC}|' \
-		-e 's|-O2|${CFLAGS}|' \
-		-e 's|-shared|-shared -fPIC -DPIC|' \
-		-e 's|miracl.a|${LOCALBASE}/lib/libmiracl.a|' \
-		${WRKSRC}/make*
-
-do-build:
-	@cd ${WRKSRC} && ${SH} ./make_all
 
 do-install:
 # docs
@@ -56,12 +45,12 @@ do-install:
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} \
-		${DOCSDIR}
+		${DOCSDIR}/
 .endfor
 .endif
 # plugin
 	@${MKDIR} ${PREFIX}/lib/xchat/plugins
 	@${INSTALL_PROGRAM} ${WRKSRC}/xfish.so \
-		${PREFIX}/lib/xchat/plugins
+		${PREFIX}/lib/xchat/plugins/
 
 .include <bsd.port.mk>

irc/xchat-fish/distinfo

@@ -1,3 +1,3 @@
-MD5 (FiSH-xchat.v0.97a-source.zip) = 8a084404116faef27ba081ad1d2004e7
+MD5 (FiSH-XChat.v0.98-source.zip) = c24b36f034c5fe04955e3a5beaf50a2b
-SHA256 (FiSH-xchat.v0.97a-source.zip) = 5264fb1d63010f9f709d2ff48334d1cb3e8e258302b9abd5af3275e7e7ef74dd
+SHA256 (FiSH-XChat.v0.98-source.zip) = a065ace34c5a59cf51c194d9ac6aa5c8f00241488df38345e88174f5f345ecd6
-SIZE (FiSH-xchat.v0.97a-source.zip) = 43088
+SIZE (FiSH-XChat.v0.98-source.zip) = 50332

irc/xchat-fish/files/Makefile

@@ -0,0 +1,18 @@
+# Makefile
+# $FreeBSD$
+
+CC?= cc
+CFLAGS?= -O2 -Wall
+CCFLAGS+= $(CFLAGS) -shared -fPIC -DPIC
+LDFLAGS+= -export-dynamic -shared
+LIBS?=
+
+all:
+	$(CC) $(CCFLAGS) -c SHA-256.c
+	$(CC) $(CCFLAGS) -c base64.c
+	$(CC) $(CCFLAGS) -c blowfish.c
+	$(CC) $(CCFLAGS) -c cfgopts.c
+	$(CC) $(CCFLAGS) -c DH1080.c
+	$(CC) $(CCFLAGS) -c FiSH.c
+	$(CC) $(LDFLAGS) -o xfish.so FiSH.o SHA-256.o base64.o blowfish.o cfgopts.o DH1080.o -lmiracl ${LIBS}
+

irc/xchat-fish/files/patch-FiSH.c

@@ -0,0 +1,10 @@
+--- FiSH.c.orig	2006-03-15 22:17:58.000000000 +0100
++++ FiSH.c	2008-03-29 17:27:33.000000000 +0100
+@@ -4,6 +4,7 @@
+ 
+ 
+ #include "xchat-plugin.h"
++#include <ctype.h>
+ #include "FiSH.h"
+ 
+ static xchat_plugin *ph=0;   // plugin handle