Remove realpath -> readlink(1) quirks, we have realpath(1) in base now

2021-10-17 13:06:59 +00:00 · 2021-10-17 13:06:59 +00:00 · bba56a3b56
commit bba56a3b56
parent 993f72bcd7
10 changed files with 17 additions and 85 deletions
--- a/devel/intellij/Makefile
+++ b/devel/intellij/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.77 2021/10/16 08:25:31 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.78 2021/10/17 13:06:59 kn Exp $

 COMMENT=		IntelliJ IDEA Java IDE

 V=			2021.2.3
+REVISION=		0
 DISTNAME=		ideaIC-${V}-no-jbr
 PKGNAME=		intellij-${V}
 CATEGORIES=		devel
--- a/devel/intellij/patches/patch-bin_idea_sh
+++ b/devel/intellij/patches/patch-bin_idea_sh
@ -1,27 +0,0 @@
-$OpenBSD: patch-bin_idea_sh,v 1.4 2021/10/11 05:27:28 rsadowski Exp $
-
-Index: bin/idea.sh
--- bin/idea.sh.orig
-+++ bin/idea.sh
-@@ -21,10 +21,10 @@ message()
-   fi
- }
- 
-if [ -z "$(command -v uname)" ] || [ -z "$(command -v realpath)" ] || [ -z "$(command -v dirname)" ] || [ -z "$(command -v cat)" ] || \
-+if [ -z "$(command -v uname)" ] || [ -z "$(command -v readlink)" ] || [ -z "$(command -v dirname)" ] || [ -z "$(command -v cat)" ] || \
-    [ -z "$(command -v egrep)" ]; then
-   TOOLS_MSG="Required tools are missing:"
-  for tool in uname realpath egrep dirname cat ; do
-+  for tool in uname readlink egrep dirname cat ; do
-      test -z "$(command -v $tool)" && TOOLS_MSG="$TOOLS_MSG $tool"
-   done
-   message "$TOOLS_MSG (SHELL=$SHELL PATH=$PATH)"
-@@ -39,7 +39,7 @@ OS_ARCH=$(uname -m)
- # ---------------------------------------------------------------------
- # Ensure $IDE_HOME points to the directory where the IDE is installed.
- # ---------------------------------------------------------------------
-IDE_BIN_HOME=$(dirname "$(realpath "$0")")
-+IDE_BIN_HOME=$(dirname "$(readlink -f "$0")")
- IDE_HOME=$(dirname "${IDE_BIN_HOME}")
- CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}"
- 
--- a/devel/pycharm/Makefile
+++ b/devel/pycharm/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2021/10/11 05:09:29 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.37 2021/10/17 13:06:59 kn Exp $

 COMMENT=		Python IDE based on IntelliJ IDEA

 V=			2021.2.2
+REVISION=		0
 DISTNAME=		pycharm-community-${V}
 PKGNAME=		pycharm-${V}
 CATEGORIES=		devel
--- a/devel/pycharm/patches/patch-bin_pycharm_sh
+++ b/devel/pycharm/patches/patch-bin_pycharm_sh
@ -1,27 +0,0 @@
-$OpenBSD: patch-bin_pycharm_sh,v 1.4 2021/10/11 05:12:07 rsadowski Exp $
-
-Index: bin/pycharm.sh
--- bin/pycharm.sh.orig
-+++ bin/pycharm.sh
-@@ -21,10 +21,10 @@ message()
-   fi
- }
- 
-if [ -z "$(command -v uname)" ] || [ -z "$(command -v realpath)" ] || [ -z "$(command -v dirname)" ] || [ -z "$(command -v cat)" ] || \
-+if [ -z "$(command -v uname)" ] || [ -z "$(command -v readlink)" ] || [ -z "$(command -v dirname)" ] || [ -z "$(command -v cat)" ] || \
-    [ -z "$(command -v egrep)" ]; then
-   TOOLS_MSG="Required tools are missing:"
-  for tool in uname realpath egrep dirname cat ; do
-+  for tool in uname readlink egrep dirname cat ; do
-      test -z "$(command -v $tool)" && TOOLS_MSG="$TOOLS_MSG $tool"
-   done
-   message "$TOOLS_MSG (SHELL=$SHELL PATH=$PATH)"
-@@ -39,7 +39,7 @@ OS_ARCH=$(uname -m)
- # ---------------------------------------------------------------------
- # Ensure $IDE_HOME points to the directory where the IDE is installed.
- # ---------------------------------------------------------------------
-IDE_BIN_HOME=$(dirname "$(realpath "$0")")
-+IDE_BIN_HOME=$(dirname "$(readlink -f "$0")")
- IDE_HOME=$(dirname "${IDE_BIN_HOME}")
- CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}"
- 
--- a/devel/reposurgeon/Makefile
+++ b/devel/reposurgeon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2021/02/23 19:39:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2021/10/17 13:06:59 kn Exp $

 COMMENT=	tool for editing version-control repository history

@ -39,9 +39,7 @@ pre-test:
 	sed -i s,/usr/local,${LOCALBASE},g ${WRKSRC}/test/setpython
 	-ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
 	-ln -s ${LOCALBASE}/python${MODPY_DEFAULT_VERSION_3} ${WRKDIR}/bin/python3
-.for i in realpath make
-	-ln -s ${LOCALBASE}/bin/g$i ${WRKDIR}/bin/$i
-.endfor
+	-ln -s ${LOCALBASE}/bin/gmake ${WRKDIR}/bin/make

 MODPY_ADJ_FILES= repocutter repodiffer repomapper reposurgeon

--- a/games/openra/Makefile
+++ b/games/openra/Makefile
@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/12 13:52:49 patrick Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/17 13:06:59 kn Exp $

 COMMENT =		open-source real-time strategy game engine
 V =			20210321
+REVISION =		0
 DISTNAME =		openra-${V}
 CATEGORIES =		games x11
 HOMEPAGE =		https://www.openra.net
--- a/games/openra/patches/patch-launch-game_sh
+++ b/games/openra/patches/patch-launch-game_sh
@ -1,4 +1,8 @@
-$OpenBSD: patch-launch-game_sh,v 1.3 2021/05/12 13:52:49 patrick Exp $
+$OpenBSD: patch-launch-game_sh,v 1.4 2021/10/17 13:06:59 kn Exp $
+
+- replace python script with realpath(1) call
+- fix argument parsing.
+- set OpenRA.exe path.

 Index: launch-game.sh
 --- launch-game.sh.orig
@ -10,7 +14,7 @@ Index: launch-game.sh
 -else
 -	 MODLAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 -fi
-+MODLAUNCHER=$(readlink -f $0)
+MODLAUNCHER=$(realpath "$0")
 
 # Prompt for a mod to launch if one is not already specified
 MODARG=''
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2021/10/03 22:16:43 kn Exp $
+# $OpenBSD: Makefile,v 1.20 2021/10/17 13:06:59 kn Exp $

 COMMENT =	simple X Image Viewer

 GH_PROJECT =	sxiv
 GH_ACCOUNT =	muennich
 GH_TAGNAME =	v26
-REVISION =	0
+REVISION =	1

 CATEGORIES =	graphics x11

--- a/graphics/sxiv/patches/patch-exec_key-handler
+++ b/graphics/sxiv/patches/patch-exec_key-handler
@ -1,14 +0,0 @@
-$OpenBSD: patch-exec_key-handler,v 1.1 2019/10/03 10:29:32 kn Exp $
-
-Index: exec/key-handler
--- exec/key-handler.orig
-+++ exec/key-handler
-@@ -14,7 +14,7 @@
- 
- rotate() {
- 	degree="$1"
-	tr '\n' '\0' | xargs -0 realpath | sort | uniq | while read file; do
-+	tr '\n' '\0' | xargs -0 readlink -f | sort | uniq | while read file; do
- 		case "$(file -b -i "$file")" in
- 		image/jpeg*) jpegtran -rotate "$degree" -copy all -outfile "$file" "$file" ;;
- 		*)           mogrify  -rotate "$degree" "$file" ;;
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2021/10/15 21:51:53 kn Exp $
+# $OpenBSD: Makefile,v 1.67 2021/10/17 13:06:59 kn Exp $

 COMMENT =		high-performance HTTP accelerator

@ -61,11 +61,6 @@ MAN =			${RC}.1
 RCINST =		${PREFIX}/bin/${RC:T}
 MANINST =		${PREFIX}/man/man1/${MAN:T}

-# XXX ${WRKSRC}/doc/sphinx/Makefile.{am,in}
-pre-build:
-	echo 'readlink -f "$$@"' >| ${WRKDIR}/bin/realpath
-	chmod +x ${WRKDIR}/bin/realpath
-
 post-install:
 	${SUBST_PROGRAM} ${RC} ${RCINST}
 	@ksh -n ${RCINST}