r307972@csupor: pgj | 2012-12-04 09:41:39 +0100

 - Update to 7.19.00
 - Trim Makefile header
 - Set license
 - Teach more about how to respect CC and CFLAGS

 Feature safe:	yes

5 files changed, 81 insertions, 36 deletions

diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index b257f94023f8..f9c8c1aafa43 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -1,12 +1,7 @@
-# New ports collection makefile for:	icmake
-# Date created:		March 4, 2009
-# Whom:	      		Gabor Pali <pgj@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	icmake
-PORTVERSION=	7.12.5
+PORTVERSION=	7.19.00
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -15,12 +10,14 @@ EXTRACT_SUFX=	.orig.tar.gz
 MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	An Intelligent C-like Maker
 
+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
+MAN7=		icmstart.rc.7 icmconf.7
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
@@ -30,53 +27,85 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
+	@${REINPLACE_CMD} -I "" -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' \
+	@${REINPLACE_CMD} -I "" -e 's|sed|gsed|g' \
 		${WRKSRC}/scripts/conversions \
 		${WRKSRC}/scripts/convert
-	@${REINPLACE_CMD} -e 's|"usr/bin"|"bin"| ; \
+	@${REINPLACE_CMD} -I "" -e 's|"usr/bin"|"bin"| ; \
 		s|"usr/share/icmake"|"share/icmake-${PORTVERSION}"| ; \
 		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"|' \
 		${WRKSRC}/INSTALL.im
-	@${REINPLACE_CMD} -e '\
+	@${REINPLACE_CMD} -I "" -e '\
 		s|"ar"|"${AR}"| ; \
 		s|"rsv"|"${ARFLAGS}"| ; \
 		s|"gcc"|"${CC}"| ; \
-		s|"-c -Wall -O2|"-c ${CFLAGS}| ; \
 		s|"gzip"|"${GZIP_CMD}"| ; \
 		s|"cp"|"${CP}"| ; \
 		s|"mkdir"|"${MKDIR}"| ; \
 		s|"rm"|"${RM}"| ; \
 		s|"strip"|"${STRIP_CMD}"|' \
 		${WRKSRC}/def/programs
-	@${REINPLACE_CMD} -e '\
-		s|gcc|${CC}| ; \
-		s|-O2 -g -Wall|${CFLAGS}| ; \
-		s|cp -r|cp -R|' \
+	@${REINPLACE_CMD} -I "" -e 's|cp -r|cp -R|' \
 		${WRKSRC}/icm_bootstrap \
 		${WRKSRC}/icm_install
+	@${REINPLACE_CMD} -I "" -e 's|#!.*/usr/bin/icmake|#!${LOCALBASE}/bin/icmake|' \
+		${WRKSRC}/comp/build \
+		${WRKSRC}/doc/icmake.1 \
+		${WRKSRC}/doc/manpage/icmake.yo \
+		${WRKSRC}/doc/manpage/build \
+		${WRKSRC}/examples/am \
+		${WRKSRC}/examples/defines \
+		${WRKSRC}/examples/ds \
+		${WRKSRC}/examples/ftpxfer \
+		${WRKSRC}/examples/initialization \
+		${WRKSRC}/examples/nesteddirectives \
+		${WRKSRC}/examples/r \
+		${WRKSRC}/exec/build \
+		${WRKSRC}/make/build \
+		${WRKSRC}/pp/build \
+		${WRKSRC}/rss/build \
+		${WRKSRC}/un/build
+	@${REINPLACE_CMD} -I "" -e 's|"gcc"|"${CC}"|g; s|-Wall -O2|${CFLAGS}|g' \
+		${WRKSRC}/comp/build \
+		${WRKSRC}/def/programs \
+		${WRKSRC}/doc/icmake.doc \
+		${WRKSRC}/exec/icmconf \
+		${WRKSRC}/usr/share/icmake/icmconf \
+		${WRKSRC}/exec/build \
+		${WRKSRC}/make/build \
+		${WRKSRC}/pp/build \
+		${WRKSRC}/rss/build \
+		${WRKSRC}/un/build
+	@${REINPLACE_CMD} -I "" -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' \
+		${WRKSRC}/etc/icmake/icmake.rc
 
 do-build:
-	cd ${WRKSRC} && ./icm_bootstrap ${PREFIX}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_bootstrap ${PREFIX}
 
 do-install:
-	cd ${WRKSRC} && ./icm_install strip progs
-	cd ${WRKSRC} && ./icm_install scripts
-	cd ${WRKSRC} && ./icm_install skel
-	cd ${WRKSRC} && ./icm_install etc
+	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} && ./icm_install man
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install man
 .endif
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ./icm_install doc
-	cd ${WRKSRC} && ./icm_install docdoc
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install doc
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./icm_install docdoc
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/icmake/distinfo b/devel/icmake/distinfo
index 7c86971ef342..a785a7da815d 100644
--- a/devel/icmake/distinfo
+++ b/devel/icmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icmake_7.12.5.orig.tar.gz) = e1ce6fac859e91e4ef227860462ff2171d302be9fce7eb9a9c91dcbdb6eb577f
-SIZE (icmake_7.12.5.orig.tar.gz) = 316629
+SHA256 (icmake_7.19.00.orig.tar.gz) = 84a463398775b7ef1b76a3e3f72c868f7335c1820b78c28b154fb3be6e8ca819
+SIZE (icmake_7.19.00.orig.tar.gz) = 329711
diff --git a/devel/icmake/files/patch-exec-bootstrap b/devel/icmake/files/patch-exec-bootstrap
new file mode 100644
index 000000000000..c3163911c5cd
--- /dev/null
+++ b/devel/icmake/files/patch-exec-bootstrap
@@ -0,0 +1,23 @@
+--- exec/bootstrap.orig	2012-09-07 09:43:56.000000000 +0200
++++ exec/bootstrap	2012-12-01 23:45:56.000000000 +0100
+@@ -1,6 +1,6 @@
+ echo Creating icm-exec
+ 
+-gcc -O2 -g -Wall -DHAVE_GLOB -c *.c 
++${CC} ${CFLAGS} -g -DHAVE_GLOB -c *.c 
+ 
+ mkdir -p tmp/bin
+ 
+@@ -8,10 +8,10 @@
+ for x in auks var virtual int list string stack opcodefun builtin
+ do
+     cd $x
+-    gcc -O2 -g -Wall -DHAVE_GLOB -c *.c || exit 1
++    ${CC} ${CFLAGS} -g -DHAVE_GLOB -c *.c || exit 1
+     cd ..
+ done
+ 
+-gcc -o tmp/bin/icm-exec$1 *.o */*.o ../rss/libicrss.a
++${CC} -o tmp/bin/icm-exec$1 *.o */*.o ../rss/libicrss.a
+ 
+ rm *.o */*.o
diff --git a/devel/icmake/pkg-descr b/devel/icmake/pkg-descr
index 8805ba367bb6..b3788d768c66 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: http://icmake.sourceforge.net/
+WWW:	http://icmake.sourceforge.net/
diff --git a/devel/icmake/pkg-plist b/devel/icmake/pkg-plist
index 932b13f772f1..bf0a348f317e 100644
--- a/devel/icmake/pkg-plist
+++ b/devel/icmake/pkg-plist
@@ -1,21 +1,15 @@
 @comment $FreeBSD$
 bin/icmake
-bin/icmun
 bin/icmbuild
 bin/icmstart
-etc/icmake/AUTHOR
-etc/icmake/VERSION
-etc/icmake/YEARS
+bin/icmun
+etc/icmake/icmake.rc
 etc/icmake/icmstart.rc
 lib/icmake-%%PORTVERSION%%/icm-comp
 lib/icmake-%%PORTVERSION%%/icm-exec
 lib/icmake-%%PORTVERSION%%/icm-pp
-share/icmake-%%PORTVERSION%%/parser/gramspec/grambuild
-share/icmake-%%PORTVERSION%%/parser/gramspec/header.gr0
-share/icmake-%%PORTVERSION%%/parser/gramspec/startrule.gr0
 share/icmake-%%PORTVERSION%%/parser/grammar
 share/icmake-%%PORTVERSION%%/scanner/lexer
-share/icmake-%%PORTVERSION%%/scanner/scanner.h
 share/icmake-%%PORTVERSION%%/scanner/scanner.ih
 share/icmake-%%PORTVERSION%%/CLASSES
 share/icmake-%%PORTVERSION%%/icmconf
@@ -25,7 +19,6 @@ share/icmake-%%PORTVERSION%%/usage.cc
 share/icmake-%%PORTVERSION%%/version.cc
 @dirrm etc/icmake
 @dirrm lib/icmake-%%PORTVERSION%%
-@dirrm share/icmake-%%PORTVERSION%%/parser/gramspec
 @dirrm share/icmake-%%PORTVERSION%%/parser
 @dirrm share/icmake-%%PORTVERSION%%/scanner
 @dirrm share/icmake-%%PORTVERSION%%