improvements and more stuffs

soft/android-udev-rules

@@ -3,13 +3,12 @@
 NAME=android-udev-rules
 VERSION=nightly
 UPSTREAM=https://github.com/M0Rf30/android-udev-rules.git
-UPSTREAM_TYPE=git
 . soft
 
 # rather than requiring user to be in `adbusers`, just use group wheel
-sed -i .orig -e s.adbusers.wheel.g "$PREFIX"/src/android-udev-rules/51-android.rules
+sed -i .orig -e s.adbusers.wheel.g "$SRC"/51-android.rules
 mkdir -p /etc/udev/rules.d
-cp "$PREFIX"/src/android-udev-rules/51-android.rules /etc/udev/rules.d/51-android.rules
+cp "$SRC"/51-android.rules /etc/udev/rules.d/51-android.rules
 chmod a+r /etc/udev/rules.d/51-android.rules
 
 soft_advise '#' udevadm control --reload-rules

soft/audacious-theme-sailor-moon-gang

@@ -6,6 +6,6 @@ UPSTREAM=https://archive.org/download/winampskin_Sailor_Moon_Gang/Sailor_Moon_Ga
 UPSTREAM_TYPE=https
 . soft
 
-mkdir -p "$PREFIX/share/audacious/Skins"
+mkdir -p "$SHARE/audacious/Skins"
-ln -s	"$PREFIX/src/$NAME/Sailor_Moon_Gang.wsz" \
+ln -s	"$SRC"/Sailor_Moon_Gang.wsz \
-	"$PREFIX/share/audacious/Skins/Sailor_Moon_Gang.wsz"
+	"$SHARE/audacious/Skins/Sailor_Moon_Gang.wsz"

soft/bar

@@ -3,7 +3,6 @@
 NAME=bar
 VERSION=nightly
 UPSTREAM=https://github.com/LemonBoy/bar.git
-UPSTREAM_TYPE=git
 . soft
 
-$GMAKE -C "$PREFIX/src/$NAME" PREFIX="$PREFIX" install
+$GMAKE -C "$SRC" PREFIX="$PREFIX" install

soft/bspwm

@@ -3,7 +3,6 @@
 NAME=bspwm
 VERSION=nightly
 UPSTREAM=https://github.com/baskerville/bspwm.git
-UPSTREAM_TYPE=git
 . soft
 
 # depends on
@@ -15,4 +14,4 @@ UPSTREAM_TYPE=git
 #	xcb-util-keysyms-devel
 #	xcb-util-wm-devel
 
-$GMAKE -C "$PREFIX/src/NAME" install
+$GMAKE -C "$SRC" install

soft/cmatrix

@@ -3,7 +3,6 @@
 NAME=cmatrix
 VERSION=nightly
 UPSTREAM=https://github.com/abishekvashok/cmatrix.git
-UPSTREAM_TYPE=git
 . soft
 
 # depends on:

soft/git-filter-repo

@@ -3,6 +3,5 @@
 NAME=git-filter-repo
 VERSION=nightly
 UPSTREAM=https://github.com/newren/git-filter-repo.git
-UPSTREAM_TYPE=git
 
-ln -s "$PREFIX/src/$NAME/git-filter-repo" "$PREFIX/bin/git-filter-repo"
+ln -s "$SRC/git-filter-repo" "$BIN/git-filter-repo"

soft/macchanger

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+NAME=macchanger
+VERSION=nightly
+UPSTREAM=https://github.com/alobbs/macchanger.git
+. soft
+
+# depends on
+#	texinfo
+
+sh -c 'cd "$SRC"; ./autogen.sh --prefix="$PREFIX"'
+# https://github.com/alobbs/macchanger/issues/14
+sed -i .orig -e 's/caddr_t/void */' "$SRC"/src/netinfo.c
+$GMAKE -C "$SRC" install

soft/nmap

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+NAME=nmap
+VERSION=7.80
+UPSTREAM=https://nmap.org/dist/nmap-7.80.tar.bz2
+UPSTREAM_TYPE=custom
+get_upstream(){
+	curl "$UPSTREAM" | bzip2 -cd | tar x -C "$PREFIX/src"
+	mv "$PREFIX/src/nmap-7.80" "$SRC"
+}
+. soft
+
+# nmap 7.80 is the last Free nmap release
+# depends on linux-headers
+# had to # ln -s /bin/gmake "$PREFIX"/make
+# with clang 16.0.6 aarch75-chimera-linux-musl, cannot compile (4 errors?)
+
+sh -c 'cd "$SRC"; ./configure --prefix="$PREFIX"'
+$GMAKE -C "$SRC"

soft/rofi

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+NAME=rofi
+VERSION=nightly
+UPSTREAM=https://davatorium/rofi.git
+
+# depends on
+# 	bison
+# 	cairo-devel
+# 	flex
+# 	gdk-pixbuf-devel
+# 	glib-devel
+# 	libxkbcommon-devel
+# 	pango-devel
+# 	pkgconf
+# 	meson
+# 	startup-notification-devel
+# 	xcb-util-cursor-devel
+sh -c 'cd "$SRC"; meson setup build'
+ninja -C "$SRC"/build install

soft/scrot

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+NAME=scrot
+VERSION=nightly
+UPSTREAM=https://github.com/resurrecting-open-source-projects/scrot.git
+. soft
+
+# depends on
+# 	autoconf
+# 	autoconf-archive
+# 	imlib2-devel
+# 	libxcomposite-devel
+# 	libxfixes-devel
+
+sh -c 'cd "$SRC"; ./autogen.sh'
+sh -c 'cd "$SRC"; ./configure MAKE="$MAKE" PREFIX="$PREFIX"'
+$MAKE -C "$SRC" install

soft/soft

@@ -5,13 +5,28 @@ set -e
 GMAKE=gmake
 PREFIX=/usr/local
 
+BIN="$PREFIX/bin"
+SHARE="$PREFIX"/share
+FONTS="$SHARE"/fonts
+SRC="$PREFIX/src/$NAME"
+
 case "$UPSTREAM_TYPE" in
-https)	mkdir -p "$PREFIX/src/$NAME"
+custom)	;;
-	curl -O "$UPSTREAM" --output-dir "$PREFIX/src/$NAME" ;;
+*)	get_upstream(){
-git)	git pull "$UPSTREAM" "$PREFIX/src/$NAME" ;;
+		case "$UPSTREAM_TYPE" in
-*)	! printf '%s: %s: %s: Unknown upstream type\n' \
+		custom)	;;
+		http*)	mkdir -p "$SRC"
+			curl -O "$UPSTREAM" --output-dir "$SRC" ;;
+		git)	git pull "$UPSTREAM" "$SRC" ;;
+		*)	case "$UPSTREAM" in
+			git:*)	UPSTREAM_TYPE=git; get_upstream ;;
+			*.git)	UPSTREAM_TYPE=git; get_upstream ;;
+			*)	! printf '%s: %s: %s: Unknown upstream type\n'\
 					soft "$NAME" "$UPSTREAM_TYPE" >&2 ;;
-esac
+		esac
+	esac
+	} ;;
+esac; get_upstream
 
 soft_advise(){
 	printf "\

soft/unrar

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+NAME=unrar
+VERSION=nightly
+UPSTREAM=https://github.com/pmachapman/unrar.git
+. soft
+
+# depends on
+#	g++
+$MAKE -C "$SRC"
+ln -s "$SRC/$NAME" "$BIN/$NAME"

soft/unscii-16-full-ttf

@@ -0,0 +1,7 @@
+NAME=unscii-16-full-ttf
+VERSION=nightly
+UPSTREAM=http://viznut.fi/unscii/unscii-16-full.ttf
+UPSTREAM_TYPE=http
+. soft
+
+ln -s "$SRC"/unscii-16-full.ttf "$FONTS"/unscii-16-full.ttf

soft/wiringpi

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+NAME=wiringpi
+VERSION=nightly
+UPSTREAM=https://github.com/WiringPi/WiringPi.git
+. soft
+
+# I tried final_official_2.50 but it wouldn't build
+# (ld: error: duplicate symbol: comDat)
+# depends on
+#	sudo
+
+git -C "$SRC" checkout 2.61-1
+sed -i .orig -e /^sudo/d "$SRC"/build
+sed -i .orig -e s/root\.root/root\:root/ "$SRC"/gpio
+sh -c 'cd "SRC"; sudo=sudo ./build'

soft/xdo

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+NAME=xdo
+VERSION=nightly
+UPSTREAM=https://github.com/baskerville/xdo.git
+. soft
+
+$GMAKE -C "$SRC" install