From 80e7526577be073de31d285d0e0d71c79412e7db Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Apr 2010 12:53:52 +0200 Subject: [PATCH] OpenRC: move so symlink into main pkg. --HG-- extra : convert_revision : a5b2a4e1cf14f0c10064c4dee44a6559c5337e11 --- srcpkgs/OpenRC/OpenRC-devel.template | 3 ++- srcpkgs/OpenRC/template | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/OpenRC/OpenRC-devel.template b/srcpkgs/OpenRC/OpenRC-devel.template index ece94ce1aa..b7b317a2b3 100644 --- a/srcpkgs/OpenRC/OpenRC-devel.template +++ b/srcpkgs/OpenRC/OpenRC-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run glibc-devel Add_dependency run OpenRC @@ -12,7 +14,6 @@ do_install() { mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/lib ${DESTDIR}/usr/share/man mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/lib/lib*.so ${DESTDIR}/lib mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man diff --git a/srcpkgs/OpenRC/template b/srcpkgs/OpenRC/template index ef0b4f4436..a6b0e4a61a 100644 --- a/srcpkgs/OpenRC/template +++ b/srcpkgs/OpenRC/template @@ -1,7 +1,7 @@ # Template file for 'OpenRC' pkgname=OpenRC version=0.6.0 -revision=2 +revision=3 wrksrc=openrc-${version} distfiles="http://roy.marples.name/downloads/openrc/openrc-$version.tar.bz2" build_style=gnu_makefile @@ -27,9 +27,13 @@ subpackages="$pkgname-devel" Add_dependency full glibc Add_dependency full psmisc Add_dependency full sysvinit +Add_dependency build diffutils pre_build() { + # Use cmp(1) from diffutils. + export PATH="/usr/bin:$PATH" + # Install the "locale" service cp ${FILESDIR}/locale.rc ${wrksrc}/init.d/locale.in @@ -54,4 +58,7 @@ post_install() for f in 0 1 2 3 4 5 6; do cd ${DESTDIR}/etc/init.d && ln -s fake-rc.d rc${f}.d done + + chmod 755 ${DESTDIR}/lib/lib* + chmod 755 ${DESTDIR}/usr/lib/lib* }