4 files changed, 95 insertions, 26 deletions

diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index 2703474fd900..e5bd740138aa 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -6,44 +6,75 @@
 #
 
 PORTNAME=	icmake
-PORTVERSION=	7.11.1
+PORTVERSION=	7.12.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.rug.nl/contrib/frank/software/linux/icmake/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
+EXTRACT_SUFX=	.orig.tar.gz
 
 MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	An Intelligent C-like Maker
 
-MANCOMPRESSED=	yes
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		gsed:${PORTSDIR}/textproc/gsed
+
 MAN1=		icmake.1 icmbuild.1 icmstart.1
+MAN7=		icmstart.rc.7
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	icmake.doc icmake.ps README.icmbuild
+PORTDOCS=	*
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"/usr/bin"|"${PREFIX}/bin"| ; \
-		s|"/usr/share/icmake"|"${PREFIX}/share/icmake-${PORTVERSION}"| ; \
-		s|"/usr/share/man/man1"|"${PREFIX}/man/man1"| ; \
-		s|"/usr/lib/icmake"|"${PREFIX}/lib/icmake-${PORTVERSION}"|' \
-		${WRKSRC}/def/destinations
+	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' \
+		${WRKSRC}/icm_bootstrap \
+		${WRKSRC}/icm_install \
+		${WRKSRC}/scripts/convert
+	@${REINPLACE_CMD} -e 's|sed|gsed|g' \
+		${WRKSRC}/scripts/conversions \
+		${WRKSRC}/scripts/convert
+	@${REINPLACE_CMD} -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 '\
+		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|' \
+		${WRKSRC}/icm_bootstrap \
+		${WRKSRC}/icm_install
 
 do-build:
-	cd ${WRKSRC} && ${SH} ./bootstrap.sh
+	cd ${WRKSRC} && ./icm_bootstrap ${PREFIX}
 
 do-install:
-	cd ${WRKSRC} && \
-		${SH} ./install.sh strip && \
-		./unix skel && \
-		./unix man
+	cd ${WRKSRC} && ./icm_install strip progs
+	cd ${WRKSRC} && ./icm_install scripts
+	cd ${WRKSRC} && ./icm_install skel
+	cd ${WRKSRC} && ./icm_install etc
+.if !defined(NO_INSTALL_MANPAGES)
+	cd ${WRKSRC} && ./icm_install man
+.endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ./icm_install doc
+	cd ${WRKSRC} && ./icm_install docdoc
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/icmake/distinfo b/devel/icmake/distinfo
index fe892c4e23c9..27cdc6d50cf4 100644
--- a/devel/icmake/distinfo
+++ b/devel/icmake/distinfo
@@ -1,3 +1,3 @@
-MD5 (icmake_7.11.1.tar.gz) = aa19b8d0747b01589bdba01b21df8c44
-SHA256 (icmake_7.11.1.tar.gz) = 20b9128c129ce853fe4a67feee68b87a751ec80e5a6760c0e4e856650f9ff75f
-SIZE (icmake_7.11.1.tar.gz) = 304104
+MD5 (icmake_7.12.3.orig.tar.gz) = 589dac6a3ebeaaa491c16b419114eb78
+SHA256 (icmake_7.12.3.orig.tar.gz) = 7952310107fa8bc43b61e6e5e482ecfbe5691d8c691c309a82485dc4fab7c88b
+SIZE (icmake_7.12.3.orig.tar.gz) = 361364
diff --git a/devel/icmake/files/patch-icm_install b/devel/icmake/files/patch-icm_install
new file mode 100644
index 000000000000..9f63b416f9a4
--- /dev/null
+++ b/devel/icmake/files/patch-icm_install
@@ -0,0 +1,32 @@
+--- ./icm_install.orig	2009-07-29 13:12:39.000000000 +0200
++++ ./icm_install	2009-11-15 23:59:54.000000000 +0100
+@@ -19,11 +19,7 @@
+     shift
+ fi
+ 
+-if [ "$2" != "" ] ; then
+     INSTALLDIR=$2
+-else
+-    INSTALLDIR=${ROOT}
+-fi
+ 
+ try()
+ {
+@@ -67,7 +63,7 @@
+         into ${SKELDIR}
+         into ${DOCDIR}
+         into ${DOCDOCDIR}
+-        into etc/icmake
++        into ${CONFDIR}
+     ;;
+ 
+     (progs)
+@@ -91,7 +87,7 @@
+     ;;
+ 
+     (etc)
+-        into etc/icmake
++        into ${CONFDIR}
+     ;;
+ 
+     (docdoc)
diff --git a/devel/icmake/pkg-plist b/devel/icmake/pkg-plist
index 3a006caef4d2..932b13f772f1 100644
--- a/devel/icmake/pkg-plist
+++ b/devel/icmake/pkg-plist
@@ -1,6 +1,15 @@
 @comment $FreeBSD$
 bin/icmake
 bin/icmun
+bin/icmbuild
+bin/icmstart
+etc/icmake/AUTHOR
+etc/icmake/VERSION
+etc/icmake/YEARS
+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
@@ -10,16 +19,13 @@ share/icmake-%%PORTVERSION%%/scanner/scanner.h
 share/icmake-%%PORTVERSION%%/scanner/scanner.ih
 share/icmake-%%PORTVERSION%%/CLASSES
 share/icmake-%%PORTVERSION%%/icmconf
-share/icmake-%%PORTVERSION%%/icmstart.rc
 share/icmake-%%PORTVERSION%%/main.cc
 share/icmake-%%PORTVERSION%%/main.ih
 share/icmake-%%PORTVERSION%%/usage.cc
 share/icmake-%%PORTVERSION%%/version.cc
-lib/icmake-%%PORTVERSION%%/icm-comp
-lib/icmake-%%PORTVERSION%%/icm-exec
-lib/icmake-%%PORTVERSION%%/icm-pp
+@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%%
-@dirrm lib/icmake-%%PORTVERSION%%