diff options
Diffstat (limited to 'ham/twhamqth')
-rw-r--r-- | ham/twhamqth/README | 12 | ||||
-rw-r--r-- | ham/twhamqth/doinst.sh | 16 | ||||
-rw-r--r-- | ham/twhamqth/slack-desc | 2 | ||||
-rw-r--r-- | ham/twhamqth/twhamqth.SlackBuild | 32 | ||||
-rw-r--r-- | ham/twhamqth/twhamqth.info | 6 |
5 files changed, 48 insertions, 20 deletions
diff --git a/ham/twhamqth/README b/ham/twhamqth/README index 485fb5dd18..4717b2ed94 100644 --- a/ham/twhamqth/README +++ b/ham/twhamqth/README @@ -1,10 +1,10 @@ -This program uses a free XML feed from the HamQTH.com website of Petr, -OK2CQR. His callsign database has over 1.3 million callsigns and is very -fast, returning the station information in just a few seconds. Thanks to +This program uses a free XML feed from the HamQTH.com website of Petr, +OK2CQR. His callsign database has over 1.3 million callsigns and is very +fast, returning the station information in just a few seconds. Thanks to Petr for a great service. -Given a ham radio callsign, twHamQTH will display the name, address, -city and country of the station. All of the station data can be use -by other programs. +Given a ham radio callsign, twHamQTH will display the name, address, +city and country of the station. All of the station data can be use by +other programs. You'll need a free HamQTH.com login to use this software. diff --git a/ham/twhamqth/doinst.sh b/ham/twhamqth/doinst.sh index 5fb28930db..a648bc1b7f 100644 --- a/ham/twhamqth/doinst.sh +++ b/ham/twhamqth/doinst.sh @@ -1,3 +1,19 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/X11/app-defaults/TwHamQTH.new + if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + diff --git a/ham/twhamqth/slack-desc b/ham/twhamqth/slack-desc index aa0c08720d..1d3527a2b5 100644 --- a/ham/twhamqth/slack-desc +++ b/ham/twhamqth/slack-desc @@ -12,8 +12,8 @@ twhamqth: twhamqth is a callsign lookup program that uses an online callsign twhamqth: database from the HamQTH site of Petr, OK2CQR. Given a callsign, twhamqth: twhamqth will return name, address, city, and country of the station. twhamqth: +twhamqth: Homepage: http://wa0eir.bcts.info/twhamqth.html twhamqth: twhamqth: twhamqth: -twhamqth: Homepage: http://wa0eir.bcts.info/twhamqth.html twhamqth: diff --git a/ham/twhamqth/twhamqth.SlackBuild b/ham/twhamqth/twhamqth.SlackBuild index f36b1a2dd1..152871a2e2 100644 --- a/ham/twhamqth/twhamqth.SlackBuild +++ b/ham/twhamqth/twhamqth.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackbuild for twhamqth # Written by JK Wood <joshuakwood@gmail.com> @@ -20,26 +20,36 @@ # see fit. Or as I see fit. Or as I fit. Although # that is unlikely, as I am rather tall. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=twhamqth -VERSION=${VERSION:-1.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-2.0} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -67,8 +77,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fcommon" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -86,6 +95,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Don't overwrite the config file +mv $PKG/etc/X11/app-defaults/TwHamQTH $PKG/etc/X11/app-defaults/TwHamQTH.new + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -97,4 +109,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.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/ham/twhamqth/twhamqth.info b/ham/twhamqth/twhamqth.info index 18214a4033..d2ce935d0e 100644 --- a/ham/twhamqth/twhamqth.info +++ b/ham/twhamqth/twhamqth.info @@ -1,8 +1,8 @@ PRGNAM="twhamqth" -VERSION="1.4" +VERSION="2.0" HOMEPAGE="http://wa0eir.bcts.info/twhamqth.html" -DOWNLOAD="http://wa0eir.bcts.info/src/twhamqth-1.4.src.tar.gz" -MD5SUM="9632639b296596d9f398dce65bb522cf" +DOWNLOAD="http://wa0eir.bcts.info/src/twhamqth-2.0.src.tar.gz" +MD5SUM="728835cf4b5342f7b92cf73ec99bf415" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |