diff options
| -rw-r--r-- | desktop/cmatrix/cmatrix-1.2a-find_fonts.diff | 67 | ||||
| -rw-r--r-- | desktop/cmatrix/cmatrix.SlackBuild | 31 | ||||
| -rw-r--r-- | desktop/cmatrix/cmatrix.info | 4 |
3 files changed, 91 insertions, 11 deletions
diff --git a/desktop/cmatrix/cmatrix-1.2a-find_fonts.diff b/desktop/cmatrix/cmatrix-1.2a-find_fonts.diff new file mode 100644 index 000000000000..429b48701f50 --- /dev/null +++ b/desktop/cmatrix/cmatrix-1.2a-find_fonts.diff @@ -0,0 +1,67 @@ +diff -Nur cmatrix-1.2a.orig/configure cmatrix-1.2a/configure +--- cmatrix-1.2a.orig/configure 2002-03-31 19:17:59.000000000 -0600 ++++ cmatrix-1.2a/configure 2009-09-06 23:43:05.089753804 -0500 +@@ -1876,7 +1876,7 @@ + if test x$CONSOLECHARS != x -o x$CONSOLECHARS != x'"$CONSOLECHARS"'; then + if test x$SETFONT != x -o x$SETFONT != x'"$SETFONT"'; then + +- for ac_file in /usr/lib/kbd/consolefonts /usr/share/consolefonts ++ for ac_file in /usr/lib/kbd/consolefonts /usr/share/consolefonts /usr/share/kbd/consolefonts + do + + ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'` +@@ -1911,15 +1911,17 @@ + + if test "x$ac_cv_file__usr_lib_kbd_consolefonts" = "xno"; then + if test "x$ac_cv_file__usr_share_consolefonts" = "xno"; then +- echo "configure: warning: ++ if test "x$ac_cv_file__usr_share_kbd_consolefonts" = "xno"; then ++ echo "configure: warning: + + *** You do not appear to have a consolefonts directory in a standard location +-*** (/usr/lib/kbd or /usr/share), even though you appear to have the ++*** (/usr/lib/kbd or /usr/share/kbd or /usr/share), even though you appear to have the + *** consolechars and/or setfont command. The matrix font for the console + *** will not be installed. This means you will not be able to use the + *** matrix console font (and the -l command line switch) unless the font + *** is located in your current directory when you run CMatrix. + " 1>&2 ++ fi + fi + fi + fi +@@ -1962,7 +1964,7 @@ + echo "$ac_t""no" 1>&6 + fi + +-for ac_file in /usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc ++for ac_file in /usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc /usr/share/fonts/misc + do + + ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'` +@@ -1997,17 +1999,19 @@ + + if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then + if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then +- echo "configure: warning: ++ if test "x$ac_cv_file__usr_share_fonts_misc" = "xno"; then ++ echo "configure: warning: + + *** You do not appear to have an X window fonts directory in the standard +-*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The +-*** mtx.pcf font will not be installed. This means you will probably not +-*** be able to use the mtx fonts in your x terminals, and hence be unable +-*** to use the -x command line switch. Sorry about that... ++*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc or ++*** /usr/share/fonts/misc). The mtx.pcf font will not be installed. This ++*** means you will probably not be able to use the mtx fonts in your x ++*** terminals, and hence be unable to use the -x command line switch. ++*** Sorry about that... + " 1>&2 + fi + fi +- ++fi + + LIBS="$LIBS $CURSES_LIB" + # Check whether --enable-debug or --disable-debug was given. diff --git a/desktop/cmatrix/cmatrix.SlackBuild b/desktop/cmatrix/cmatrix.SlackBuild index 1efb113f6049..9e5038f2c42e 100644 --- a/desktop/cmatrix/cmatrix.SlackBuild +++ b/desktop/cmatrix/cmatrix.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=cmatrix VERSION=1.2a ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -16,10 +16,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -33,11 +36,21 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+rw,go-w . +# Patch configure to find the fonts correctly +patch -p1 < $CWD/cmatrix-1.2a-find_fonts.diff + CFLAGS="$SLKCFLAGS" \ -CPPFLAGS="$SLKCFLAGS" \ -./configure --prefix=/usr +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux -CFLAGS="$SLKCFLAGS" CPPFLAGS="$SLKCFLAGS" make +make # Manual install - patching the Makefile not worth it install -D -m 0755 $TMP/$PRGNAM-$VERSION/cmatrix \ @@ -51,10 +64,8 @@ install -D -m 0644 $TMP/$PRGNAM-$VERSION/matrix.psf.gz \ install -D -m 0644 $TMP/$PRGNAM-$VERSION/mtx.pcf \ $PKG/usr/share/fonts/misc/mtx.pcf -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Compress the man page gzip -9 $PKG/usr/man/man1/cmatrix.1 @@ -68,4 +79,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/cmatrix/cmatrix.info b/desktop/cmatrix/cmatrix.info index bba332c6f892..2ee6275e638b 100644 --- a/desktop/cmatrix/cmatrix.info +++ b/desktop/cmatrix/cmatrix.info @@ -3,6 +3,8 @@ VERSION="1.2a" HOMEPAGE="http://www.asty.org/cmatrix/" DOWNLOAD="http://www.asty.org/cmatrix/dist/cmatrix-1.2a.tar.gz" MD5SUM="ebfb5733104a258173a9ccf2669968a1" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Phillip Warner" EMAIL="pc_warner@yahoo.com" -APPROVED="David Somero"
\ No newline at end of file +APPROVED="rworkman,dsomero,pprkut" |