diff options
| author | Beech Rintoul <beech@FreeBSD.org> | 2008-07-18 00:46:11 +0000 |
|---|---|---|
| committer | Beech Rintoul <beech@FreeBSD.org> | 2008-07-18 00:46:11 +0000 |
| commit | 683ad272183443d5979aa749c068060527d38a15 (patch) | |
| tree | eee70ae35a3025d432fc187d5201a9be450707b0 /irc/irssi-fish | |
| parent | e38f60b9177d75d0c556afb87aec664506550081 (diff) | |
| download | ports-683ad272183443d5979aa749c068060527d38a15.tar.gz ports-683ad272183443d5979aa749c068060527d38a15.zip | |
- Unbreak on >7.x
- Fix build
- Bump portrevision
- Pass maintainership to submitter
PR: ports/125622
Submitted by: Ashish Shukla <wahjava@gmail.com>
Notes
Notes:
svn path=/head/; revision=217002
Diffstat (limited to 'irc/irssi-fish')
| -rw-r--r-- | irc/irssi-fish/Makefile | 17 | ||||
| -rw-r--r-- | irc/irssi-fish/files/patch-DH1080.c | 10 | ||||
| -rw-r--r-- | irc/irssi-fish/files/patch-Makefile | 18 | ||||
| -rw-r--r-- | irc/irssi-fish/files/patch-SHA-256.c | 10 | ||||
| -rw-r--r-- | irc/irssi-fish/files/patch-base64.c | 12 | ||||
| -rw-r--r-- | irc/irssi-fish/files/patch-blowfish.c | 9 |
6 files changed, 65 insertions, 11 deletions
diff --git a/irc/irssi-fish/Makefile b/irc/irssi-fish/Makefile index 888fbf9f2a25..817b6661a122 100644 --- a/irc/irssi-fish/Makefile +++ b/irc/irssi-fish/Makefile @@ -7,44 +7,39 @@ 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@FreeBSD.org +MAINTAINER= wahjava@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 +USE_LDCONFIG= yes 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: - @${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -E -e 's|
||' {} \; + @${FIND} ${WRKSRC} -type f -exec ${REINPLACE_CMD} -E -e 's|||' {} \; @${REINPLACE_CMD} -E \ -e 's|gcc|${CC}|' \ -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 --git a/irc/irssi-fish/files/patch-DH1080.c b/irc/irssi-fish/files/patch-DH1080.c new file mode 100644 index 000000000000..edfd835bb3f0 --- /dev/null +++ b/irc/irssi-fish/files/patch-DH1080.c @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..7294137d3a81 --- /dev/null +++ b/irc/irssi-fish/files/patch-Makefile @@ -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 --git a/irc/irssi-fish/files/patch-SHA-256.c b/irc/irssi-fish/files/patch-SHA-256.c new file mode 100644 index 000000000000..e93b5fdabcdb --- /dev/null +++ b/irc/irssi-fish/files/patch-SHA-256.c @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 000000000000..91312cc2529a --- /dev/null +++ b/irc/irssi-fish/files/patch-base64.c @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..95f2298b4ebf --- /dev/null +++ b/irc/irssi-fish/files/patch-blowfish.c @@ -0,0 +1,9 @@ +--- 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])
|