adapt to upstream changes, make makefile POSIX-compliant

3 files changed, 111 insertions, 135 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04a7686da9a4..dd6282470bf6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = xcursor-chromeos
 	pkgdesc = The cursors from Chrome OS
 	pkgver = latest
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.chromium.org/chromium-os
 	arch = any
-	license = unknown
+	license = BSD
 	makedepends = xorg-xcursorgen
 	provides = xcursor-chromeos
-	source = https://chromium.googlesource.com/chromium/src/+archive/master/ui/resources.tar.gz
+	source = https://chromium.googlesource.com/chromium/src/+archive/main/ui/resources.tar.gz
+	source = LICENSE.b64::https://chromium.googlesource.com/chromium/src/+/main/LICENSE?format=TEXT
 	source = makefile
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = xcursor-chromeos
-
diff --git a/PKGBUILD b/PKGBUILD
index 82136ce83c6d..520b6a0d8f0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,134 +1,109 @@
 # Maintainer: Philip Goto <philip.goto@gmail.com>
 pkgname=xcursor-chromeos
 pkgver=latest
-pkgrel=1
+pkgrel=2
 pkgdesc="The cursors from Chrome OS"
 arch=('any')
 url="https://www.chromium.org/chromium-os"
-license=('unknown')
+license=('BSD')
 makedepends=('xorg-xcursorgen')
 provides=('xcursor-chromeos')
-source=("https://chromium.googlesource.com/chromium/src/+archive/master/ui/resources.tar.gz"
+source=("https://chromium.googlesource.com/chromium/src/+archive/main/ui/resources.tar.gz"
+        "LICENSE.b64::https://chromium.googlesource.com/chromium/src/+/main/LICENSE?format=TEXT"
         "makefile")
 md5sums=('SKIP'
+         'SKIP'
          'SKIP')
 
-prepare() {
-    mkdir "${pkgname}-${pkgver}"
-    cd "${pkgname}-${pkgver}"
-
-    mv "../makefile" "makefile"
+_prepare_list=(
+    "alias alias"
+    "cell cell"
+    "context_menu context_menu"
+    "copy copy"
+    "crosshair crosshair"
+    "fleur hand1"
+    "hand2 hand2"
+    "hand3 grabbing"
+    "help help"
+    "left_ptr left_ptr"
+    "move move"
+    "nodrop nodrop"
+    "sb_horizontal_double_arrow sb_h_double_arrow"
+    "sb_vertical_double_arrow sb_v_double_arrow"
+    "top_left_corner top_left_corner"
+    "top_right_corner top_right_corner"
+    "xterm xterm"
+    "xterm_horiz xterm_horiz"
+    "zoom_in zoom_in"
+    "zoom_out zoom_out"
+)
 
-    mv "../default_100_percent/common/pointers/alias.png" "alias_25.png"
-    mv "../default_100_percent/common/pointers/cell.png" "cell_25.png"
-	mv "../default_100_percent/common/pointers/context_menu.png" "context_menu_25.png"
-	mv "../default_100_percent/common/pointers/copy.png" "copy_25.png"
-	mv "../default_100_percent/common/pointers/crosshair.png" "crosshair_25.png"
-	mv "../default_100_percent/common/pointers/fleur.png" "hand1_25.png"
-	mv "../default_100_percent/common/pointers/hand2.png" "hand2_25.png"
-	mv "../default_100_percent/common/pointers/hand3.png" "grabbing_25.png"
-	mv "../default_100_percent/common/pointers/help.png" "help_25.png"
-	mv "../default_100_percent/common/pointers/left_ptr.png" "left_ptr_25.png"
-	mv "../default_100_percent/common/pointers/move.png" "move_25.png"
-	mv "../default_100_percent/common/pointers/nodrop.png" "nodrop_25.png"
-	mv "../default_100_percent/common/pointers/sb_h_double_arrow.png" "sb_h_double_arrow_25.png"
-	mv "../default_100_percent/common/pointers/sb_v_double_arrow.png" "sb_v_double_arrow_25.png"
-	mv "../default_100_percent/common/pointers/top_left_corner.png" "top_left_corner_25.png"
-	mv "../default_100_percent/common/pointers/top_right_corner.png" "top_right_corner_25.png"
-	mv "../default_100_percent/common/pointers/xterm.png" "xterm_25.png"
-	mv "../default_100_percent/common/pointers/xterm_horiz.png" "xterm_horiz_25.png"
-	mv "../default_100_percent/common/pointers/zoom_in.png" "zoom_in_25.png"
-	mv "../default_100_percent/common/pointers/zoom_out.png" "zoom_out_25.png"
+_package_list=(
+    "alias dnd-link"
+    "crosshair cross"
+    "grabbing fleur"
+    "grabbing pointer-move"
+    "grabbing dnd-move"
+    "hand1 grab"
+    "hand2 hand"
+    "hand2 pointer"
+    "help left_ptr_help"
+    "left_ptr all-scroll"
+    "left_ptr arrow"
+    "left_ptr default"
+    "left_ptr wait"
+    "left_ptr watch"
+    "nodrop no-drop"
+    "nodrop dnd-no-drop"
+    "sb_h_double_arrow e-resize"
+    "sb_h_double_arrow ew-resize"
+    "sb_h_double_arrow h_double_arrow"
+    "sb_h_double_arrow left_side"
+    "sb_h_double_arrow right_side"
+    "sb_h_double_arrow w-resize"
+    "sb_v_double_arrow bottom_side"
+    "sb_v_double_arrow n-resize"
+    "sb_v_double_arrow ns-resize"
+    "sb_v_double_arrow s-resize"
+    "sb_v_double_arrow row-resize"
+    "sb_v_double_arrow top_side"
+    "sb_v_double_arrow v_double_arrow"
+    "top_right_corner bd_double_arrow"
+    "top_left_corner bottom_right_corner"
+    "top_left_corner nw-resize"
+    "top_left_corner se-resize"
+    "top_right_corner bottom_left_corner"
+    "top_right_corner fd_double_arrow"
+    "top_right_corner ne-resize"
+    "top_right_corner sw-resize"
+    "xterm text"
+)
 
-	mv "../default_200_percent/common/pointers/alias.png" "alias_50.png"
-    mv "../default_200_percent/common/pointers/cell.png" "cell_50.png"
-	mv "../default_200_percent/common/pointers/context_menu.png" "context_menu_50.png"
-	mv "../default_200_percent/common/pointers/copy.png" "copy_50.png"
-	mv "../default_200_percent/common/pointers/crosshair.png" "crosshair_50.png"
-	mv "../default_200_percent/common/pointers/fleur.png" "hand1_50.png"
-	mv "../default_200_percent/common/pointers/hand2.png" "hand2_50.png"
-	mv "../default_200_percent/common/pointers/hand3.png" "grabbing_50.png"
-	mv "../default_200_percent/common/pointers/help.png" "help_50.png"
-	mv "../default_200_percent/common/pointers/left_ptr.png" "left_ptr_50.png"
-	mv "../default_200_percent/common/pointers/move.png" "move_50.png"
-	mv "../default_200_percent/common/pointers/nodrop.png" "nodrop_50.png"
-	mv "../default_200_percent/common/pointers/sb_h_double_arrow.png" "sb_h_double_arrow_50.png"
-	mv "../default_200_percent/common/pointers/sb_v_double_arrow.png" "sb_v_double_arrow_50.png"
-	mv "../default_200_percent/common/pointers/top_left_corner.png" "top_left_corner_50.png"
-	mv "../default_200_percent/common/pointers/top_right_corner.png" "top_right_corner_50.png"
-	mv "../default_200_percent/common/pointers/xterm.png" "xterm_50.png"
-	mv "../default_200_percent/common/pointers/xterm_horiz.png" "xterm_horiz_50.png"
-	mv "../default_200_percent/common/pointers/zoom_in.png" "zoom_in_50.png"
-	mv "../default_200_percent/common/pointers/zoom_out.png" "zoom_out_50.png"
+prepare() {
+    mkdir -p "$pkgname-$pkgver"
+    for pair in "${_prepare_list[@]}"
+    do
+        read -r src dst <<< "$pair"
+        mv "$srcdir/default_100_percent/common/pointers/$src.png" "$pkgname-$pkgver/${dst}_25.png"
+        mv "$srcdir/default_200_percent/common/pointers/$src.png" "$pkgname-$pkgver/${dst}_50.png"
+    done
 }
 
 build() {
-    cd "${pkgname}-${pkgver}"
-    make
+    make -f "$srcdir/makefile" -C "$pkgname-$pkgver"
+    base64 -d "$srcdir/LICENSE.b64" > "$pkgname-$pkgver/LICENSE"
 }
 
 package() {
-    cd "${pkgname}-${pkgver}"
-
-    install -dm 755 "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
+    cd "$pkgname-$pkgver"
 
-	install -m 644 "zoom_out" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "alias" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "cell" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "context_menu" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "copy" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "crosshair" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "grabbing" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "hand1" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "hand2" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "help" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "left_ptr" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "move" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "nodrop" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "top_left_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "top_right_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "xterm" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "xterm_horiz" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
-    install -m 644 "zoom_in" "${pkgdir}/usr/share/icons/${pkgname}/cursors/"
+    install -dm 755 "$pkgdir/usr/share/icons/$pkgname/cursors/"
 
-    ln -s "alias" "${pkgdir}/usr/share/icons/${pkgname}/cursors/dnd-link"
-    ln -s "bottom_left_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/sw-resize"
-    ln -s "bottom_right_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/se-resize"
-    ln -s "crosshair" "${pkgdir}/usr/share/icons/${pkgname}/cursors/cross"
-    ln -s "grabbing" "${pkgdir}/usr/share/icons/${pkgname}/cursors/fleur"
-    ln -s "grabbing" "${pkgdir}/usr/share/icons/${pkgname}/cursors/pointer-move"
-    ln -s "grabbing" "${pkgdir}/usr/share/icons/${pkgname}/cursors/dnd-move"
-    ln -s "hand" "${pkgdir}/usr/share/icons/${pkgname}/cursors/pointer"
-    ln -s "hand1" "${pkgdir}/usr/share/icons/${pkgname}/cursors/grab"
-    ln -s "hand2" "${pkgdir}/usr/share/icons/${pkgname}/cursors/hand"
-    ln -s "help" "${pkgdir}/usr/share/icons/${pkgname}/cursors/left_ptr_help"
-    ln -s "left_ptr" "${pkgdir}/usr/share/icons/${pkgname}/cursors/all-scroll"
-    ln -s "left_ptr" "${pkgdir}/usr/share/icons/${pkgname}/cursors/arrow"
-    ln -s "left_ptr" "${pkgdir}/usr/share/icons/${pkgname}/cursors/default"
-    ln -s "left_ptr" "${pkgdir}/usr/share/icons/${pkgname}/cursors/wait"
-    ln -s "left_ptr" "${pkgdir}/usr/share/icons/${pkgname}/cursors/watch"
-    ln -s "nodrop" "${pkgdir}/usr/share/icons/${pkgname}/cursors/no-drop"
-    ln -s "nodrop" "${pkgdir}/usr/share/icons/${pkgname}/cursors/dnd-no-drop"
-    ln -s "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/e-resize"
-    ln -s "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/ew-resize"
-    ln -s "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/h_double_arrow"
-    ln -s "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/left_side"
-    ln -s "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/right_side"
-    ln -s "sb_h_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/w-resize"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/bottom_side"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/n-resize"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/ns-resize"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/s-resize"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/row-resize"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/top_side"
-    ln -s "sb_v_double_arrow" "${pkgdir}/usr/share/icons/${pkgname}/cursors/v_double_arrow"
-    ln -s "top_right_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/bd_double_arrow"
-    ln -s "top_left_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/bottom_right_corner"
-    ln -s "top_left_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/nw-resize"
-    ln -s "top_right_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/bottom_left_corner"
-    ln -s "top_right_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/fd_double_arrow"
-    ln -s "top_right_corner" "${pkgdir}/usr/share/icons/${pkgname}/cursors/ne-resize"
-    ln -s "xterm" "${pkgdir}/usr/share/icons/${pkgname}/cursors/text"
+    for pair in "${_package_list[@]}"
+    do
+        read -r src dst <<< "$pair"
+        install -m 644 "$src" "$pkgdir/usr/share/icons/$pkgname/cursors/"
+        ln -s "$src" "$pkgdir/usr/share/icons/$pkgname/cursors/$dst"
+    done
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/makefile b/makefile
index 3c8c7dcd8e09..97fae51b4822 100644
--- a/makefile
+++ b/makefile
@@ -1,61 +1,61 @@
 all: alias cell context_menu copy crosshair grabbing hand1 hand2 help left_ptr move nodrop sb_h_double_arrow sb_v_double_arrow top_left_corner top_right_corner xterm xterm_horiz zoom_in zoom_out
 
 alias:
-	echo -en "25 11 12 alias_25.png\n50 22 23 alias_50.png" | xcursorgen - alias
+	printf "25 11 12 alias_25.png\n50 22 23 alias_50.png" | xcursorgen - alias
 
 cell:
-	echo -en "25 11 11 cell_25.png\n50 23 23 cell_50.png" | xcursorgen - cell
+	printf "25 11 11 cell_25.png\n50 23 23 cell_50.png" | xcursorgen - cell
 
 context_menu:
-	echo -en "25 3 2 context_menu_25.png\n50 6 4 context_menu_50.png" | xcursorgen - context_menu
+	printf "25 3 2 context_menu_25.png\n50 6 4 context_menu_50.png" | xcursorgen - context_menu
 
 copy:
-	echo -en "25 12 12 copy_25.png\n50 25 25 copy_50.png" | xcursorgen - copy
+	printf "25 12 12 copy_25.png\n50 25 25 copy_50.png" | xcursorgen - copy
 
 crosshair:
-	echo -en "25 12 12 crosshair_25.png\n50 24 24 crosshair_50.png" | xcursorgen - crosshair
+	printf "25 12 12 crosshair_25.png\n50 24 24 crosshair_50.png" | xcursorgen - crosshair
 
 grabbing:
-	echo -en "25 12 12 grabbing_25.png\n50 25 25 grabbing_50.png" | xcursorgen - grabbing
+	printf "25 12 12 grabbing_25.png\n50 25 25 grabbing_50.png" | xcursorgen - grabbing
 
 hand1:
-	echo -en "25 12 12 hand1_25.png\n50 25 25 hand1_50.png" | xcursorgen - hand1
+	printf "25 12 12 hand1_25.png\n50 25 25 hand1_50.png" | xcursorgen - hand1
 
 hand2:
-	echo -en "25 9 3 hand2_25.png\n50 19 6 hand2_50.png" | xcursorgen - hand2
+	printf "25 9 3 hand2_25.png\n50 19 6 hand2_50.png" | xcursorgen - hand2
 
 help:
-	echo -en "25 3 2 help_25.png\n50 6 4 help_50.png" | xcursorgen - help
+	printf "25 3 2 help_25.png\n50 6 4 help_50.png" | xcursorgen - help
 
 left_ptr:
-	echo -en "25 3 2 left_ptr_25.png\n50 4 6 left_ptr_50.png" | xcursorgen - left_ptr
+	printf "25 3 2 left_ptr_25.png\n50 4 6 left_ptr_50.png" | xcursorgen - left_ptr
 
 move:
-	echo -en "25 11 11 move_25.png\n50 23 23 move_50.png" | xcursorgen - move
+	printf "25 11 11 move_25.png\n50 23 23 move_50.png" | xcursorgen - move
 
 nodrop:
-	echo -en "25 12 12 nodrop_25.png\n50 25 25 nodrop_50.png" | xcursorgen - nodrop
+	printf "25 12 12 nodrop_25.png\n50 25 25 nodrop_50.png" | xcursorgen - nodrop
 
 sb_h_double_arrow:
-	echo -en "25 11 11 sb_h_double_arrow_25.png\n50 23 23 sb_h_double_arrow_50.png" | xcursorgen - sb_h_double_arrow
+	printf "25 11 11 sb_h_double_arrow_25.png\n50 23 23 sb_h_double_arrow_50.png" | xcursorgen - sb_h_double_arrow
 
 sb_v_double_arrow:
-	echo -en "25 11 11 sb_v_double_arrow_25.png\n50 23 23 sb_v_double_arrow_50.png" | xcursorgen - sb_v_double_arrow
+	printf "25 11 11 sb_v_double_arrow_25.png\n50 23 23 sb_v_double_arrow_50.png" | xcursorgen - sb_v_double_arrow
 
 top_left_corner:
-	echo -en "25 11 11 top_left_corner_25.png\n50 23 23 top_left_corner_50.png" | xcursorgen - top_left_corner
+	printf "25 11 11 top_left_corner_25.png\n50 23 23 top_left_corner_50.png" | xcursorgen - top_left_corner
 
 top_right_corner:
-	echo -en "25 11 11 top_right_corner_25.png\n50 23 23 top_right_corner_50.png" | xcursorgen - top_right_corner
+	printf "25 11 11 top_right_corner_25.png\n50 23 23 top_right_corner_50.png" | xcursorgen - top_right_corner
 
 xterm:
-	echo -en "25 12 11 xterm_25.png\n50 24 24 xterm_50.png" | xcursorgen - xterm
+	printf "25 12 11 xterm_25.png\n50 24 24 xterm_50.png" | xcursorgen - xterm
 
 xterm_horiz:
-	echo -en "25 11 11 xterm_horiz_25.png\n50 25 23 xterm_horiz_50.png" | xcursorgen - xterm_horiz
+	printf "25 11 11 xterm_horiz_25.png\n50 25 23 xterm_horiz_50.png" | xcursorgen - xterm_horiz
 
 zoom_in:
-	echo -en "25 10 10 zoom_in_25.png\n50 20 20 zoom_in_50.png" | xcursorgen - zoom_in
+	printf "25 10 10 zoom_in_25.png\n50 20 20 zoom_in_50.png" | xcursorgen - zoom_in
 
 zoom_out:
-	echo -en "25 10 10 zoom_out_25.png\n50 20 20 zoom_out_50.png" | xcursorgen - zoom_out
+	printf "25 10 10 zoom_out_25.png\n50 20 20 zoom_out_50.png" | xcursorgen - zoom_out