From owner-svn-ports-head@FreeBSD.ORG Wed Dec 25 13:47:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7666873A; Wed, 25 Dec 2013 13:47:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 623FC1752; Wed, 25 Dec 2013 13:47:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPDlElv042995; Wed, 25 Dec 2013 13:47:14 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPDlEXm042993; Wed, 25 Dec 2013 13:47:14 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201312251347.rBPDlEXm042993@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 25 Dec 2013 13:47:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337415 - head/editors/biew X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Dec 2013 13:47:14 -0000 Author: danfe Date: Wed Dec 25 13:47:13 2013 New Revision: 337415 URL: http://svnweb.freebsd.org/changeset/ports/337415 Log: Stagify, dismiss USE_GMAKE, utilize some helper knobs. No functional changes. Modified: head/editors/biew/Makefile head/editors/biew/pkg-plist Modified: head/editors/biew/Makefile ============================================================================== --- head/editors/biew/Makefile Wed Dec 25 13:20:09 2013 (r337414) +++ head/editors/biew/Makefile Wed Dec 25 13:47:13 2013 (r337415) @@ -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 +BROKEN_powerpc= Does not compile +BROKEN_sparc64= Does not compile -.if ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile -.endif - -.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 Modified: head/editors/biew/pkg-plist ============================================================================== --- head/editors/biew/pkg-plist Wed Dec 25 13:20:09 2013 (r337414) +++ head/editors/biew/pkg-plist Wed Dec 25 13:47:13 2013 (r337415) @@ -1,4 +1,5 @@ bin/biew +man/man1/biew.1.gz %%DATADIR%%/biew.hlp %%DATADIR%%/skn/assembly.skn %%DATADIR%%/skn/golded.skn