diff options
Diffstat (limited to 'misc/dos2unix')
| -rw-r--r-- | misc/dos2unix/README | 47 | ||||
| -rw-r--r-- | misc/dos2unix/dos2unix.SlackBuild | 50 | ||||
| -rw-r--r-- | misc/dos2unix/dos2unix.info | 10 | ||||
| -rw-r--r-- | misc/dos2unix/slack-desc | 2 |
4 files changed, 63 insertions, 46 deletions
diff --git a/misc/dos2unix/README b/misc/dos2unix/README index d0b302a6fa..deb06ad6ab 100644 --- a/misc/dos2unix/README +++ b/misc/dos2unix/README @@ -1,25 +1,32 @@ -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 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. +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, 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. + Native language support: + Brazilian Portugese, Chinese (simplified/traditional), + Danish, Dutch, English, Esperanto, French, Friulian, + German, Hungarian, Japanese, Norwegian Bokmaal, Polish, + Russian, Serbian, Spanish, Swedish, Ukrainian, + and Vietnamese. + + In-place, paired, or stdio mode conversion. + Keep original file dates option. + 7-bit and ISO conversion modes like SunOS dos2unix. + Conversion of Unicode UTF-16 files. + Handles Unicode Byte Order Mark (BOM). + Display file information. Dos2Unix includes: - dos2unix - DOS/MAC to UNIX text file format converter. - unix2dos - UNIX to DOS/MAC text file format converter. + 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 3fdede8733..5f39d827ce 100644 --- a/misc/dos2unix/dos2unix.SlackBuild +++ b/misc/dos2unix/dos2unix.SlackBuild @@ -1,8 +1,14 @@ -#!/bin/sh +#!/bin/bash + # Slackware build script for dos2unix -# copyright 2017-2018 Donald Cooley, South Haven, IN, USA -# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org +# Copyright 2023 K. Eugene Carlson, Tsukuba, Japan + +# Copyright 2022 Brandon Pribula, BC Canada + +# copyright 2017-2020 Donald Cooley, South Haven, IN, USA + +# Ryan P.C. McQuen | Everett, WA # Copyright 2011, 2012, 2013 Chris Abela, Malta # All rights reserved. @@ -24,10 +30,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=dos2unix -VERSION=${VERSION:-7.4.0} +VERSION=${VERSION:-7.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +46,14 @@ if [ -z "$ARCH" ]; then 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} @@ -59,42 +75,36 @@ find -L . \ if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi RPM_OPT_FLAGS="$SLKCFLAGS" \ - make +make make check -make \ - prefix=$PKG/usr \ - docdir=$PKG/usr/doc/$PRGNAM-$VERSION \ - mandir=$PKG/usr/man \ - install +make strip +make install \ + prefix=/usr \ + docdir=/usr/doc/$PRGNAM-$VERSION \ + mandir=/usr/man \ + DESTDIR=$PKG # Put _all_ man pages under usr/man mv $PKG/usr/share/man/* $PKG/usr/man rmdir $PKG/usr/share/man -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - 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 -cp -a INSTALL.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL.txt mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc 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/misc/dos2unix/dos2unix.info b/misc/dos2unix/dos2unix.info index 1f9463e02d..d0a99a7c1a 100644 --- a/misc/dos2unix/dos2unix.info +++ b/misc/dos2unix/dos2unix.info @@ -1,10 +1,10 @@ PRGNAM="dos2unix" -VERSION="7.4.0" +VERSION="7.5.2" HOMEPAGE="https://waterlan.home.xs4all.nl/dos2unix.html" -DOWNLOAD="https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.0.tar.gz" -MD5SUM="a615de542899e53d6f9575ad3cb32b19" +DOWNLOAD="https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz" +MD5SUM="646272020848c9b673de24c4e8e3422e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" +MAINTAINER="K. Eugene Carlson" +EMAIL="kvngncrlsn@gmail.com" diff --git a/misc/dos2unix/slack-desc b/misc/dos2unix/slack-desc index 40424dc391..f78d986b85 100644 --- a/misc/dos2unix/slack-desc +++ b/misc/dos2unix/slack-desc @@ -14,6 +14,6 @@ dos2unix: modeled after dos2unix/unix2dos under SunOS/Solaris. They have dos2unix: similar conversion modes, namely ascii, 7bit and iso. dos2unix: dos2unix: -dos2unix: https://www.xs4all.nl/~waterlan/dos2unix.html dos2unix: +dos2unix: Homepage: https://www.xs4all.nl/~waterlan/dos2unix.html dos2unix: |