- fix misplaced NO_STAGE in slaveports and ifdefs

16 files changed, 27 insertions, 19 deletions

diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index 9d9cd056a9c4..f007988051de 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -14,14 +14,15 @@ LIB_DEPENDS=	unrar:${PORTSDIR}/archivers/libunrar
 
 LICENSE=	GPLv2
 
+MAKE_JOBS_UNSAFE=	yes
+NO_STAGE=	yes
+
 USE_GMAKE=	yes
 USE_WX=		2.6+
 WX_PREMK=	yes
 WX_UNICODE=	yes
 PLIST_FILES=	bin/comical
-MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index bb6a34d8bd78..1d5cffca7ceb 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		freetype:${PORTSDIR}/print/freetype2
 
 CONFLICTS=	bazaar-1.*
+NO_STAGE=	yes
 
 USE_XZ=		yes
 USES=		pkgconfig
@@ -29,7 +30,6 @@ OPTIONS_DEFINE=	FONTCONFIG ICONV VPX XPM
 OPTIONS_DEFAULT=FONTCONFIG
 NO_OPTIONS_SORT=yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 PKGCONFIGDIR?=	${LOCALBASE}/libdata/pkgconfig
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 5faeaed1273a..eccc68243947 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -13,6 +13,8 @@ COMMENT=	Tools and library routines for working with GIF images
 CONFLICTS=	libungif-[0-9]*
 PORTSCOUT=	limit:^4\.
 
+NO_STAGE=	yes
+
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
@@ -21,7 +23,6 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOCBOOK X11
 DOCBOOK_DESC=	Generate API documentation (requires DOCS)
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 60396ccca23b..e541a493c748 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 		nspr4:${PORTSDIR}/devel/nspr
 
 CONFLICTS=	gnash-devel-[0-9]*
+NO_STAGE=	yes
 
 USE_BZIP2=	yes
 USES=		gmake pkgconfig
@@ -71,7 +72,6 @@ FFMPEG_DESC=	ffmpeg media handler
 GSTREAMER_DESC=	GStreamer media handler
 VAAPI_DESC=	VAAPI support (requires FFMPEG)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # Cygnal option processing
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index f68fa3155f38..f8dff64a5dee 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Another gtk2-based graphic file viewer
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
+NO_STAGE=	yes
+
 USES=		pkgconfig
 USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
@@ -23,7 +25,6 @@ MAN1=		gqview.1
 CONFLICTS=	gqview-1.4* gqview-2.0*
 LATEST_LINK=	gqview-devel
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$prefix/share/doc/gqview-$$VERSION|${DOCSDIR}|g' \
 		${WRKSRC}/configure
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index c40422070952..7d667083a581 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -16,6 +16,8 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 		expat:${PORTSDIR}/textproc/expat2 \
 		gd:${PORTSDIR}/${GD_PORT}
 
+NO_STAGE=	yes
+
 USES=		bison gmake pkgconfig
 USE_AUTOTOOLS=	libltdl libtool
 WANT_GNOME=	yes
@@ -86,7 +88,6 @@ GUILE_DESC=	Guile bindings (swig)
 TK_DESC=	TK toolkit support
 NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGVEDIT}
diff --git a/graphics/hobbes-icons-xpm/Makefile b/graphics/hobbes-icons-xpm/Makefile
index dfe8ee985e33..703fea3a0bd3 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -11,12 +11,12 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Collection of over 3000 icons in XPM3 format
 
+NO_STAGE=	yes
 NO_BUILD=	yes
 
 # Where it will be installed (change pkg/PLIST if you change this)
 LIBDIR=		${PREFIX}/include/X11/pixmaps
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 83558df41b4a..39f29b170492 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -16,6 +16,8 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 LICENSE=	MIT
 
+NO_STAGE=	yes
+
 USE_AUTOTOOLS=	libtool
 USE_ZIP=	yes
 USE_GNOME=	lthack
@@ -32,7 +34,6 @@ MASTER_SITE_IMAGEMAGICK=	\
 OPTIONS_DEFINE= OPENGL UUID
 UUID_DESC=	UUID support (required by GDAL)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENGL}
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 57b7cc4f47e3..0f3ce72ba3f4 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -17,8 +17,9 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IJG's jpeg compression utilities
 
 CONFLICTS=	libjpeg-turbo-[0-9]*
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION2}
+NO_STAGE=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION2}
 DISTVERSION2=	8d
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
@@ -33,7 +34,6 @@ CONFIGURE_ARGS+=	--enable-maxmem=${J_MAXMEM}
 
 MAN1=		cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-extract:
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 36aecdf1ad8d..b55be1145c8b 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -20,6 +20,8 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff \
 		xml2:${PORTSDIR}/textproc/libxml2
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
+NO_STAGE=	yes
+
 USES=		gmake perl5
 CFLAGS+=	-DPNG_DEPSTRUCT= -Iutil
 MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
@@ -32,7 +34,6 @@ MAN1=		netpbm.1
 
 OPTIONS_DEFINE=	X11 MANPAGES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 8259748f12d9..889e31965fd6 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -12,6 +12,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Library for manipulating PNG images
 
 PORTSCOUT=	limit:^1\.5\.
+NO_STAGE=	yes
 
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
@@ -28,7 +29,6 @@ OPTIONS_DEFINE=APNG
 OPTIONS_DEFAULT=APNG
 APNG_DESC=Enable Animated PNG support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL)
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 899ae35205e9..b4dbbca6d35d 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -16,6 +16,8 @@ COMMENT=	Ruby extension library to use Thomas Boutell's gd library
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
+NO_STAGE=	yes
+
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
@@ -31,7 +33,6 @@ CONFIGURE_ARGS+=	--enable-gd2_0 \
 		--with-gd-include="${LOCALBASE}/include"
 LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # Hmm, GREP and TRUE seem to be defined in the bsd.port.post.mk stage.
diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index d36fc8433063..5b449849b7a2 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -20,6 +20,8 @@ LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
+NO_STAGE=	yes
+
 OPTIONS_DEFINE=	LAME PDF
 
 USES=		pkgconfig
@@ -28,7 +30,6 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_lib_zzip_zzip_file_open=no
 
-
 MAN1=		as3compile.1 font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 \
 		png2swf.1 swfbbox.1 swfc.1 swfcombine.1 swfdump.1 \
 		swfextract.1 swfrender.1 swfstrings.1 wav2swf.1
@@ -36,7 +37,6 @@ MAN1=		as3compile.1 font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLAME}
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index d893c37be071..ab5697a8fddd 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		jbig:${PORTSDIR}/graphics/jbigkit
 
+NO_STAGE=	yes
+
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \
@@ -109,7 +111,6 @@ MLINKS=	TIFFError.3tiff          TIFFSetErrorHandler.3tiff \
 	TIFFtile.3tiff           TIFFTileRowSize.3tiff \
 	TIFFtile.3tiff           TIFFVTileSize.3tiff
 
-NO_STAGE=	yes
 pre-configure:
 	${REINPLACE_CMD} \
 		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \
diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile
index 51f83d433020..793c5d67371f 100644
--- a/graphics/xv-m17n/Makefile
+++ b/graphics/xv-m17n/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	xv:${PORTSDIR}/${PKGCATEGORY}/xv
 
 NOMAN=		yes
 
-NO_STAGE=	yes
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/xv ${PREFIX}/bin/xv-m17n
 	@if [ ! -f ${PREFIX}/bin/xv.orig ]; then \
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index a8f3c7b2d47f..56436d8bffe0 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -23,6 +23,8 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
 		jasper:${PORTSDIR}/graphics/jasper
 
+NO_STAGE=	yes
+
 USES=		imake
 USE_XORG=	xext x11 xt
 .if !defined(NOMAN)
@@ -32,7 +34,6 @@ MAN1=		bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1
 XVDIST=		${DISTDIR}/${DIST_SUBDIR}
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
 
-NO_STAGE=	yes
 pre-patch:
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt