CVS commit: pkgsrc/pkgtools/texlive2pkg

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Sep 13 13:43:30 UTC 2019

Modified Files:
        pkgsrc/pkgtools/texlive2pkg: Makefile
        pkgsrc/pkgtools/texlive2pkg/files: texlive2pkg.sh

Log Message:
pkgtools/texlive2pkg: fix shell quoting, update to 1.8

Before this fix, running "texlive2pkg --help" in a directory that
contains a file named "d" would output only "d" instead of "[-d]".


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/texlive2pkg/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/texlive2pkg/Makefile
diff -u pkgsrc/pkgtools/texlive2pkg/Makefile:1.11 pkgsrc/pkgtools/texlive2pkg/Makefile:1.12
--- pkgsrc/pkgtools/texlive2pkg/Makefile:1.11   Tue Aug 27 06:21:18 2019
+++ pkgsrc/pkgtools/texlive2pkg/Makefile        Fri Sep 13 13:43:30 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2019/08/27 06:21:18 markd Exp $
+# $NetBSD: Makefile,v 1.12 2019/09/13 13:43:30 rillig Exp $
 #
 
-PKGNAME=       texlive2pkg-1.7
+PKGNAME=       texlive2pkg-1.8
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh:1.2 pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh:1.3
--- pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh:1.2        Tue Aug 27 06:21:18 2019
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh    Fri Sep 13 13:43:30 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 # texlive2pkg
-# $NetBSD: texlive2pkg.sh,v 1.2 2019/08/27 06:21:18 markd Exp $
+# $NetBSD: texlive2pkg.sh,v 1.3 2019/09/13 13:43:30 rillig Exp $
 #
 # Copyright (c) 2016
 #       Mark Davies.  All rights reserved.
@@ -44,7 +44,7 @@ dodoc=0
 pkgurl=0
 docurl=0
 
-USAGE="${NAME} [-d] package-tarball [doc-tarball] -- create a texlive package for pkgsrc"
+usage="${NAME} [-d] package-tarball [doc-tarball] -- create a texlive package for pkgsrc"
 
 if [ "$1" = "-d" ]; then
   dodoc=1
@@ -60,7 +60,7 @@ elif [ ${#} -eq 2 ]; then
   pkgtarball=$1
   doctarball=$2
 else
-  echo ${USAGE}
+  echo "${usage}" 1>&2
   exit 1
 fi
 
@@ -74,7 +74,7 @@ file:/*.tar.xz | ftp:/*.tar.xz | http:/*
    pkgtarball=$PWD/$pkgtarball
    break ;;
 *)
-   echo ${USAGE}
+   echo "${usage}" 1>&2
    exit 1
 esac
 
@@ -90,7 +90,7 @@ file:/*.doc.tar.xz | ftp:/*.tar.xz | htt
    doctarball=$PWD/$doctarball
    break ;;
 *)
-   echo ${USAGE}
+   echo "${usage}" 1>&2
    exit 1
 esac