[Midnightbsd-cvs] mports [17004] update patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Sep 11 22:48:53 EDT 2014
Revision: 17004
http://svnweb.midnightbsd.org/mports/?rev=17004
Author: laffer1
Date: 2014-09-11 22:48:53 -0400 (Thu, 11 Sep 2014)
Log Message:
-----------
update patches
Modified Paths:
--------------
trunk/irc/irssi/Makefile
Added Paths:
-----------
trunk/irc/irssi/files/patch-configure
trunk/irc/irssi/files/patch-core-network_openssl_c
Removed Paths:
-------------
trunk/irc/irssi/files/patch-aa
Property Changed:
----------------
trunk/irc/irssi/files/patch-Makefile.in
trunk/irc/irssi/files/patch-perl-Makefile
Modified: trunk/irc/irssi/Makefile
===================================================================
--- trunk/irc/irssi/Makefile 2014-09-12 02:29:00 UTC (rev 17003)
+++ trunk/irc/irssi/Makefile 2014-09-12 02:48:53 UTC (rev 17004)
@@ -2,25 +2,27 @@
PORTNAME= irssi
PORTVERSION= 0.8.16
+PORTREVISION= 1
CATEGORIES?= irc
MASTER_SITES= http://mirror.irssi.org/
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A modular IRC client with many features
+COMMENT= Modular IRC client with many features
LICENSE= gpl2
LIB_DEPENDS= glib-2:${PORTSDIR}/devel/glib20
-USES= gmake pkgconfig ncurses tar:bzip2
+USES= gmake pkgconfig ncurses tar:bzip2 libtool
USE_SSP= yes
GNU_CONFIGURE= yes
-WANT_PERL= yes
-OPTIONS_DEFINE= PERL PROXY SOCKS IPV6 BOT
+CONFIGURE_ARGS= --with-ncurses=${NCURSESBASE}
+
+OPTIONS_DEFINE= PERL PROXY SOCKS IPV6 BOT DOCS
SOCKS_DESC= Socks proxy support
BOT_DESC= Bot support
-OPTIONS_DEFAULT= PERL IPV6
+OPTIONS_DEFAULT= PERL IPV6 DOCS
# USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema
# for WITH_SSL option
@@ -72,6 +74,12 @@
@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e 's|/etc|${PREFIX}&|' \
${WRKSRC}/docs/irssi.1
+.if empty(PORT_OPTIONS:MDOCS)
+ ${REINPLACE_CMD} -e \
+ '/^install-data-am:/ s|install-docDATA||' \
+ ${WRKSRC}/docs/Makefile.in
+.endif
+
post-configure:
@${MV} ${WRKSRC}/irssi.conf ${WRKSRC}/irssi.conf.sample
Index: trunk/irc/irssi/files/patch-Makefile.in
===================================================================
--- trunk/irc/irssi/files/patch-Makefile.in 2014-09-12 02:29:00 UTC (rev 17003)
+++ trunk/irc/irssi/files/patch-Makefile.in 2014-09-12 02:48:53 UTC (rev 17004)
Property changes on: trunk/irc/irssi/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
Deleted: trunk/irc/irssi/files/patch-aa
===================================================================
--- trunk/irc/irssi/files/patch-aa 2014-09-12 02:29:00 UTC (rev 17003)
+++ trunk/irc/irssi/files/patch-aa 2014-09-12 02:48:53 UTC (rev 17004)
@@ -1,20 +0,0 @@
---- src/irc/core/irc.c.orig Fri Oct 10 17:30:03 2003
-+++ src/irc/core/irc.c Sat Dec 27 22:20:56 2003
-@@ -108,9 +108,14 @@
- int send_now;
-
- g_get_current_time(&now);
-- send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
-- (server->cmdcount < server->max_cmds_at_once ||
-- server->cmd_queue_speed <= 0);
-+
-+ if (getenv("IRSSI_NOTHROTTLE")) {
-+ send_now = TRUE;
-+ } else {
-+ send_now = g_timeval_cmp(&now, &server->wait_cmd) >= 0 &&
-+ (server->cmdcount < server->max_cmds_at_once ||
-+ server->cmd_queue_speed <= 0);
-+ }
-
- irc_send_cmd_full(server, cmd, send_now, FALSE, FALSE);
- }
Added: trunk/irc/irssi/files/patch-configure
===================================================================
--- trunk/irc/irssi/files/patch-configure (rev 0)
+++ trunk/irc/irssi/files/patch-configure 2014-09-12 02:48:53 UTC (rev 17004)
@@ -0,0 +1,19 @@
+--- configure.orig 2010-04-04 00:21:26.000000000 +0800
++++ configure 2013-10-21 22:33:39.000000000 +0800
+@@ -12982,12 +12982,12 @@ if test "${with_ncurses+set}" = set; the
+
+ if $search_ncurses
+ then
+- if test -f $withval/include/ncurses.h
++ if test -f $withval/include/ncurses/ncurses.h
+ then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found ncurses on $withval/include/ncurses.h" >&5
+-$as_echo "Found ncurses on $withval/include/ncurses.h" >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found ncurses on $withval/include/ncurses/ncurses.h" >&5
++$as_echo "Found ncurses on $withval/include/ncurses/ncurses.h" >&6; }
+
+- CURSES_LIBS="-L$withval/lib -lncurses"
++ CURSES_LIBS="-L$withval/lib -lncurses -ltinfo"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
+ $as_echo_n "checking for initscr in -lncurses... " >&6; }
+ if test "${ac_cv_lib_ncurses_initscr+set}" = set; then :
Copied: trunk/irc/irssi/files/patch-core-network_openssl_c (from rev 16976, trunk/irc/irssi/files/patch-aa)
===================================================================
--- trunk/irc/irssi/files/patch-core-network_openssl_c (rev 0)
+++ trunk/irc/irssi/files/patch-core-network_openssl_c 2014-09-12 02:48:53 UTC (rev 17004)
@@ -0,0 +1,10 @@
+--- src/core/network-openssl.c.orig 2010-04-03 17:32:04.000000000 +0000
++++ src/core/network-openssl.c 2010-04-03 17:37:34.000000000 +0000
+@@ -406,6 +406,7 @@
+ g_error("Could not allocate memory for SSL context");
+ return NULL;
+ }
++ SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
+
+ if (mycert && *mycert) {
+ char *scert = NULL, *spkey = NULL;
Index: trunk/irc/irssi/files/patch-perl-Makefile
===================================================================
--- trunk/irc/irssi/files/patch-perl-Makefile 2014-09-12 02:29:00 UTC (rev 17003)
+++ trunk/irc/irssi/files/patch-perl-Makefile 2014-09-12 02:48:53 UTC (rev 17004)
Property changes on: trunk/irc/irssi/files/patch-perl-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.1.1
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list