Update to 20150903.

Also, pet portlint by sorting USES and regenerating a patch.

5 files changed, 9 insertions, 29 deletions

diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index 12d5bd1c0470..6e54a2b07bf2 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ircii
-PORTVERSION=	20141122
+PORTVERSION=	20150903
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://ircii.warped.com/
 
@@ -13,7 +13,7 @@ LICENSE=	BSD3CLAUSE
 
 GNU_CONFIGURE=	yes
 DATADIR=	${PREFIX}/share/irc
-USES=		tar:bzip2 iconv
+USES=		iconv tar:bzip2
 
 OPTIONS_DEFINE=	IRCBUG EMACS_KEYS OPENSSL
 OPTIONS_DEFAULT=OPENSSL
diff --git a/irc/ircII/distinfo b/irc/ircII/distinfo
index f469690788d5..8b5f60eb244e 100644
--- a/irc/ircII/distinfo
+++ b/irc/ircII/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ircii-20141122.tar.bz2) = 74c20bbc59d960038b4629c88df2d3f93a7d81a343bc0eaf51ca418ace52d622
-SIZE (ircii-20141122.tar.bz2) = 593290
+SHA256 (ircii-20150903.tar.bz2) = 617502e17788d619510f3f5efc1217e6c9d3a55e8227ece591c56981b0901324
+SIZE (ircii-20150903.tar.bz2) = 601329
diff --git a/irc/ircII/files/patch-configure.in b/irc/ircII/files/patch-configure.in
deleted file mode 100644
index f61cb7d93ba7..000000000000
--- a/irc/ircII/files/patch-configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./configure.in.orig	2014-04-10 10:50:59.524766021 -0500
-+++ ./configure.in	2014-04-10 10:51:21.359765624 -0500
-@@ -882,15 +882,15 @@
- fi
- if test "x$COPY_DIRECTORY" = "xpax";
- then
--    INSTALL_HELP_CMD='cd $(topdir)/help; pax -r -w -s ";.*/CVS$$;;" -s ";.*/\.CVS$$;;" -s ";.*/CVS/.*;;" -s ";.*/\.CVS/.*;;" . $(HELP_DIR)'
-+    INSTALL_HELP_CMD='cd $(topdir)/help; pax -r -w -s ";.*/CVS$$;;" -s ";.*/\.CVS$$;;" -s ";.*/CVS/.*;;" -s ";.*/\.CVS/.*;;" . $(DESTDIR)$(HELP_DIR)'
- else
-     if test "x$COPY_DIRECTORY" = "xtar";
-     then
--	INSTALL_HELP_CMD='cd $(topdir)/help; tar -cf - . | ( cd $(HELP_DIR); tar -xf - )'
-+	INSTALL_HELP_CMD='cd $(topdir)/help; tar -cf - . | ( cd $(DESTDIR)$(HELP_DIR); tar -xf - )'
-     else
- 	if test "x$COPY_DIRECTORY" = "xcpio";
- 	then
--	    INSTALL_HELP_CMD='cd $(topdir)/help; find . -print | cpio -pdu $(HELP_DIR)'
-+	    INSTALL_HELP_CMD='cd $(topdir)/help; find . -print | cpio -pdu $(DESTDIR)$(HELP_DIR)'
- 	else
- 	    INSTALL_HELP_CMD="@echo \"I couldn't figure out a way to install the help files.\""
- 	fi
diff --git a/irc/ircII/files/patch-source_mksiginc.c b/irc/ircII/files/patch-source_mksiginc.c
index f67243140662..de64e94214ba 100644
--- a/irc/ircII/files/patch-source_mksiginc.c
+++ b/irc/ircII/files/patch-source_mksiginc.c
@@ -1,6 +1,6 @@
---- source/mksiginc.c.orig	2011-07-05 19:26:18.000000000 -0400
-+++ source/mksiginc.c	2011-07-05 19:27:39.000000000 -0400
-@@ -39,7 +39,11 @@ IRCII_RCSID("@(#)$eterna: mksiginc.c,v 1
+--- source/mksiginc.c.orig	2014-03-17 20:38:51 UTC
++++ source/mksiginc.c
+@@ -35,7 +35,11 @@ IRCII_RCSID("@(#)$eterna: mksiginc.c,v 1
  #define NSIG 64
  #endif
  
@@ -11,4 +11,4 @@
 +#endif
  char *signames[MY_MAXSIG];
  
- int main(int, char *[], char *[]);
+ int main(int, char *[]);
diff --git a/irc/ircII/pkg-plist b/irc/ircII/pkg-plist
index 9aab8032a434..ce34ef1da45b 100644
--- a/irc/ircII/pkg-plist
+++ b/irc/ircII/pkg-plist
@@ -573,6 +573,7 @@ man/man1/ircII.1.gz
 %%DATADIR%%/script/newaway
 %%DATADIR%%/script/newformat
 %%DATADIR%%/script/nicks
+%%DATADIR%%/script/nicksearch
 %%DATADIR%%/script/nocolour
 %%DATADIR%%/script/oldping
 %%DATADIR%%/script/oper