Commits

Anonymous committed 5f1120e

Update ratpoison to 1.4.6

Signed-off-by: Lee Pak Hong <benreilly@vector.Linux.net>

Comments (0)

Files changed (2)

var/vabs/ratpoison/src/ratpoison.SlackBuild

 # AUTHORS = 
 
 NAME="ratpoison"            #Enter package Name!
-VERSION=${VERSION:-"1.4.5"}      #Enter package Version!
+VERSION=${VERSION:-"1.4.6"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"stretchedthin"}   #Enter your Name!
-LINK=${LINK:-"http://download.savannah.nongnu.org/releases/$NAME/$NAME-$VERSION.tar.gz"}  #Enter URL for package here!
+LINK=${LINK:-"http://download.savannah.nongnu.org/releases/$NAME/$NAME-$VERSION.tar.xz"}  #Enter URL for package here!
 
 
 #SYSTEM VARIABLES
 #----------------------------------------------------------------------------
-BUILDNUM=${BUILDNUM:-"2"}
+BUILDNUM=${BUILDNUM:-"1"}
 VL_VERSION=${VL_VERSION:-"$(ls /var/log/packages/|grep vlconfig2|cut -d "-" -f4|cut -c 2-5)"}
 BUILD=${BUILD:-"$BUILDNUM""$VL_VERSION"}
 ARCH=${ARCH:-"$(uname -m)"}
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
+MAKEDEPENDS=${MAKEDEPENDS:-""} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
+# DO NOT EXECUTE if NORUN is set to 1
+if [ "$NORUN" != "1" ]; then
+
 
 #SETUP PACKAGING ENVIRONMENT
 #--------------------------------------------
   LIBDIRSUFFIX=""
 fi
 
-export CFLAGS="$SLKCFLAGS $CFLAG_OPTIONS"
+export CFLAGS="$SLKCFLAGS $CFLAG_OPTIONS -DHAVE_GETLINE"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="$LDFLAGS $LDFLAG_OPTIONS"
 #--------------------------------------------
 
 
 cd $TMP/$NAME-$VERSION
-rm -r $CWD/patches
-mkdir $CWD/patches
-cp $CWD/ratpoison*diff $CWD/patches/
 
 #PATCHES
 #-----------------------------------------------------
 # Put any Patches here *NOTE this only works if all 
 # your patches use the -p1 strip option!
 #-----------------------------------------------------
-patch -p1 < $CWD/patches/ratpoison-1.4.5-fixup_docdir.diff
-
+#for i in $CWD/patches/*;do
+#  patch -p1 <$i
+#  mkdir -p $PKG/usr/doc/$NAME-$VERSION/patches/
+#  cp $i $PKG/usr/doc/$NAME-$VERSION/patches/
+#done
 #-----------------------------------------------------
 
 
 #-----------------------------------------------------------------------
 
 
+# Set the terminal emulator to be used as default by ratpoison
+# The default is xterm if it's not specified in ./configure, so
+# we'll leave it that way here.  You can specify rxvt or something
+# else if you wish
 XTERM=${XTERM:-xterm}
 
-CFLAGS="$SLKCFLAGS -DHAVE_GETLINE" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
+echo "Configuring source..."
+./configure --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --infodir=/usr/info \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-debug \
+  --docdir=/usr/doc/$NAME-$VERSION \
   --with-xterm=$XTERM \
-  --build=$ARCH-slackware-linux
-
-make DESTDIR="${PKG}" install
-
-mkdir -p $PKG/etc/X11/xinit
-install -m 0755 $CWD/xinitrc.ratpoison $PKG/etc/X11/xinit/xinitrc.ratpoison
-
-  # fix permissions
-  chmod a+x ${PKG}/usr/share/ratpoison/{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh}
+  --program-prefix="" \
+  --program-suffix="" \
+  --build=$CONFIGURE_TRIPLET \
+  $CONFIG_OPTIONS || exit 1
 
-  # Not useful outside the source tree. Kill it
-  rm ${PKG}/usr/share/ratpoison/genrpbindings
-
-  cd contrib
-  ./genrpbindings
-  install -dm755 ${PKG}/usr/share/ratpoison/bindings
-  install -m644 {Ratpoison.pm,ratpoison-cmd.el,ratpoison.rb,ratpoison.lisp,ratpoison.py} \
-    ${PKG}/usr/share/ratpoison/bindings/
-
-  install -Dm644 ${CWD}/${NAME}.desktop \
-    ${PKG}/etc/X11/sessions/${NAME}.desktop
-
-  install -Dm644 ${PKG}/usr/share/ratpoison/ratpoison.el \
-    ${PKG}/usr/share/emacs/site-lisp/ratpoison.el
+make || exit 1
 
+make install DESTDIR=$PKG || exit 1
 
 
 #######################################################################
 #Miscellenious tweaks and things outside a normal ./configure go here #
 #######################################################################
-# Menu entry - http://standards.freedesktop.org/desktop-entry-spec/latest/
 
-if test -f $CWD/$NAME.png; then
-  mkdir -p $PKG/usr/share/pixmaps
-  cp $CWD/$NAME.png $PKG/usr/share/pixmaps/$NAME.png
-fi
+mkdir -p $PKG/etc/X11/xinit
+install -m 0755 $CWD/xinitrc.ratpoison $PKG/etc/X11/xinit/xinitrc.ratpoison
 
+# fix permissions
+chmod a+x ${PKG}/usr/share/ratpoison/{allwindows.sh,clickframe.pl,rpshowall.sh,rpws,split.sh}
 
+# Not useful outside the source tree. Kill it
+#rm ${PKG}/usr/share/ratpoison/genrpbindings
 
+( cd contrib
+./genrpbindings
+install -dm755 ${PKG}/usr/share/ratpoison/bindings
+install -m644 {Ratpoison.pm,ratpoison-cmd.el,ratpoison.rb,ratpoison.lisp,ratpoison.py} \
+  ${PKG}/usr/share/ratpoison/bindings/ )
 
+install -Dm644 ${CWD}/${NAME}.desktop ${PKG}/etc/X11/sessions/${NAME}.desktop
+install -Dm644 ${CWD}/${NAME}.desktop ${PKG}/etc/X11/xsessions/${NAME}.desktop
 
+install -Dm644 ${PKG}/usr/share/ratpoison/ratpoison.el \
+  ${PKG}/usr/share/emacs/site-lisp/ratpoison.el
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a AUTHORS COPYING ChangeLog Credits MANIFEST README TODO \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
 $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 EOF
 fi
 
-# Add schemas install to the doinst.sh if schemas are found.
-if [ -d $PKG/etc/gconf/schemas ];then
-# Make sure we have gconftool installed
-echo "if [ -x usr/bin/gconftool-2 ]; then" >> $PKG/install/doinst.sh
-( cd $PKG/etc/gconf/schemas
-for schema in *.schemas; do
- # Install schemas
- echo "GCONF_CONFIG_SOURCE=\"xml::etc/gconf/gconf.xml.defaults\" \
-   usr/bin/gconftool-2 --makefile-install-rule \
-   etc/gconf/schemas/${schema} >/dev/null 2>&1" \
-   >> $PKG/install/doinst.sh
-done;
-)
-# Finish off gconf block
-echo "fi" >> $PKG/install/doinst.sh
-fi
-
+echo "chroot . /usr/bin/install-info /usr/info/ratpoison.info.gz /usr/info/dir 2> /dev/null" >> $PKG/install/doinst.sh
 
 #if there is a slack-desc in src dir use it
 if test -f $CWD/slack-desc; then
 cd $CWD
 echo "Cleaning up temp files..." && rm -rf $TMP
 echo "Package Complete"
+fi
 #--------------------------------------------------------------
 
 # vim: set tabstop=4 shiftwidth=4 foldmethod=marker : ##

var/vabs/ratpoison/src/xinitrc.ratpoison

 [ -f $usermodmap ] && xmodmap $usermodmap
 
 if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-  exec ck-launch-session ratpoison
+  exec ck-launch-session dbus-launch --exit-with-session ratpoison
 else
   exec ratpoison
 fi