From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 components/ircii/ircii.p5m |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/ircii/ircii.p5m b/components/ircii/ircii.p5m
index 97ed6f9..bef82b6 100644
--- a/components/ircii/ircii.p5m
+++ b/components/ircii/ircii.p5m
@@ -28,7 +28,8 @@
 set name=pkg.description \
     value="A terminal-based IRC client that runs under most unix platforms."
 set name=pkg.human-version value=$(COMPONENT_VERSION)
-set name=com.oracle.info.description value="the ircii Internet Relay Chat Client"
+set name=com.oracle.info.description \
+    value="the ircii Internet Relay Chat Client"
 set name=com.oracle.info.tpno value=12675
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
@@ -36,8 +37,8 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2008/373
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file usr/bin/irc-$(COMPONENT_VERSION) path=usr/bin/irc
-file path=usr/bin/ircflush
+file usr/bin/$(MACH64)/irc-$(COMPONENT_VERSION) path=usr/bin/irc
+file usr/bin/$(MACH64)/ircflush path=usr/bin/ircflush
 file path=usr/bin/ircio
 file path=usr/bin/wserv
 file path=usr/share/irc/help/!

--
Gitblit v1.9.3