Improve SYSCONFDIR patch.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 32 insertions, 9 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 528a3d8355d5..be754f0b18d0 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.8 2012/05/06 12:46:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.9 2012/05/06 13:38:45 chithanh Exp $
+
+  06 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  files/gnuradio-3.6.0-cmake-sysconfdir.patch, gnuradio-3.6.0.ebuild:
+  Improve SYSCONFDIR patch.
 
   06 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnuradio-3.6.0.ebuild:
diff --git a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
index 02f94b32d57f..337a356485ca 100644
--- a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
+++ b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
@@ -1,3 +1,24 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/CMakeLists.txt	2012-05-06 15:22:01.000000000 +0200
+@@ -107,6 +107,8 @@
+ set(GR_LIBEXEC_DIR      libexec)
+ set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
+ set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
++set(SYSCONFDIR          "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
++set(GR_PREFSDIR         ${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d)
+ 
+ ########################################################################
+ # Variables replaced when configuring the package config files
+@@ -115,6 +117,8 @@
+ file(TO_NATIVE_PATH "\${prefix}"                        exec_prefix)
+ file(TO_NATIVE_PATH "\${exec_prefix}/${GR_LIBRARY_DIR}" libdir)
+ file(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}"      includedir)
++file(TO_NATIVE_PATH "${SYSCONFDIR}"                     SYSCONFDIR)
++file(TO_NATIVE_PATH "${GR_PREFSDIR}"                    GR_PREFSDIR)
+ 
+ ########################################################################
+ # Create uninstall target
 diff -ur a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
 --- a/gnuradio-core/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
 +++ b/gnuradio-core/CMakeLists.txt	2012-05-05 20:05:52.000000000 +0200
@@ -12,19 +33,17 @@ diff -ur a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
  
 diff -ur a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
 --- a/gnuradio-core/src/lib/general/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/gnuradio-core/src/lib/general/CMakeLists.txt	2012-05-05 21:14:44.000000000 +0200
-@@ -48,8 +48,9 @@
++++ b/gnuradio-core/src/lib/general/CMakeLists.txt	2012-05-06 15:01:12.000000000 +0200
+@@ -48,9 +48,6 @@
  
  message(STATUS "Loading version ${VERSION} into gr_constants...")
  
 -file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
 -file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
-+set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
-+file(TO_NATIVE_PATH "${SYSCONFDIR}"     SYSCONFDIR)
-+file(TO_NATIVE_PATH "${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d" GR_PREFSDIR)
- 
+-
  #double escape for windows backslash path separators
  string(REPLACE "\\" "\\\\" prefix ${prefix})
+ string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
 diff -ur a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
 --- a/gr-audio/lib/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
 +++ b/gr-audio/lib/CMakeLists.txt	2012-05-05 20:06:08.000000000 +0200
diff --git a/net-wireless/gnuradio/gnuradio-3.6.0.ebuild b/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
index 73cff3ef1f2d..3ae87b7ef374 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.0.ebuild,v 1.2 2012/05/06 12:46:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.0.ebuild,v 1.3 2012/05/06 13:38:45 chithanh Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
+# Add support for custom SYSCONFDIR, upstream bug #492
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.patch
 )
@@ -93,7 +94,6 @@ src_configure() {
 		-DENABLE_GR_CORE=ON
 		-DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5
 		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DGR_PREFSDIR="${EPREFIX}"/etc/${PN}/conf.d
 	)
 	cmake-utils_src_configure
 }