git: 6e26f683ee51 - main - devel/icmake: Update version 9.02.08=>9.03.01

Muhammad Moinur Rahman bofh at FreeBSD.org
Fri Jun 4 11:14:34 UTC 2021 

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6e26f683ee5161bf03ebbdd0eaaeceb2e274ba3d

commit 6e26f683ee5161bf03ebbdd0eaaeceb2e274ba3d
Author:     Muhammad Moinur Rahman <bofh at FreeBSD.org>
AuthorDate: 2021-06-04 09:43:51 +0000
Commit:     Muhammad Moinur Rahman <bofh at FreeBSD.org>
CommitDate: 2021-06-04 11:13:59 +0000

    devel/icmake: Update version 9.02.08=>9.03.01
    
    - Make proper use of SHEBANG_ instead of REINPLACE
    - portlint housekeeping
    - Update WWW
    
    Relnotes: https://gitlab.com/fbb-git/icmake/-/tags/9.03.01
---
 devel/icmake/Makefile  | 90 +++++++++++++++++++-------------------------------
 devel/icmake/distinfo  |  6 ++--
 devel/icmake/pkg-descr |  2 +-
 devel/icmake/pkg-plist | 32 +++++++++---------
 4 files changed, 54 insertions(+), 76 deletions(-)

diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index 52bcbb88f9e4..093ae0f0fef7 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	icmake
-PORTVERSION=	9.02.08
+PORTVERSION=	9.03.01
 CATEGORIES=	devel
 
 MAINTAINER=	bofh at FreeBSD.org
@@ -10,42 +10,32 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bash:shells/bash \
 		gsed:textproc/gsed
 
-WRKSRC_SUBDIR=	${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	*
+USES=		compiler shebangfix
+USE_GITLAB=	yes
 
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+WRKSRC_SUBDIR=	${PORTNAME}
+PORTDOCS=	changelog.gz icmake.ps.gz
+PORTEXAMPLES=	*
 
 REINPLACE_ARGS=	-I ""
 
-USES=		compiler shebangfix
-SHEBANG_FILES=	build comp/build comp/icm_bootstrap comp/updategrammar \
-		comp/updateparser comp/updatescanner dep/build dep/icm_bootstrap \
-		exec/build exec/icm_bootstrap exec/list/test/build exec/string/test/build \
-		icm_bootstrap icm_gitlab icm_install icm_prepare icmake/build \
-		icmake/icm_bootstrap icmake/setlinks icmbuild/build icmbuild/icm_bootstrap \
-		iuo/bootstrapinstall iuo/install iuo/uninstall pp/build pp/icm_bootstrap \
-		rss/build rss/icm_bootstrap scripts/convert un/build un/icm_bootstrap
+SHEBANG_FILES=	examples/* icm_install icm_prepare scripts/convert
+SHEBANG_GLOB=	icm_bootstrap
+SHEBANG_LANG=	icmake
+icmake_OLD_CMD=	/usr/bin/icmake
+icmake_CMD=	${LOCALBASE}/bin/icmake
 
-USE_GITLAB=	yes
 GL_ACCOUNT=	fbb-git
-GL_COMMIT=	8e3ac3057363162b87279bab1e9ba356eb0aea0f
+GL_COMMIT=	9b958b05ac462adf6cde394875964a8127599514
 
-.include <bsd.port.options.mk>
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} == 42
-CFLAGS+=	-std=gnu99
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find|find .|g' \
 		${WRKSRC}/icm_prepare
 	@${REINPLACE_CMD} -e 's|tput clear|clear|g' \
-		${WRKSRC}/scripts/icmbuild.in \
 		${WRKSRC}/changelog \
 		${WRKSRC}/icmbuild/usage.c \
 		${WRKSRC}/doc/icmconf.7 \
@@ -56,49 +46,37 @@ post-patch:
 		${WRKSRC}/scripts/conversions \
 		${WRKSRC}/scripts/convert
 	@${REINPLACE_CMD} -e 's|"usr/bin"|"bin"| ; \
-		s|"usr/share/icmake"|"share/icmake-${PORTVERSION}"| ; \
+		s|"usr/share/icmake"|"share/icmake"| ; \
 		s|"usr/share/man"|"man"| ; \
-		s|"usr/lib/icmake"|"lib/icmake-${PORTVERSION}"| ; \
-		s|"usr/share/doc/icmake"|"share/doc/icmake-${PORTVERSION}"| ; \
-		s|"usr/share/doc/icmake-doc"|"share/doc/icmake-${PORTVERSION}/doc"|' \
+		s|"usr/lib/icmake"|"lib/icmake"| ; \
+		s|"usr/share/doc/icmake"|"share/doc/icmake"| ; \
+		s|"usr/share/doc/icmake-doc"|"share/examples/icmake"|' \
 		${WRKSRC}/INSTALL.im
-	@${REINPLACE_CMD} -e 's|cp -r|cp -R|' \
+	@${REINPLACE_CMD} -e 's|cp -r|cp -R| ; \
+		s|DOCDOCDIR}/icmake|DOCDIR}/icmake| ; \
+		s|examples tmp|examples/* tmp|' \
 		${WRKSRC}/icm_bootstrap \
 		${WRKSRC}/icm_install
-	@${REINPLACE_CMD} -e 's|#!.*/usr/bin/icmake|#!${PREFIX}/bin/icmake|' \
-		${WRKSRC}/comp/build \
-		${WRKSRC}/doc/icmake.1 \
-		${WRKSRC}/doc/manpage/icmake.yo \
-		${WRKSRC}/doc/manpage/build \
-		${WRKSRC}/examples/am \
-		${WRKSRC}/examples/bup \
-		${WRKSRC}/examples/defines \
-		${WRKSRC}/examples/ds \
-		${WRKSRC}/examples/ftpxfer \
-		${WRKSRC}/examples/idir \
-		${WRKSRC}/examples/initialization \
-		${WRKSRC}/examples/killprog \
-		${WRKSRC}/examples/nesteddirectives \
-		${WRKSRC}/examples/r \
-		${WRKSRC}/examples/tolower \
-		${WRKSRC}/exec/build \
-		${WRKSRC}/pp/build \
-		${WRKSRC}/rss/build
 	@${REINPLACE_CMD} -e 's|"gcc"|"${CC}"|g; s|-Wall -O2|${CFLAGS}|g' \
-		${WRKSRC}/comp/build \
 		${WRKSRC}/doc/icmake.doc \
 		${WRKSRC}/exec/icmconf \
-		${WRKSRC}/usr/share/icmake/icmconf \
-		${WRKSRC}/exec/build \
-		${WRKSRC}/pp/build \
-		${WRKSRC}/rss/build \
-		${WRKSRC}/un/build
+		${WRKSRC}/usr/share/icmake/icmconf
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_prepare ${PREFIX}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_bootstrap x
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install strip all ${STAGEDIR}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install strip progs ${STAGEDIR}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install scripts ${STAGEDIR}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install etc ${STAGEDIR}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install man ${STAGEDIR}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install skel ${STAGEDIR}
+
+do-install-DOCS-on:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install doc ${STAGEDIR}
+
+do-install-EXAMPLES-on:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install docdoc ${STAGEDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/icmake/distinfo b/devel/icmake/distinfo
index bd160194129c..17a36e3ff595 100644
--- a/devel/icmake/distinfo
+++ b/devel/icmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617884670
-SHA256 (fbb-git-icmake-8e3ac3057363162b87279bab1e9ba356eb0aea0f_GL0.tar.gz) = d8744886bd3c9ac999d783d6e0df74c523ccd4fef7a877080e0b5727a979fd0c
-SIZE (fbb-git-icmake-8e3ac3057363162b87279bab1e9ba356eb0aea0f_GL0.tar.gz) = 372679
+TIMESTAMP = 1622788065
+SHA256 (fbb-git-icmake-9b958b05ac462adf6cde394875964a8127599514_GL0.tar.gz) = a2734c690fbe4a26d8275f759644419bd85dc5f34f1d03fd0157ceb29c36dfbc
+SIZE (fbb-git-icmake-9b958b05ac462adf6cde394875964a8127599514_GL0.tar.gz) = 393585
diff --git a/devel/icmake/pkg-descr b/devel/icmake/pkg-descr
index 6cb74069eef3..4984d0cd1047 100644
--- a/devel/icmake/pkg-descr
+++ b/devel/icmake/pkg-descr
@@ -4,4 +4,4 @@ automatic program maintenance and system administrative tasks on MS-DOS
 platforms.  Later on, Icmake was eventually ported to Unix platforms
 (SCO and Linux).  By now Icmake also runs on a HP-Unix platform.
 
-WWW: https://fbb-git.github.io/icmake/
+WWW: https://fbb-git.gitlab.io/icmake/
diff --git a/devel/icmake/pkg-plist b/devel/icmake/pkg-plist
index c718dabf1fe7..83abc4886636 100644
--- a/devel/icmake/pkg-plist
+++ b/devel/icmake/pkg-plist
@@ -2,24 +2,24 @@ bin/icmake
 bin/icmbuild
 bin/icmstart
 %%ETCDIR%%/icmstart.rc
-lib/icmake-%%PORTVERSION%%/icm-comp
-lib/icmake-%%PORTVERSION%%/icm-dep
-lib/icmake-%%PORTVERSION%%/icm-exec
-lib/icmake-%%PORTVERSION%%/icm-pp
-lib/icmake-%%PORTVERSION%%/icmbuild
-lib/icmake-%%PORTVERSION%%/icmun
+lib/icmake/icm-comp
+lib/icmake/icm-dep
+lib/icmake/icm-exec
+lib/icmake/icm-pp
+lib/icmake/icmbuild
+lib/icmake/icmun
 man/man1/icmake.1.gz
 man/man1/icmbuild.1.gz
 man/man1/icmstart.1.gz
 man/man7/icmconf.7.gz
 man/man7/icmstart.rc.7.gz
-%%DATADIR%%-%%PORTVERSION%%/frame
-%%DATADIR%%-%%PORTVERSION%%/icmconf
-%%DATADIR%%-%%PORTVERSION%%/main.cc
-%%DATADIR%%-%%PORTVERSION%%/main.ih
-%%DATADIR%%-%%PORTVERSION%%/parser/grammar
-%%DATADIR%%-%%PORTVERSION%%/scanner/lexer
-%%DATADIR%%-%%PORTVERSION%%/scanner/scanner.ih
-%%DATADIR%%-%%PORTVERSION%%/usage.cc
-%%DATADIR%%-%%PORTVERSION%%/version.cc
-%%DATADIR%%-%%PORTVERSION%%/CLASSES
+%%DATADIR%%/frame
+%%DATADIR%%/icmconf
+%%DATADIR%%/main.cc
+%%DATADIR%%/main.ih
+%%DATADIR%%/parser/grammar
+%%DATADIR%%/scanner/lexer
+%%DATADIR%%/scanner/scanner.ih
+%%DATADIR%%/usage.cc
+%%DATADIR%%/version.cc
+%%DATADIR%%/CLASSES

More information about the dev-commits-ports-all mailing list