CVS commit: pkgsrc/pkgtools/texlive2pkg

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Aug 19 18:31:23 UTC 2022

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

Log Message:
ve2pkg: fix shell syntax. Allow versioned doc tarballs.

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/pkgtools/texlive2pkg/Makefile
cvs rdiff -u -r1.3 -r1.4 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.19 pkgsrc/pkgtools/texlive2pkg/Makefile:1.20
--- pkgsrc/pkgtools/texlive2pkg/Makefile:1.19   Tue Jun 28 11:35:26 2022
+++ pkgsrc/pkgtools/texlive2pkg/Makefile        Fri Aug 19 18:31:23 2022
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2022/06/28 11:35:26 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.20 2022/08/19 18:31:23 wiz Exp $
 
-PKGNAME=       texlive2pkg-1.11
-PKGREVISION=   1
+PKGNAME=       texlive2pkg-1.12
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost
@@ -15,7 +13,6 @@ NO_CHECKSUM=          yes
 NO_BUILD=              yes
 USE_LANGUAGES=         # none
 USE_TOOLS+=            ftp:run perl:run xzcat:run
-AUTO_MKDIRS=           yes
 
 SUBST_CLASSES+=                tools
 SUBST_STAGE.tools=     pre-configure

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh:1.3 pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh:1.4
--- pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh:1.3        Fri Sep 13 13:43:30 2019
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive2pkg.sh    Fri Aug 19 18:31:23 2022
@@ -1,6 +1,6 @@
 #!/bin/sh
 # texlive2pkg
-# $NetBSD: texlive2pkg.sh,v 1.3 2019/09/13 13:43:30 rillig Exp $
+# $NetBSD: texlive2pkg.sh,v 1.4 2022/08/19 18:31:23 wiz Exp $
 #
 # Copyright (c) 2016
 #       Mark Davies.  All rights reserved.
@@ -67,12 +67,12 @@ fi
 case $pkgtarball in
 file:/*.tar.xz | ftp:/*.tar.xz | http:/*.tar.xz | https:/*.tar.xz )
    pkgurl=1
-   break ;;
+    ;;
 /*.tar.xz)
-   break ;;
+    ;;
 *.tar.xz)
    pkgtarball=$PWD/$pkgtarball
-   break ;;
+    ;;
 *)
    echo "${usage}" 1>&2
    exit 1
@@ -80,15 +80,15 @@ esac
 
 case "$doctarball" in
 "")
-   break ;;
-file:/*.doc.tar.xz | ftp:/*.tar.xz | http:/*.doc.tar.xz | https:/*.doc.tar.xz )
+    ;;
+file:/*.doc*.tar.xz | ftp:/*.doc*.tar.xz | http:/*.doc*.tar.xz | https:/*.doc*.tar.xz )
    docurl=1
-   break ;;
-/*.doc.tar.xz)
-   break ;;  
-*.doc.tar.xz)
+    ;;
+/*.doc*.tar.xz)
+    ;;  
+*.doc*.tar.xz)
    doctarball=$PWD/$doctarball
-   break ;;
+    ;;
 *)
    echo "${usage}" 1>&2
    exit 1