- Update to 7.21.00

- Add support for staging, use shebangfix
- Give up maintainership

3 files changed, 23 insertions, 30 deletions

diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index 8b60a58dbe68..f8a093ac1df0 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	icmake
-PORTVERSION=	7.19.00
+PORTVERSION=	7.21.00
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.orig.tar.gz
 
-MAINTAINER=	pgj@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Intelligent C-like Maker
 
 LICENSE=	GPLv3
@@ -15,11 +15,6 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		gsed:${PORTSDIR}/textproc/gsed
 
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=		icmake.1 icmbuild.1 icmstart.1
-MAN7=		icmstart.rc.7 icmconf.7
-.endif
-
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
@@ -29,15 +24,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 REINPLACE_ARGS=	-I ""
 
-NO_STAGE=	yes
+USES=		shebangfix
+SHEBANG_FILES=	icm_bootstrap icm_install icm_prepare scripts/convert
+
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
-		${WRKSRC}/icm_bootstrap \
-		${WRKSRC}/icm_install \
-		${WRKSRC}/icm_prepare \
-		${WRKSRC}/scripts/convert
 	@${REINPLACE_CMD} -e 's|sed|gsed|g' \
 		${WRKSRC}/scripts/conversions \
 		${WRKSRC}/scripts/convert
@@ -61,7 +53,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|cp -r|cp -R|' \
 		${WRKSRC}/icm_bootstrap \
 		${WRKSRC}/icm_install
-	@${REINPLACE_CMD} -e 's|#!.*/usr/bin/icmake|#!${LOCALBASE}/bin/icmake|' \
+	@${REINPLACE_CMD} -e 's|#!.*/usr/bin/icmake|#!${PREFIX}/bin/icmake|' \
 		${WRKSRC}/comp/build \
 		${WRKSRC}/doc/icmake.1 \
 		${WRKSRC}/doc/manpage/icmake.yo \
@@ -90,25 +82,21 @@ post-patch:
 		${WRKSRC}/rss/build \
 		${WRKSRC}/un/build
 	@${REINPLACE_CMD} -e '\
-		s|/usr/lib/icmake|/usr/local/lib/icmake-${PORTVERSION}|g; \
-		s|/usr/share/icmake|/usr/local/share/icmake-${PORTVERSION}|g; \
-		s|/etc/icmake/icmake.cf|/usr/local/etc/icmake/icmake.rc|g' \
+		s|/usr/lib/icmake|${PREFIX}/lib/icmake-${PORTVERSION}|g; \
+		s|/usr/share/icmake|${PREFIX}/share/icmake-${PORTVERSION}|g; \
+		s|/etc/icmake/icmake.cf|${PREFIX}/etc/icmake/icmake.rc|g' \
 		${WRKSRC}/etc/icmake/icmake.rc
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_bootstrap ${PREFIX}
 
 do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install strip progs
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install scripts
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install skel
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install etc
-.if !defined(NO_INSTALL_MANPAGES)
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install man
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install doc
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install docdoc
-.endif
+	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 skel ${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 doc ${STAGEDIR}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install docdoc ${STAGEDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/icmake/distinfo b/devel/icmake/distinfo
index a785a7da815d..7639c6f13e4a 100644
--- a/devel/icmake/distinfo
+++ b/devel/icmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icmake_7.19.00.orig.tar.gz) = 84a463398775b7ef1b76a3e3f72c868f7335c1820b78c28b154fb3be6e8ca819
-SIZE (icmake_7.19.00.orig.tar.gz) = 329711
+SHA256 (icmake_7.21.00.orig.tar.gz) = d19e5bd6eb488624e09dbb985ae6adc0d80849abd81446ca8e6bc9e0ee00c445
+SIZE (icmake_7.21.00.orig.tar.gz) = 330053
diff --git a/devel/icmake/pkg-plist b/devel/icmake/pkg-plist
index bf0a348f317e..7e8e8824f3eb 100644
--- a/devel/icmake/pkg-plist
+++ b/devel/icmake/pkg-plist
@@ -8,6 +8,11 @@ etc/icmake/icmstart.rc
 lib/icmake-%%PORTVERSION%%/icm-comp
 lib/icmake-%%PORTVERSION%%/icm-exec
 lib/icmake-%%PORTVERSION%%/icm-pp
+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
 share/icmake-%%PORTVERSION%%/parser/grammar
 share/icmake-%%PORTVERSION%%/scanner/lexer
 share/icmake-%%PORTVERSION%%/scanner/scanner.ih