diff --git a/srcpkgs/procps-ng/files/sysctl.conf b/srcpkgs/procps-ng/files/sysctl.conf deleted file mode 100644 index fae2c608203..00000000000 --- a/srcpkgs/procps-ng/files/sysctl.conf +++ /dev/null @@ -1,38 +0,0 @@ -# Configuration file for runtime kernel parameters. -# See sysctl.conf(5) for more information. - -# Have the CD-ROM close when you use it, and open when you are done. -#dev.cdrom.autoclose = 1 -#dev.cdrom.autoeject = 1 - -# Protection from the SYN flood attack. -net.ipv4.tcp_syncookies = 1 - -# See evil packets in your logs. -#net.ipv4.conf.all.log_martians = 1 - -# Never accept redirects or source routes (these are only useful for routers). -#net.ipv4.conf.all.accept_redirects = 0 -#net.ipv4.conf.all.accept_source_route = 0 -#net.ipv6.conf.all.accept_redirects = 0 -#net.ipv6.conf.all.accept_source_route = 0 - -# Disable packet forwarding. -net.ipv4.ip_forward = 0 -net.ipv6.conf.all.forwarding = 0 - -# Tweak the port range used for outgoing connections. -#net.ipv4.ip_local_port_range = 32768 61000 - -# Tweak those values to alter disk syncing and swap behavior. -#vm.vfs_cache_pressure = 100 -#vm.laptop_mode = 0 -#vm.swappiness = 60 - -# Tweak how the flow of kernel messages is throttled. -#kernel.printk_ratelimit_burst = 10 -#kernel.printk_ratelimit = 5 - -# Reboot 600 seconds after kernel panic or oops. -#kernel.panic_on_oops = 1 -#kernel.panic = 600 diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index 73f1123bf16..c75117591fc 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,63 +1,33 @@ # Template file for 'procps-ng' pkgname=procps-ng -version=3.3.8 +version=3.3.9 revision=1 +build_style=gnu-configure +configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin + --libdir=/usr/lib --disable-static --with-systemd + ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes + ac_cv_func_strtod=yes ac_cv_func_mmap_fixed_mapped=yes" +hostmakedepends="pkg-config" +makedepends="ncurses-devel systemd-devel" short_desc="Utilities for monitoring your system and its processes" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://gitorious.org/procps" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/Production/${pkgname}-${version}.tar.xz" +checksum=00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 - -hostmakedepends="libtool automake gettext-devel pkg-config" -makedepends="ncurses-devel" - -do_fetch() { - git clone git://gitorious.org/procps/procps.git \ - -b v${version} ${pkgname}-${version} -} - -do_configure() { - echo ${version} > .tarball-version - ./autogen.sh - - ./configure ${configure_args} --exec-prefix=/ \ - --prefix=/usr --libdir=/usr/lib --disable-static \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_strtod=yes ac_cv_func_mmap_fixed_mapped=yes -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install - - vinstall ${FILESDIR}/sysctl.conf 644 etc - +post_install() { # provided by util-linux - rm ${DESTDIR}/bin/kill + rm ${DESTDIR}/usr/bin/kill rm ${DESTDIR}/usr/share/man/man1/kill.1 - vmkdir usr/bin - vmkdir usr/sbin - mv ${DESTDIR}/bin/* ${DESTDIR}/usr/bin - mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin - - # Create pidof symlink. - ln -sfr ${DESTDIR}/usr/bin/pgrep ${DESTDIR}/usr/bin/pidof - # Remove devel and docs. rm -rf ${DESTDIR}/usr/share/doc \ ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig - + rm -f ${DESTDIR}/usr/lib/*.so } procps-ng_package() { - conf_files="/etc/sysctl.conf" - replaces="procps>=0" - provides="procps-${version}" conflicts="coreutils<8.21_3" pkg_install() { vmove all