Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jun 2022 21:56:59 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: bb4ded315cec - main - sysutils/mapchan: Refresh pkg-plist
Message-ID:  <202206062156.256LuxGU081115@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=bb4ded315cecbd9ed100154e77a71aef76d66463

commit bb4ded315cecbd9ed100154e77a71aef76d66463
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-06-06 21:43:16 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-06-06 21:56:48 +0000

    sysutils/mapchan: Refresh pkg-plist
    
    - Use @sample instead of @unexec
    - Use %%ETCDIR%%
    - Fix post-install for DOCS
---
 sysutils/mapchan/Makefile  | 23 +++++++++++++++--------
 sysutils/mapchan/pkg-plist | 25 ++++++++++++-------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/sysutils/mapchan/Makefile b/sysutils/mapchan/Makefile
index c7eb83d48ee7..13c01d7d6de8 100644
--- a/sysutils/mapchan/Makefile
+++ b/sysutils/mapchan/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mapchan
 PORTVERSION=	3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils converters
 MASTER_SITES=	SF
 
@@ -12,24 +12,31 @@ COMMENT=	Transform the input and output of a terminal (SCO Unix alike)
 LICENSE=	GPLv2
 
 USES=		iconv tar:tgz
-WRKSRC=		${WRKDIR}/${PORTNAME}
-MAKE_ENV=	STAGEDIR=${STAGEDIR} MAPDIR=${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+
+MAKE_ENV=	MAPDIR=${STAGEDIR}${PREFIX}/etc/${PORTNAME} \
+		STAGEDIR=${STAGEDIR}
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${CP} ${WRKSRC}/doc/mapchan.F ${WRKSRC}/doc/mapchan.8
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${STAGEDIR}${MANPREFIX}/man/man8
-
 post-patch:
 	@${MV} ${WRKSRC}/examples/default ${WRKSRC}/examples/default.sample
 	@${RM} ${WRKSRC}/examples/default.orig
 	${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" ${WRKSRC}/mapchan.c
 	${REINPLACE_CMD} -e "s|utmp.h|utmpx.h|" ${WRKSRC}/mapchan.c
 
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/mapchan.8 ${STAGEDIR}${MANPREFIX}/man/man8
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/sysutils/mapchan/pkg-plist b/sysutils/mapchan/pkg-plist
index e7b5b779df18..8393db0c8632 100644
--- a/sysutils/mapchan/pkg-plist
+++ b/sysutils/mapchan/pkg-plist
@@ -1,16 +1,15 @@
 bin/mapchan
-etc/mapchan/altkoi.map
-@unexec if cmp -s %D/etc/mapchan/default %D/etc/mapchan/default.sample; then rm -f %D/etc/mapchan/default; fi
-etc/mapchan/default.sample
-etc/mapchan/dos2koi-kbd.map
-etc/mapchan/dos2koi.map
-etc/mapchan/k180.map
-etc/mapchan/koi2win.map
-etc/mapchan/koiualt.map
-etc/mapchan/koiumain.map
-etc/mapchan/msm.map
-etc/mapchan/sm7238.map
-etc/mapchan/trivial.map
-etc/mapchan/win2koi.map
+%%ETCDIR%%/altkoi.map
+@sample %%ETCDIR%%/default.sample
+%%ETCDIR%%/dos2koi-kbd.map
+%%ETCDIR%%/dos2koi.map
+%%ETCDIR%%/k180.map
+%%ETCDIR%%/koi2win.map
+%%ETCDIR%%/koiualt.map
+%%ETCDIR%%/koiumain.map
+%%ETCDIR%%/msm.map
+%%ETCDIR%%/sm7238.map
+%%ETCDIR%%/trivial.map
+%%ETCDIR%%/win2koi.map
 man/man8/mapchan.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/README



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