Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jan 2024 19:25:50 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 3e3ec4e657dc - main - emulators/hatari: Sanitize MANPREFIX
Message-ID:  <202401211925.40LJPow7072314@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e3ec4e657dc166e309ab07c02bee0597e0ce781

commit 3e3ec4e657dc166e309ab07c02bee0597e0ce781
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-21 19:01:48 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-21 19:25:26 +0000

    emulators/hatari: Sanitize MANPREFIX
    
    Approved by:    tz (private mail)
---
 emulators/hatari/Makefile  | 18 +++++++++---------
 emulators/hatari/pkg-plist | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index d4b4eef28e5f..5be9728b9c28 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hatari
 PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
 
@@ -25,9 +25,9 @@ SHEBANG_FILES=	python-ui/*.py tools/*.py \
 		tools/debugger/*.py tools/hconsole/*.py
 
 CMAKE_ARGS=	-DETCDIR:PATH="${PREFIX}/etc" \
-		-DMANDIR:PATH="man/man1" \
 		-DREADLINE_FOUND:BOOL=ON
 
+#		-DMANDIR:PATH="share/man/man1"
 OPTIONS_DEFINE=		DEBUG DOCS SDL2 WINUAE
 
 DEBUG_CFLAGS_OFF=	-DNDEBUG
@@ -53,13 +53,13 @@ post-patch:
 		 s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' ${WRKSRC}/tools/atari-hd-image.sh
 
 post-install:
-	${MKDIR} ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/python-ui/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/debugger/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/hconsole/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/tools/hmsa/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/python-ui/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tools/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tools/debugger/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tools/hconsole/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tools/hmsa/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/hatari/pkg-plist b/emulators/hatari/pkg-plist
index 65cb802df457..03175af65fc3 100644
--- a/emulators/hatari/pkg-plist
+++ b/emulators/hatari/pkg-plist
@@ -26,16 +26,16 @@ bin/zip2st
 %%DATADIR%%/hconsole/hconsole.py
 %%DATADIR%%/hconsole/%%CMAKE_BUILD_TYPE%%-notes.txt
 %%DATADIR%%/tos.img
-man/man1/atari-convert-dir.1.gz
-man/man1/atari-hd-image.1.gz
-man/man1/gst2ascii.1.gz
-man/man1/hatari-prg-args.1.gz
-man/man1/hatari.1.gz
-man/man1/hatari_profile.1.gz
-man/man1/hatariui.1.gz
-man/man1/hconsole.1.gz
-man/man1/hmsa.1.gz
-man/man1/zip2st.1.gz
+share/man/man1/atari-convert-dir.1.gz
+share/man/man1/atari-hd-image.1.gz
+share/man/man1/gst2ascii.1.gz
+share/man/man1/hatari-prg-args.1.gz
+share/man/man1/hatari.1.gz
+share/man/man1/hatari_profile.1.gz
+share/man/man1/hatariui.1.gz
+share/man/man1/hconsole.1.gz
+share/man/man1/hmsa.1.gz
+share/man/man1/zip2st.1.gz
 share/applications/hatari.desktop
 share/applications/hatariui.desktop
 %%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401211925.40LJPow7072314>