Magellan Linux

Diff of /smage/trunk/core/slim/slim-1.3.2-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1103 by niro, Wed Jan 26 00:09:09 2011 UTC revision 1203 by niro, Sat Jan 29 00:08:41 2011 UTC
# Line 10  STATE="unstable" Line 10  STATE="unstable"
10  DESCRIPTION="SLiM is a Desktop-independent graphical login manager for X11."  DESCRIPTION="SLiM is a Desktop-independent graphical login manager for X11."
11  HOMEPAGE="http://slim.berlios.de/"  HOMEPAGE="http://slim.berlios.de/"
12    
13  DEPEND=">= x11-libs/libXmu-1  DEPEND=">= x11-libs/libXmu-1.1
14   >= x11-libs/libX11-1   >= x11-libs/libX11-1.4
15   >= x11-libs/libXpm-3.5   >= x11-libs/libXpm-3.9
16   >= x11-libs/libXft-1   >= x11-libs/libXft-2.2
17   >= media-libs/libpng-1.2.40   >= media-libs/libpng-1.4
18   >= media-libs/libjpeg-7"   >= media-libs/libjpeg-8
19     >= x11-apps/xauth-1.0.5"
20    
21  SDEPEND=">= dev-util/pkgconfig-0.19  SDEPEND=">= dev-util/pkgconfig-0.25
22   >= x11-proto/xproto-7   >= x11-proto/xproto-7.0.20
23   >= sys-apps/sed-4"   >= sys-apps/sed-4"
24    
25  SRCFILE="${PNAME}-${PVER}.tar.gz"  SRCFILE="${PNAME}-${PVER}.tar.gz"
26  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
27    
28  MCORE_ONLY_KEEP="etc/slim.conf usr/bin/slim usr/share/slim/themes/default"  MCORE_ONLY_KEEP="etc/slim.conf usr/bin/slim usr/share/slim/themes/default"
29  sminclude mbuild mcore-split  sminclude mtools mcore-split
30    
31  SRC_URI=(  SRC_URI=(
32   http://download.berlios.de/${PNAME}/${SRCFILE}   http://download.berlios.de/${PNAME}/${SRCFILE}
33   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
34     mirror://${PNAME}/${PNAME}-${PVER}-restart-xserver-if-killed.patch
35     mirror://${PNAME}/${PNAME}-${PVER}-fix-keyboard-in-tty-from-which-slim-is-lauched.patch
36     mirror://${PNAME}/${PNAME}-${PVER}-fix-SIGTERM-freeze.patch
37  )  )
38    
39  UP2DATE="updatecmd_berlios ${PNAME}"  UP2DATE="updatecmd_berlios ${PNAME}"
# Line 39  src_prepare() Line 43  src_prepare()
43   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
44   cd ${SRCDIR}   cd ${SRCDIR}
45    
46     # restart the xserver
47     mpatch ${PNAME}-${PVER}-restart-xserver-if-killed.patch || die
48    
49     # fix keyboard issues
50     mpatch ${PNAME}-${PVER}-fix-keyboard-in-tty-from-which-slim-is-lauched.patch || die
51    
52     # fix a sigterm segfault
53     mpatch ${PNAME}-${PVER}-fix-SIGTERM-freeze.patch || die
54    
55   # fix cflags and ldflags   # fix cflags and ldflags
56   sed -i \   sed -i \
57   -e "s:^\(CFLAGS=\).*:\1-I. $(pkg-config --cflags freetype2 libpng x11):" \   -e "s:^\(CFLAGS=\).*:\1-I. $(pkg-config --cflags freetype2 libpng x11):" \
58   -e "s:^\(LDFLAGS=\).*:\1$(pkg-config --libs xft freetype2 libpng xmu) -ljpeg -lz -lm -lcrypt -lrt:" \   -e "s:^\(LDFLAGS=\).*:\1$(pkg-config --libs xft freetype2 libpng xmu) -ljpeg -lz -lm -lcrypt -lrt:" \
59   -e "s:^\(MANDIR=\).*:\1/usr/share/man:" \   -e "s:^\(MANDIR=\).*:\1/usr/share/man:" \
60   Makefile || die   Makefile || die
61    
62     # rename sim.lock to sim.pid and enable daemon mode by default
63     # fix the shutdown and reboot commands to match busybox
64     sed -i -e "s:/var/run/slim.lock:/var/run/slim.pid:" \
65     -e "s:# daemon.*:daemon\tyes:" \
66     -e "s:^\(halt_cmd.*\):\1\t/sbin/halt:" \
67     -e "s:^\(reboot_cmd.*\):\1\t/sbin/reboot:" \
68     slim.conf || die
69  }  }
70    
71  src_compile()  src_compile()
# Line 53  src_compile() Line 74  src_compile()
74   mmake || die   mmake || die
75  }  }
76    
77  src_install()  mcore_generic_src_install()
78  {  {
79   cd ${SRCDIR}   cd ${SRCDIR}
80   mmake DESTDIR=${BINDIR} install || die   mmake DESTDIR=${BINDIR} install || die
81    
82     # install a custom slim.conf
83     echo -e ${COLGREEN}"    injecting custom slim-configs"${COLDEFAULT}
84     mcinjectfile slim.conf /etc || die
85     minstalldir /etc/rc.d/init.d || die
86     mcinjectexec slim.rc /etc/rc.d/init.d/slim || die
87     mcinjectfile slim.theme /usr/share/slim/themes/default/slim.theme || die
88     mcinjectfile panel.png /usr/share/slim/themes/default/panel.png || die
89     mcinjectfile mcore2.png /usr/share/slim/themes/default/background.png || die
90     if [ -f ${BINDIR}/usr/share/slim/themes/default/background.jpg ]
91     then
92     rm ${BINDIR}/usr/share/slim/themes/default/background.png || die
93     fi
94  }  }

Legend:
Removed from v.1103  
changed lines
  Added in v.1203