--- a/components/ircii/Makefile	Tue Feb 26 13:41:15 2013 -0800
+++ b/components/ircii/Makefile	Tue Feb 26 14:46:18 2013 -0800
@@ -20,20 +20,20 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		ircii
-COMPONENT_VERSION=	20060725
-IPS_COMPONENT_VERSION=  0.2006.7.25
+COMPONENT_VERSION=	20111115
+IPS_COMPONENT_VERSION=  0.2011.11.15
 COMPONENT_PROJECT_URL=	http://www.eterna.com.au/ircii/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:09c5840cbf9a060acd4f57a24eb4bbacd7c3fba52986a356ffebad736b961dfe
-COMPONENT_ARCHIVE_URL=	ftp://ircii.warped.com/pub/ircII/old/$(COMPONENT_ARCHIVE)
+    sha256:629a0a335c790aa5fa9f327532d1d45fd37d2fcd1902e8b0ee28b51994dcf604
+COMPONENT_ARCHIVE_URL=	ftp://ircii.warped.com/pub/ircII/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/ircii
 
 include ../../make-rules/prep.mk
@@ -49,6 +49,18 @@
 CONFIGURE_OPTIONS       += --bindir=$(CONFIGURE_BINDIR.$(BITS))
 CONFIGURE_OPTIONS       += $(CONFIGURE_OPTIONS.$(BITS))
 
+# The ircio and wserv are now installed in the libexecdir, which by
+# default is /usr/libexec. We want to install them under /usr/bin.
+# One would think that you could just set --libexecdir=/usr/bin but no.
+# The configure script has some logic that just blindly resets it back
+# to /usr/libexec. This problem has been reported to the ircii maintainer.
+#
+# This action modifies the libexecdir setting in the Makefile to /usr/bin
+COMPONENT_POST_CONFIGURE_ACTION = \
+	$(GSED) -i -e 's|/usr/libexec|/usr/bin|' $(BUILD_DIR_32)/Makefile
+
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
 build:		$(BUILD_32)