From f20536806aa576e235d8a542b8185b02e4d92504 Mon Sep 17 00:00:00 2001
From: Philippe Audeoud <jadawin@FreeBSD.org>
Date: Fri, 27 Dec 2013 13:08:28 +0000
Subject: [PATCH] - Support STAGE

---
 editors/hexcurse/Makefile       |  4 +---
 games/banihstypos/Makefile      | 19 ++++++++++---------
 irc/irssi-xmpp/Makefile         | 11 ++---------
 mail/vrfy/Makefile              |  7 +------
 math/p5-Math-BaseCalc/Makefile  |  3 ---
 math/p5-Math-BaseCalc/pkg-plist |  1 +
 6 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile
index af26865149be..d08794c10447 100644
--- a/editors/hexcurse/Makefile
+++ b/editors/hexcurse/Makefile
@@ -12,8 +12,6 @@ COMMENT=	A versatile ncurses-based hex editor
 
 GNU_CONFIGURE=	yes
 
-MAN1=		hexcurse.1
-PLIST_FILES=	bin/hexcurse
+PLIST_FILES=	bin/hexcurse man/man1/hexcurse.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/games/banihstypos/Makefile b/games/banihstypos/Makefile
index a1794052a9d2..08991ad41f14 100644
--- a/games/banihstypos/Makefile
+++ b/games/banihstypos/Makefile
@@ -16,16 +16,17 @@ SUB_LIST=	PORTNAME=${PORTNAME}
 
 PLIST_FILES=	bin/banihstypos
 
-PORTDOCS=	readme.txt
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/banihstypos ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
+.if ! ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	readme.txt
+.endif
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/banihstypos ${STAGEDIR}${PREFIX}/bin
+.if ! ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 .endif
-post-install:
-	@${ECHO_MSG}; ${CAT} ${PKGMESSAGE}; ${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/irc/irssi-xmpp/Makefile b/irc/irssi-xmpp/Makefile
index 45c3725a27b2..d0a32305498a 100644
--- a/irc/irssi-xmpp/Makefile
+++ b/irc/irssi-xmpp/Makefile
@@ -17,23 +17,16 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pkgconfig
 USE_LDCONFIG=	yes
-MAKE_ARGS=	CC="${CC}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 DATADIR=	${PREFIX}/share/irssi
 DOCSDIR=	${PREFIX}/share/doc/irssi
+CFLAGS_amd64=	-fPIC
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-patch:
 # Try to unbreak parallel builds (-jX)
 	@${REINPLACE_CMD} -E 's|cd (.+) && (\$${MAKE})|\2 -C \1|' \
 		${WRKSRC}/Makefile ${WRKSRC}/src/Makefile
-# Uphold CFLAGS
-	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|' ${WRKSRC}/config.mk
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's|doc-install ||' ${WRKSRC}/Makefile
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/vrfy/Makefile b/mail/vrfy/Makefile
index d301517315b9..6164eaa040d0 100644
--- a/mail/vrfy/Makefile
+++ b/mail/vrfy/Makefile
@@ -13,14 +13,9 @@ COMMENT=	Verify mail address
 
 WRKSRC=		${WRKDIR}
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" RES=""
-MAN1=		vrfy.1
-MANCOMPRESSED=	yes
 PLIST_FILES=	bin/vrfy
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/vrfy ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${MAN1} ${PREFIX}/man/man1/
-	${GZIP_CMD} ${PREFIX}/man/man1/${MAN1}
+	${INSTALL_PROGRAM} ${WRKDIR}/vrfy ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/math/p5-Math-BaseCalc/Makefile b/math/p5-Math-BaseCalc/Makefile
index b5d6083f770f..33046378d8fd 100644
--- a/math/p5-Math-BaseCalc/Makefile
+++ b/math/p5-Math-BaseCalc/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Convert numbers between various bases
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Math::BaseCalc.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/math/p5-Math-BaseCalc/pkg-plist b/math/p5-Math-BaseCalc/pkg-plist
index cc101abea447..b5cfbdd24f87 100644
--- a/math/p5-Math-BaseCalc/pkg-plist
+++ b/math/p5-Math-BaseCalc/pkg-plist
@@ -1,5 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc/.packlist
 %%SITE_PERL%%/Math/BaseCalc.pm
+%%PERL5_MAN3%%/Math::BaseCalc.3.gz
 @dirrmtry %%SITE_PERL%%/Math
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math