Index: head/editors/biew/Makefile =================================================================== --- head/editors/biew/Makefile (revision 407633) +++ head/editors/biew/Makefile (revision 407634) @@ -1,81 +1,81 @@ # Created by: Michael Vasilenko # $FreeBSD$ PORTNAME= biew PORTVERSION= 6.1.0 PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= SF/beye/biew/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src MAINTAINER= danfe@FreeBSD.org COMMENT= Binary file viewer and editor LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 ia64 ONLY_FOR_ARCHS_REASON= no targets defined in Makefile -USES= dos2unix gmake iconv tar:bzip2 +USES= dos2unix gmake iconv ncurses tar:bzip2 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}" MAKEFILE= makefile WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g} PORTDOCS= biew_en.txt biew_ru.txt develop.en develop.ru file_ini.en \ file_ini.ru release.txt unix.txt OPTIONS_DEFINE= SLANG DOCS OPTIONS_DEFAULT= SLANG SLANG_DESC= Use S-Lang based display renderer BROKEN_powerpc= Does not compile BROKEN_sparc64= Does not compile 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 # Allow it to find definition of `uintmax_t' (required at least for ia64) @${REINPLACE_CMD} -e 's,codelen++),++DisP->codelen),' \ ${WRKSRC}/plugins/disasm/ix86/ix86_fun.c # 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 @${REINPLACE_CMD} -E 's,fild|fistp,&s,' \ ${WRKSRC}/biewlib/sysdep/ia32/cpu_info.c \ ${WRKSRC}/biewlib/sysdep/x86_64/cpu_info.c post-build: # Convert Russian text files to UTF-8 encoding (doing it in 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_CMD} -f cp866 -t utf-8 "$${f}" > "$${f}.tmp" && \ ${MV} "$${f}.tmp" "$${f}" ; done' do-install: ${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 Index: head/editors/biew/files/patch-configure =================================================================== --- head/editors/biew/files/patch-configure (revision 407633) +++ head/editors/biew/files/patch-configure (revision 407634) @@ -1,75 +1,75 @@ --- configure.orig +++ configure @@ -100,7 +100,7 @@ # Use this before starting a check echocheck() { echo "============ Checking for $@ ============" >> "$TMPLOG" - echo ${_echo_n} "Checking for $@ ... ${_echo_c}" + echo ${_echo_n} "Checking for $@... ${_echo_c}" } # Use this to echo the results of a check @@ -493,20 +493,20 @@ echores "$_target_system" -echo "Detected host..."$system_name +echo "Detected host..." $system_name _cdefos="-DDATADIR='\"$_datadir\"'" -cc_name=`$_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1` -cc_version=`$_cc -dumpversion` +eval `$_cc -v 2>&1 | sed -En \ + '/version/s,(.* )?(.*) version ([0-9.]*).*,cc_name=\2 ; cc_version=\3,p'` echocheck "C compiler name" echores $cc_name case $cc_name in - gcc) + gcc|clang) ;; *) - die "Unknown compiler name $cc_name. Project required GCC" + die "Unknown compiler name $cc_name. Project requires GCC or Clang" ;; esac @@ -583,10 +583,10 @@ _osldef="$_debug $_profile $_osldef" elif test -z "$CFLAGS" ; then _cdefos="-DNDEBUG=1 -O2 -ffast-math -fomit-frame-pointer $_cdefos" - x86 && _cdefos="-mmmx -msse $_cdefos" else _cdefos="-DNDEBUG=1 $CFLAGS $_cdefos" fi +x86 && _cdefos="-mmmx -msse $_cdefos" test -n "$LDFLAGS" && _osldef="$LDFLAGS $_osldef" test -n "$LIBS" && _osldef="$LIBS $_osldef" @@ -656,10 +656,10 @@ echocheck "slang.h" check_header slang.h enabled slang_h && _cdefos="-D_SLANG_ -D__OS_NAME__='\"Unix/Slang\"' $_cdefos" - enabled slang_h && _oslibs="-lslang $_oslibs" || disable _slang -+ enabled slang_h && _oslibs="-lslang -ltermcap $_oslibs" || disable _slang ++ enabled slang_h && _oslibs="-lslang -lncurses $_oslibs" || disable _slang echores "$slang_h" fi - if enabled _curses -a disabled _slang; then + if enabled _curses && disabled _slang; then echocheck "curses.h" cat > $TMPC << EOF #include @@ -678,8 +678,10 @@ fi echores "$_curses" fi - disabled _curses -a disabled _slang && _cdefos="-D_VT100_ -D__OS_NAME__='\"Unix/VT100\"' $_cdefos" - disabled _curses -a disabled _slang && echo "Defaulting to VT100" + if disabled _curses && disabled _slang ; then + _cdefos="-D_VT100_ -D__OS_NAME__='\"Unix/VT100\"' $_cdefos" + echo "Defaulting to VT100" + fi ;; *) ;;