diff options
-rw-r--r-- | misc/dos2unix/README | 39 | ||||
-rw-r--r-- | misc/dos2unix/dos2unix.SlackBuild | 8 | ||||
-rw-r--r-- | misc/dos2unix/dos2unix.info | 6 | ||||
-rw-r--r-- | misc/dos2unix/slack-desc | 4 |
4 files changed, 31 insertions, 26 deletions
diff --git a/misc/dos2unix/README b/misc/dos2unix/README index 68ba41dc2657..6b669a125084 100644 --- a/misc/dos2unix/README +++ b/misc/dos2unix/README @@ -1,22 +1,25 @@ -This is an update of Benjamin Lin's implementations of dos2unix and -unix2dos. Benjamin Lin's implementations of dos2unix and unix2dos -are part of several Linux distributions such as RedHat, Fedora, Suse, -Gentoo and some others. On Slackware one finds fromdos and todos but -these implementations are not included. This update includes all RedHat -patches and fixes several other problems. +This is an update of Benjamin Lin's implementations of dos2unix +and unix2dos. Benjamin Lin's implementations of dos2unix and +unix2dos are part of several Linux distributions such as RedHat, +Fedora, Suse, Gentoo and some others. On Slackware one finds fromdos +and todos but these implementations are not included. This update +includes all RedHat patches and fixes several other problems. -These implementations of dos2unix and unix2dos have been modelled after -dos2unix/unix2dos under SunOS/Solaris. They have similar conversion -modes, namely ascii, 7bit and iso. The first versions were made by -John Birchfield in 1989, and in 1995 rewritten from scratch by Benjamin -Lin. Mac to Unix conversion was added by Bernd Johannes Wuebben in 1998, -Unix to Mac by Erwin in 2010. +These implementations of dos2unix and unix2dos have been modeled +after dos2unix/unix2dos under SunOS/Solaris. They have similar +conversion modes, namely ascii, 7bit and iso. The first versions +were made by John Birchfield in 1989, and in 1995 rewritten from +scratch by Benjamin Lin. Mac to Unix conversion was added by Bernd +Johannes Wuebben in 1998, Unix to Mac by Erwin in 2010. Features: - Native language support: Dutch, English, Esperanto, German, Spanish. - Automatically skips binary and non-regular files In-place, paired, - or stdio mode conversion. Keep original file dates option. 7-bit - and iso conversion modes like SunOS dos2unix. + Native language support: Dutch, English, Esperanto, + German, and Spanish. + Automatically skips binary and non-regular files in-place, + paired, or stdio mode conversion. + Keep original file dates option. + 7-bit and iso conversion modes like SunOS dos2unix. -Dos2Unix includes: dos2unix - DOS/MAC to UNIX text file format converter -unix2dos - UNIX to DOS/MAC text file format converter +Dos2Unix includes: + dos2unix - DOS/MAC to UNIX text file format converter. + unix2dos - UNIX to DOS/MAC text file format converter. diff --git a/misc/dos2unix/dos2unix.SlackBuild b/misc/dos2unix/dos2unix.SlackBuild index e92a8538ebfd..b979356063f2 100644 --- a/misc/dos2unix/dos2unix.SlackBuild +++ b/misc/dos2unix/dos2unix.SlackBuild @@ -1,5 +1,6 @@ #!/bin/sh # Slackware build script for dos2unix +# copyright 2017 Donald Cooley, South Haven, Indiana, USA # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org @@ -30,7 +31,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -56,8 +57,8 @@ 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 {} \; -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" @@ -72,6 +73,7 @@ fi RPM_OPT_FLAGS="$SLKCFLAGS" \ make +make check make \ prefix=$PKG/usr \ docdir=$PKG/usr/doc/$PRGNAM-$VERSION \ diff --git a/misc/dos2unix/dos2unix.info b/misc/dos2unix/dos2unix.info index 68ff94df6021..8924e6290ac4 100644 --- a/misc/dos2unix/dos2unix.info +++ b/misc/dos2unix/dos2unix.info @@ -5,6 +5,6 @@ DOWNLOAD="http://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.3.4.tar.gz" MD5SUM="04428e77e2ead8a92c1492ba8977f1d1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryanpcmcquen@member.fsf.org" +REQUIRES="perl-Test-Simple" +MAINTAINER="Donald Cooley" +EMAIL="chytraeu@sdf.org" diff --git a/misc/dos2unix/slack-desc b/misc/dos2unix/slack-desc index 4d7fc19dbee2..af7bcda62cba 100644 --- a/misc/dos2unix/slack-desc +++ b/misc/dos2unix/slack-desc @@ -10,10 +10,10 @@ dos2unix: dos2unix (DOS or Mac to Unix and v.v. text files conversion) dos2unix: dos2unix: This is an update of Benjamin Lin's implementations of dos2unix and dos2unix: unix2dos. These implementations of dos2unix and unix2dos have been -dos2unix: modelled after dos2unix/unix2dos under SunOS/Solaris. They have +dos2unix: modeled after dos2unix/unix2dos under SunOS/Solaris. They have dos2unix: similar conversion modes, namely ascii, 7bit and iso. dos2unix: -dos2unix: Homepage: http://www.xs4all.nl/~waterlan/dos2unix.html dos2unix: +dos2unix: http://www.xs4all.nl/~waterlan/dos2unix.html dos2unix: dos2unix: |