- Support STAGEDIR

- Fix build with clang [1]

Reported by:	pkg-fallout [1]

3 files changed, 27 insertions, 25 deletions

diff --git a/devel/elfkickers/Makefile b/devel/elfkickers/Makefile
index 97f0f17a27c5..3daa3b4cca0c 100644
--- a/devel/elfkickers/Makefile
+++ b/devel/elfkickers/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elfkickers
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel sysutils
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/
 DISTNAME=	ELFkickers-${PORTVERSION}
@@ -12,42 +12,30 @@ MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Collection of programs to manipulate ELF files
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GMAKE=	yes
-
-PLIST_FILES=	bin/ebfc \
-		bin/elfls \
-		bin/elftoc \
-		bin/infect \
-		bin/objres \
-		bin/rebind \
-		bin/sstrip
+USES=		gmake
 
+ELFBINS=	ebfc elfls elftoc infect objres rebind sstrip
 PORTDOCS=	COPYING Changelog README
 
-MAN1=		ebfc.1 elfls.1 elftoc.1 infect.1 objres.1 rebind.1 sstrip.1
-
-NO_STAGE=	yes
 post-patch:
 	@${GREP} -lR "\/elf.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's,linux/,,g' -e 's,asm/,,g'
+	@${GREP} -lR "gcc" ${WRKSRC}/*/Makefile | ${XARGS} \
+	${REINPLACE_CMD} -e 's,gcc,${CC},g'
 
 do-build:
-.for f in ${PLIST_FILES:S,bin/,,}
+.for f in ${ELFBINS}
 	@(cd ${WRKSRC}/$f; ${GMAKE})
 .endfor
 
 do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
-.for f in ${PLIST_FILES:S,bin/,,}
-	${INSTALL_SCRIPT} ${WRKSRC}/${f}/${f} ${PREFIX}/bin
-.endfor
-.for f in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${f:S,.1,,}/${f} ${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.for f in ${ELFBINS}
+	${INSTALL_SCRIPT} ${WRKSRC}/${f}/${f} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${f}/${f:S,$,.1,} ${STAGEDIR}${PREFIX}/man/man1
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/elfkickers/pkg-descr b/devel/elfkickers/pkg-descr
index 319e3f08c22f..0d381b058419 100644
--- a/devel/elfkickers/pkg-descr
+++ b/devel/elfkickers/pkg-descr
@@ -5,4 +5,4 @@ The main purpose of these programs is to be illustrative and
 educational -- to help fellow programmers understand the ELF file
 format and something of how it works under the Linux platform.
 
-WWW:	http://www.muppetlabs.com/~breadbox/software/elfkickers.html
+WWW: http://www.muppetlabs.com/~breadbox/software/elfkickers.html
diff --git a/devel/elfkickers/pkg-plist b/devel/elfkickers/pkg-plist
new file mode 100644
index 000000000000..dd7c149d56b1
--- /dev/null
+++ b/devel/elfkickers/pkg-plist
@@ -0,0 +1,14 @@
+bin/ebfc
+bin/elfls
+bin/elftoc
+bin/infect
+bin/objres
+bin/rebind
+bin/sstrip
+man/man1/ebfc.1.gz
+man/man1/elfls.1.gz
+man/man1/elftoc.1.gz
+man/man1/infect.1.gz
+man/man1/objres.1.gz
+man/man1/rebind.1.gz
+man/man1/sstrip.1.gz