From e0b3948127378d3e2fa483584b52eb1fbc756c10 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 1 Nov 2011 06:34:09 +0100
Subject: [PATCH] Ice: install license in proper dir, fixes for x86_64 install.

---
 srcpkgs/Ice/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index c39d3436465..35d8eaddc7b 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,11 +1,12 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.4.2
+revision=1
 homepage="http://www.zeroc.com"
 distfiles="${homepage}/download/Ice/3.4/${pkgname}-${version}.tar.gz"
 short_desc="The Internet Communications Engine (Ice)"
 maintainer="davehome <davehome@redthumb.info.tm>"
-license="GPL, ICE"
+license="GPL-2, ICE"
 checksum=dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979
 long_desc="
  The Internet Communications Engine (Ice) is a modern object-oriented toolkit
@@ -50,9 +51,17 @@ do_build()
 
 do_install()
 {
-	make ${makejobs} prefix=${DESTDIR}/usr install
-	vmkdir usr/share/licenses
+	if [ "$xbps_machine" = "x86_64" ]; then
+		vmkdir usr/lib
+		cd ${DESTDIR}/usr && ln -s lib lib64
+		cd ${wrksrc}
+	fi
+	make prefix=${DESTDIR}/usr install
+	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
+
+	vmkdir usr/share/licenses/${pkgname}
 	mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share
 	rm ${DESTDIR}/usr/LICENSE
-	mv ${DESTDIR}/usr/ICE_LICENSE ${DESTDIR}/usr/share/licenses
+	mv ${DESTDIR}/usr/ICE_LICENSE \
+		${DESTDIR}/usr/share/licenses/${pkgname}/LICENSE
 }