diff --git a/srcpkgs/Ice/libIce.template b/srcpkgs/Ice/libIce.template index 6088653c3c..535704e5f4 100644 --- a/srcpkgs/Ice/libIce.template +++ b/srcpkgs/Ice/libIce.template @@ -5,9 +5,8 @@ long_desc="${long_desc} This package contains the Ice runtime libraries." -revision=2 +revision=3 -do_install() -{ +do_install() { vmove usr/lib usr } diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 49261816ce..b5a01f8abd 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,7 +1,7 @@ # Template file for 'Ice' pkgname=Ice version=3.4.2 -revision=3 +revision=4 homepage="http://www.zeroc.com" distfiles="${homepage}/download/Ice/3.4/${pkgname}-${version}.tar.gz" short_desc="The Internet Communications Engine (Ice)" @@ -23,28 +23,24 @@ subpackages="lib$pkgname $pkgname-devel" wrksrc=${pkgname}-${version}/cpp # XXX: other language bindings -Add_dependency build libstdc++-devel -Add_dependency build openssl-devel Add_dependency build bzip2-devel Add_dependency build mcpp-devel Add_dependency build db-devel Add_dependency build expat-devel +Add_dependency build openssl-devel -do_configure() -{ +do_configure() { sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules sed -i '/^embedded_runpath_prefix*/d' config/Make.rules sed -i -e "s|test demo||" Makefile } -do_build() -{ +do_build() { make prefix=/usr ${makejobs} } -do_install() -{ +do_install() { if [ "$XBPS_MACHINE" = "x86_64" ]; then vmkdir usr/lib cd ${DESTDIR}/usr && ln -s lib lib64