diff options
author | roy <roy@pkgsrc.org> | 2013-10-16 21:59:30 +0000 |
---|---|---|
committer | roy <roy@pkgsrc.org> | 2013-10-16 21:59:30 +0000 |
commit | 965918a4027d68d9b0da84655bb31159735118e9 (patch) | |
tree | 505746a5aaf940742e56ebd414ca963d35c68daf /editors | |
parent | cf38b75cdd5b6d3e5e3271c9e7ffa36e0cb9ff57 (diff) | |
download | pkgsrc-965918a4027d68d9b0da84655bb31159735118e9.tar.gz |
Works fine with system curses
Diffstat (limited to 'editors')
-rw-r--r-- | editors/hexedit/Makefile | 5 | ||||
-rw-r--r-- | editors/hexedit/distinfo | 3 | ||||
-rw-r--r-- | editors/hexedit/patches/patch-configure | 108 |
3 files changed, 113 insertions, 3 deletions
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile index 2016ab0567e..825525c2f74 100644 --- a/editors/hexedit/Makefile +++ b/editors/hexedit/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2013/06/09 05:40:33 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2013/10/16 21:59:30 roy Exp $ DISTNAME= hexedit-1.2.13 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= http://rigaux.org/ EXTRACT_SUFX= .src.tgz @@ -14,5 +15,5 @@ GNU_CONFIGURE= yes INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo index 5e15ee52146..d84b9b04c3e 100644 --- a/editors/hexedit/distinfo +++ b/editors/hexedit/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.11 2013/06/09 05:40:33 ryoon Exp $ +$NetBSD: distinfo,v 1.12 2013/10/16 21:59:30 roy Exp $ SHA1 (hexedit-1.2.13.src.tgz) = 1acb7ca37063d9f4b4d118ef223548fde3b753f1 RMD160 (hexedit-1.2.13.src.tgz) = cb4fe716cf8f3bfb614ea890aec20d7865e2c271 Size (hexedit-1.2.13.src.tgz) = 68778 bytes SHA1 (patch-ae) = 49627dd5704fb9cd7b6ac08d01d3324ff2d2babd +SHA1 (patch-configure) = 847d7fbf644bc3af97c7deebf5b8c24675f4c4bd diff --git a/editors/hexedit/patches/patch-configure b/editors/hexedit/patches/patch-configure new file mode 100644 index 00000000000..f2dc4589276 --- /dev/null +++ b/editors/hexedit/patches/patch-configure @@ -0,0 +1,108 @@ +$NetBSD: patch-configure,v 1.1 2013/10/16 21:59:30 roy Exp $ + +--- configure.orig 2013-10-16 21:54:45.000000000 +0000 ++++ configure +@@ -3057,6 +3057,51 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + ++# ac_fn_c_try_link LINENO ++# ----------------------- ++# Try to link conftest.$ac_ext, and return whether this succeeded. ++ac_fn_c_try_link () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ rm -f conftest.$ac_objext conftest$ac_exeext ++ if { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>conftest.err ++ ac_status=$? ++ if test -s conftest.err; then ++ grep -v '^ *+' conftest.err >conftest.er1 ++ cat conftest.er1 >&5 ++ mv -f conftest.er1 conftest.err ++ fi ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then : ++ ac_retval=0 ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_retval=1 ++fi ++ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information ++ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would ++ # interfere with the next link command; also delete a directory that is ++ # left behind by Apple's compiler. We do this before executing the actions. ++ rm -rf conftest.dSYM conftest_ipa8_conftest.oo ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ as_fn_set_status $ac_retval ++ ++} # ac_fn_c_try_link + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 + $as_echo_n "checking for initscr in -lcurses... " >&6; } +@@ -3106,51 +3151,7 @@ else + LIBS="-lncurses $LIBS" + + +-# ac_fn_c_try_link LINENO +-# ----------------------- +-# Try to link conftest.$ac_ext, and return whether this succeeded. +-ac_fn_c_try_link () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- rm -f conftest.$ac_objext conftest$ac_exeext +- if { { ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_link") 2>conftest.err +- ac_status=$? +- if test -s conftest.err; then +- grep -v '^ *+' conftest.err >conftest.er1 +- cat conftest.er1 >&5 +- mv -f conftest.er1 conftest.err +- fi +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then : +- ac_retval=0 +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_retval=1 +-fi +- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information +- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would +- # interfere with the next link command; also delete a directory that is +- # left behind by Apple's compiler. We do this before executing the actions. +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- as_fn_set_status $ac_retval +- +-} # ac_fn_c_try_link + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + |