Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1673256543212660"
MIME-Version: 1.0
Date: Mon, 9 Jan 2023 09:29:03 +0000
From: "Paolo Vincenzo Olivo" <vins@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/ufetch
To: pkgsrc-changes@NetBSD.org
Reply-To: vins@netbsd.org
Message-Id: <20230109092903.6DE73FA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1673256543212660
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	vins
Date:		Mon Jan  9 09:29:03 UTC 2023

Modified Files:
	pkgsrc/sysutils/ufetch: Makefile PLIST.Linux

Log Message:
sysutils/ufetch: fix building on Linux.

Some distro identifiers had been renamed and others had been added,
breaking the package on Linux at install stage.

Simplify Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/ufetch/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/ufetch/PLIST.Linux

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


--_----------=_1673256543212660
Content-Disposition: inline
Content-Length: 2698
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/ufetch/Makefile
diff -u pkgsrc/sysutils/ufetch/Makefile:1.6 pkgsrc/sysutils/ufetch/Makefile:1.7
--- pkgsrc/sysutils/ufetch/Makefile:1.6	Mon Dec 19 09:32:36 2022
+++ pkgsrc/sysutils/ufetch/Makefile	Mon Jan  9 09:29:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/12/19 09:32:36 pin Exp $
+# $NetBSD: Makefile,v 1.7 2023/01/09 09:29:03 vins Exp $
 
 DISTNAME=	ufetch-v0.3
 PKGNAME=	${DISTNAME:S/-v/-/}
@@ -19,32 +19,25 @@ INSTALLATION_DIRS+=	bin
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-FLAVOR=	netbsd
-.elif ${OPSYS} == "OpenBSD"
-FLAVOR=	openbsd
-.elif ${OPSYS} == "FreeBSD"
-FLAVOR=	freebsd
-.elif ${OPSYS} == "Darwin"
+.if ${OPSYS:M*BSD} || ${OPSYS} == Linux
+FLAVOR=	${LOWER_OPSYS}
+.elif ${OPSYS} == Darwin
 FLAVOR=	macos
-.elif ${OPSYS} == "Linux"
-FLAVOR=	linux
 .else
 BROKEN=	"Unsupported OS"
 .endif
 
 do-install:
-	${RUN} cd ${WRKSRC} && \
-		${INSTALL_SCRIPT} \
-			ufetch-${FLAVOR} ${DESTDIR}${PREFIX}/bin/ufetch
+	${INSTALL_SCRIPT} ${WRKSRC}/ufetch-${FLAVOR}	\
+		${DESTDIR}${PREFIX}/bin/ufetch
 .if ${OPSYS} == "Linux"
-.  for f in alpine antergos arch archbang arco artix aux centos crux debian \
-          elementary fedora gentoo gnewsense guixsd hyperbola linuxlite mageia \
-          manjaro mint mx nixos parabola popos pureos raspbian slackware suse \
-          ubuntu void
-	${RUN} cd ${WRKSRC} && \
-		${INSTALL_SCRIPT} \
-			ufetch-${f} ${DESTDIR}${PREFIX}/bin/ufetch-${f}
+.  for i in *bsd linux macos
+	${RUN}${FIND} ${WRKSRC} -maxdepth 1 -type f	\
+		-name ufetch-${i} -delete
+.  endfor
+.  for f in ufetch-*
+	${INSTALL_SCRIPT} ${WRKSRC}/${f}		\
+		${DESTDIR}${PREFIX}/bin
 .  endfor
 .endif
 

Index: pkgsrc/sysutils/ufetch/PLIST.Linux
diff -u pkgsrc/sysutils/ufetch/PLIST.Linux:1.3 pkgsrc/sysutils/ufetch/PLIST.Linux:1.4
--- pkgsrc/sysutils/ufetch/PLIST.Linux:1.3	Tue Dec 31 11:16:49 2019
+++ pkgsrc/sysutils/ufetch/PLIST.Linux	Mon Jan  9 09:29:03 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2019/12/31 11:16:49 ng0 Exp $
+@comment $NetBSD: PLIST.Linux,v 1.4 2023/01/09 09:29:03 vins Exp $
 bin/ufetch-alpine
 bin/ufetch-antergos
 bin/ufetch-arch
@@ -9,12 +9,14 @@ bin/ufetch-aux
 bin/ufetch-centos
 bin/ufetch-crux
 bin/ufetch-debian
+bin/ufetch-devuan
 bin/ufetch-elementary
 bin/ufetch-fedora
 bin/ufetch-gentoo
 bin/ufetch-gnewsense
-bin/ufetch-guixsd
+bin/ufetch-guix
 bin/ufetch-hyperbola
+bin/ufetch-instantos
 bin/ufetch-linuxlite
 bin/ufetch-mageia
 bin/ufetch-manjaro
@@ -24,7 +26,7 @@ bin/ufetch-nixos
 bin/ufetch-parabola
 bin/ufetch-popos
 bin/ufetch-pureos
-bin/ufetch-raspbian
+bin/ufetch-raspberrypios
 bin/ufetch-slackware
 bin/ufetch-suse
 bin/ufetch-ubuntu


--_----------=_1673256543212660--