From f3487a2a7e2c1a4fb6b2f96c752fc18298430eb8 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 3 Aug 2016 16:14:54 +0200 Subject: [PATCH] sys-apps/openrc: bump to 0.21.3 --- ...-fix-hardcoded-pkg-config-invocation.patch | 39 ------------------- ...21.2.exheres-0 => openrc-0.21.3.exheres-0} | 4 -- 2 files changed, 43 deletions(-) delete mode 100644 packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch rename packages/sys-apps/openrc/{openrc-0.21.2.exheres-0 => openrc-0.21.3.exheres-0} (97%) diff --git a/packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch b/packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch deleted file mode 100644 index 1b7f8d4f..00000000 --- a/packages/sys-apps/openrc/files/0001-Build-fix-hardcoded-pkg-config-invocation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6d1b6a0de0a6d6af45dd816d29f9ab117257289d Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Wed, 29 Jun 2016 14:27:37 +0200 -Subject: [PATCH] Build: fix hardcoded pkg-config invocation -Upstream: pending, https://github.com/OpenRC/openrc/pull/89 - ---- - mk/sys.mk | 1 + - mk/termcap.mk | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/mk/sys.mk b/mk/sys.mk -index 948ec1d..47d9526 100644 ---- a/mk/sys.mk -+++ b/mk/sys.mk -@@ -11,6 +11,7 @@ - - AR?= ar - CP?= cp -+PKG_CONFIG?= pkg-config - ECHO?= echo - INSTALL?= install - RANLIB?= ranlib -diff --git a/mk/termcap.mk b/mk/termcap.mk -index 2d6ad01..4890e35 100644 ---- a/mk/termcap.mk -+++ b/mk/termcap.mk -@@ -1,6 +1,6 @@ - ifeq (${MKTERMCAP},ncurses) --TERMCAP_CFLAGS:= $(shell pkg-config ncurses --cflags 2> /dev/null) --LTERMCAP:= $(shell pkg-config ncurses --libs 2> /dev/null) -+TERMCAP_CFLAGS:= $(shell ${PKG_CONFIG} ncurses --cflags 2> /dev/null) -+LTERMCAP:= $(shell ${PKG_CONFIG} ncurses --libs 2> /dev/null) - ifeq ($(LTERMCAP),) - LIBTERMCAP?= -lncurses - else --- -2.9.0 - diff --git a/packages/sys-apps/openrc/openrc-0.21.2.exheres-0 b/packages/sys-apps/openrc/openrc-0.21.3.exheres-0 similarity index 97% rename from packages/sys-apps/openrc/openrc-0.21.2.exheres-0 rename to packages/sys-apps/openrc/openrc-0.21.3.exheres-0 index 2e5a281e..b9e915b4 100644 --- a/packages/sys-apps/openrc/openrc-0.21.2.exheres-0 +++ b/packages/sys-apps/openrc/openrc-0.21.3.exheres-0 @@ -64,10 +64,6 @@ DEFAULT_SRC_INSTALL_PARAMS=( LIBMODE=0755 ) -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/0001-Build-fix-hardcoded-pkg-config-invocation.patch -) - pkg_setup() { exdirectory --allow /etc/sysctl.d }