- fix misplaced NO_STAGE in slaveports and ifdefs

6 files changed, 14 insertions, 8 deletions

diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index 6142d15e468c..a6de9d748288 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -12,7 +12,9 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An IRC "bot" that makes sharing files via DCC extremely easy
 
 LICENSE=	GPLv2
+
 CONFLICTS=	iroffer-1* iroffer-lamm-1.*
+NO_STAGE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
@@ -43,7 +45,6 @@ IROFFER_HTDOCS=	iroffer-state.css robots.txt \
 OPTIONS_DEFINE=	CURL RUBY UPNP GEOIP
 OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCURL}
diff --git a/irc/iroffer-lamm/Makefile b/irc/iroffer-lamm/Makefile
index 948085d736f4..084d7812bd88 100644
--- a/irc/iroffer-lamm/Makefile
+++ b/irc/iroffer-lamm/Makefile
@@ -13,11 +13,12 @@ COMMENT=	An IRC "bot" that makes sharing files via DCC extremely easy
 
 LICENSE=	GPLv2
 
+CONFLICTS=	iroffer-1.* iroffer-dinoex-3.*
+NO_STAGE=	yes
+
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFLICTS=	iroffer-1.* iroffer-dinoex-3.*
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|cctype="gcc"|cctype="${CC}"|' \
 		${WRKSRC}/Configure
diff --git a/irc/iroffer/Makefile b/irc/iroffer/Makefile
index c82a366f9777..6f68125649fc 100644
--- a/irc/iroffer/Makefile
+++ b/irc/iroffer/Makefile
@@ -13,11 +13,12 @@ COMMENT=	An IRC "bot" that makes sharing files via DCC extremely easy
 
 LICENSE=	GPLv2
 
+CONFLICTS=	iroffer-lamm-1.* iroffer-dinoex-3.*
+NO_STAGE=	yes
+
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFLICTS=	iroffer-lamm-1.* iroffer-dinoex-3.*
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|cctype="gcc"|cctype="${CC}"|' \
 		${WRKSRC}/Configure
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index f29d2a693471..d8617ec22c2b 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -17,6 +17,8 @@ COMMENT=	An encryption plugin for XChat
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
+NO_STAGE=	yes
+
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -28,7 +30,6 @@ PLIST_FILES=	lib/xchat/plugins/xfish.so
 PORTDOCS=	FiSH-xchat.txt \
 		FiSH-xchat_History.txt
 
-NO_STAGE=	yes
 post-patch:
 	@${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/
 	@${RM} -f ${WRKSRC}/mir*
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index 45bc313a6105..69b83984e496 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -16,6 +16,8 @@ COMMENT=	A free encryption add-on for the popular XChat irc client
 
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
+NO_STAGE=	yes
+
 USE_ZIP=	yes
 ALL_TARGET=	freebsd
 CFLAGS+=	-fPIC
@@ -31,7 +33,6 @@ PLIST_FILES=	lib/xchat/plugins/mircryption.so
 PORTDOCS=	README.txt
 PORTEXAMPLES=	mcps_masterkey_on_start.pl
 
-NO_STAGE=	yes
 post-patch:
 # \r\n -> \n
 	@${FIND} ${WRKSRC} -type f -exec \
diff --git a/irc/xchat-ruby/Makefile b/irc/xchat-ruby/Makefile
index eff0c8e5bf1a..fc31011bf8a7 100644
--- a/irc/xchat-ruby/Makefile
+++ b/irc/xchat-ruby/Makefile
@@ -15,6 +15,8 @@ RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 LICENSE=	GPLv2
 
+NO_STAGE=	yes
+
 USE_RUBY=	yes
 USE_LIBRUBY=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
@@ -25,7 +27,6 @@ PLIST_FILES=	lib/xchat/plugins/xchat-ruby.so
 PORTDOCS=	README ChangeLog
 PORTEXAMPLES=	embedify.rb TimerSample.rb JFilter.rb JBanner.rb
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|^RUBY=.*|RUBY=${RUBY}|' \