Stagify, dismiss USE_GMAKE, utilize some helper knobs. No functional changes.

2 files changed, 23 insertions, 30 deletions

diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index b66887ec4be..0caf608ec31 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -13,18 +13,17 @@ COMMENT=	Binary file viewer and editor
 
 LICENSE=	GPLv2
 
+USES=		dos2unix gmake iconv
+USE_BZIP2=	yes
+DOS2UNIX_FILES=	${PORTDOCS:S,^,doc/,}
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--cc="${CC}" --with-extraincdir="${LOCALBASE}/include" \
 		--ld="${CC}" --with-extralibdir="${LOCALBASE}/lib" \
 		--prefix="${PREFIX}" --datadir="${DATADIR}"
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		iconv
-USE_DOS2UNIX=	${PORTDOCS}
 MAKEFILE=	makefile
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g}
 
-MAN1=		biew.1
 PORTDOCS=	biew_en.txt biew_ru.txt develop.en develop.ru file_ini.en \
 		file_ini.ru release.txt unix.txt
 
@@ -33,19 +32,12 @@ OPTIONS_DEFAULT=	SLANG
 
 SLANG_DESC=	Use S-Lang based display renderer
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile
-.endif
+BROKEN_powerpc=		Does not compile
+BROKEN_sparc64=		Does not compile
 
-.if ${PORT_OPTIONS:MSLANG}
-LIB_DEPENDS=	slang:${PORTSDIR}/devel/libslang2
-CONFIGURE_ARGS+=	--enable-slang
-.else
-CONFIGURE_ARGS+=	--enable-curses
-.endif
+SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_CONFIGURE_ON=	--enable-slang
+SLANG_CONFIGURE_OFF=	--enable-curses
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/configure
@@ -55,7 +47,7 @@ post-patch:
 # Fix BTx group of x86 opcodes disasm bug (upstream ticket #44, closed)
 	@${REINPLACE_CMD} -e 's,DisP->codelen++),++DisP->codelen),' \
 		${WRKSRC}/plugins/disasm/ix86/ix86_fun.c
-# Fix inline assembly to make Clang happy (ticket #49)
+# Fix inline assembly to make Clang happy (upstream ticket #49)
 	@${REINPLACE_CMD} -e '/srcptr/s,::"g",::"r",' \
 		${WRKSRC}/biewlib/sysdep/ia32/aclib_template.c \
 		${WRKSRC}/biewlib/sysdep/x86_64/aclib_template.c
@@ -68,20 +60,20 @@ post-build:
 # ensures we have iconv(1) installed, and seems more logical since these
 # files could theoretically also be [re]built)
 	@${SH} -c '${FIND} ${WRKSRC}/doc/*ru* -type f | while read f ; \
-		do iconv -f cp866 -t utf-8 "$${f}" > "$${f}.tmp" && \
+		do ${ICONV_CMD} -f cp866 -t utf-8 "$${f}" > "$${f}.tmp" && \
 		${MV} "$${f}.tmp" "$${f}" ; done'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/biew ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}/skn ${DATADIR}/syntax ${DATADIR}/xlt
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/* ${DATADIR}/skn
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/syntax/* ${DATADIR}/syntax
-	${INSTALL_DATA} ${WRKSRC}/bin_rc/xlt/russian/* ${DATADIR}/xlt
-	${INSTALL_MAN} ${WRKSRC}/doc/biew.1 ${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/biew ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/skn ${STAGEDIR}${DATADIR}/syntax \
+		${STAGEDIR}${DATADIR}/xlt
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/biew.hlp ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/skn/* ${STAGEDIR}${DATADIR}/skn
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/syntax/* ${STAGEDIR}${DATADIR}/syntax
+	${INSTALL_DATA} ${WRKSRC}/bin_rc/xlt/russian/* \
+		${STAGEDIR}${DATADIR}/xlt
+	${INSTALL_MAN} ${WRKSRC}/doc/biew.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/biew/pkg-plist b/editors/biew/pkg-plist
index 4f6c37d818d..bae61396b5a 100644
--- a/editors/biew/pkg-plist
+++ b/editors/biew/pkg-plist
@@ -1,4 +1,5 @@
 bin/biew
+man/man1/biew.1.gz
 %%DATADIR%%/biew.hlp
 %%DATADIR%%/skn/assembly.skn
 %%DATADIR%%/skn/golded.skn