[Lunar-commits] <moonbase> libpciaccess, xproto: libpciaccess sources x11r7.rc and thus needs to depend on xproto. Adjusted xproto to use ld_add/ld_remove.

[Moritz Heiber]

commit f9c42763436816890fb66af4d18c109c73e314f4
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Mon Sep 14 16:23:38 2009 +0200

    libpciaccess, xproto: libpciaccess sources x11r7.rc and thus needs
    to depend on xproto. Adjusted xproto to use ld_add/ld_remove.
---
 xorg7/lib/libpciaccess/DEPENDS  |    1 +
 xorg7/proto/xproto/POST_INSTALL |   13 +++++--------
 xorg7/proto/xproto/POST_REMOVE  |    3 +++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/xorg7/lib/libpciaccess/DEPENDS b/xorg7/lib/libpciaccess/DEPENDS
new file mode 100644
index 0000000..af131c9
--- /dev/null
+++ b/xorg7/lib/libpciaccess/DEPENDS
@@ -0,0 +1 @@
+depends xproto
diff --git a/xorg7/proto/xproto/POST_INSTALL b/xorg7/proto/xproto/POST_INSTALL
index 43085a0..10732fe 100644
--- a/xorg7/proto/xproto/POST_INSTALL
+++ b/xorg7/proto/xproto/POST_INSTALL
@@ -1,15 +1,12 @@
 # Make sure its inside ld.so.conf
 
-if ! grep -q "${MODULE_PREFIX}/lib" /etc/ld.so.conf ; then
-  echo "${MODULE_PREFIX}/lib" >> /etc/ld.so.conf;
-  ldconfig
-fi &&
+ld_add "${MODULE_PREFIX}/lib" &&
 
 if [ $(readlink -f /usr/X11R6) != "${MODULE_PREFIX}" ] ; then
   rm -rf /usr/X11R6;
   ln -sf "${MODULE_PREFIX}" /usr/X11R6;
   message "Set symlink for /usr/X11R6";
-fi
+fi &&
 
 # We need those three symlinks. They are making sure a lot of apps
 # don't brake
@@ -25,21 +22,21 @@ if [ -h /usr/include/X11 ] && [ $(readlink -f /usr/include/X11) != "${MODULE_PRE
   mkdir -p "${MODULE_PREFIX}/include/X11";
   ln -sf "${MODULE_PREFIX}/include/X11" /usr/include/X11;
   message "Include symlink adjusted"
-fi
+fi &&
 
 if [ -h /usr/lib/X11 ] && [ $(readlink -f /usr/lib/X11) != "${MODULE_PREFIX}/lib/X11" ]; then
   rm -f /usr/lib/X11;
   mkdir -p "${MODULE_PREFIX}/lib/X11";
   ln -sf "${MODULE_PREFIX}/lib/X11" /usr/lib/X11;
   message "Lib symlink adjusted";
-fi
+fi &&
 
 if [ -h /usr/include/GL ] && [ $(readlink -f /usr/include/GL) != "${MODULE_PREFIX}/include/GL" ]; then
   rm -f /usr/include/GL;
   mkdir -p "${MODULE_PREFIX}/include/GL";
   ln -sf "${MODULE_PREFIX}/include/GL" /usr/include/GL;
   message "include/GL symlink adjusted";
-fi
+fi &&
 
 if [ -h /usr/lib/GL ] && [ $(readlink -f /usr/lib/GL) != "${MODULE_PREFIX}/lib/GL" ]; then
   rm -f /usr/lib/GL;
diff --git a/xorg7/proto/xproto/POST_REMOVE b/xorg7/proto/xproto/POST_REMOVE
new file mode 100644
index 0000000..c00d5da
--- /dev/null
+++ b/xorg7/proto/xproto/POST_REMOVE
@@ -0,0 +1,3 @@
+# Remove ldconfig entry
+
+ld_remove "${MODULE_PREFIX}/lib"