[31273] trunk/dports/textproc/lv
takanori at macports.org
takanori at macports.org
Sun Nov 18 21:29:18 PST 2007
Revision: 31273
http://trac.macosforge.org/projects/macports/changeset/31273
Author: takanori at macports.org
Date: 2007-11-18 21:29:16 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
lv: Linted.
Modified Paths:
--------------
trunk/dports/textproc/lv/Portfile
Added Paths:
-----------
trunk/dports/textproc/lv/files/patch-src_Makefile.in.diff
trunk/dports/textproc/lv/files/patch-src_command.c.diff
trunk/dports/textproc/lv/files/patch-src_configure.diff
trunk/dports/textproc/lv/files/patch-src_stream.c.diff
Removed Paths:
-------------
trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch
trunk/dports/textproc/lv/files/patch-src_Makefile.in
trunk/dports/textproc/lv/files/patch-src_configure
trunk/dports/textproc/lv/files/patch-src_stream.c
Modified: trunk/dports/textproc/lv/Portfile
===================================================================
--- trunk/dports/textproc/lv/Portfile 2007-11-19 05:28:58 UTC (rev 31272)
+++ trunk/dports/textproc/lv/Portfile 2007-11-19 05:29:16 UTC (rev 31273)
@@ -1,41 +1,45 @@
# $Id$
PortSystem 1.0
+
name lv
version 4.51
revision 2
categories textproc
-maintainers takanori at macports.org
+maintainers takanori
description Powerful Multilingual File Viewer / Grep
long_description \
${description}
+platforms darwin
homepage http://www.ff.iij4u.or.jp/~nrt/lv/index.html
master_sites http://www.ff.iij4u.or.jp/~nrt/freeware/
-platforms darwin
distfiles ${name}451.tar.gz
+patchfiles patch-src_stream.c.diff \
+ patch-src_configure.diff \
+ patch-src_Makefile.in.diff
checksums md5 85b70ae797f935741ec9a1cbe92f00e9 \
sha1 1a70299c27aa317a436976a557853858db4dcb5f \
rmd160 ae0d58b52dbf714f8b371f51ac87490ecba1c994
+
depends_lib port:ncurses
depends_run bin:bzcat:bzip2 \
bin:gzcat:gzip
worksrcdir ${name}451
-patchfiles patch-src_stream.c patch-src_configure patch-src_Makefile.in
+pre-patch {
+ if {[variant_isset lesslikeslash]} {
+ patchfiles-append patch-src_command.c.diff
+ }
+}
+
configure.cflags-append -I${prefix}/include/ncurses
configure.dir ${worksrcpath}/build
configure.cmd ../src/configure
build.dir ${worksrcpath}/build
-build.target
+build.target
-pre-patch {
- if {[variant_isset lesslikeslash]} {
- patchfiles-append lv451_lesslikeslash.patch
- }
-}
-
destroot {
xinstall -m 755 -d ${destroot}${prefix}/lib/lv
@@ -52,7 +56,7 @@
}
}
-variant lesslikeslash {}
+variant lesslikeslash description {Make the behavior of the search command more similar to the one in Less} {}
livecheck.check regex
livecheck.url ${homepage}
Deleted: trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch
===================================================================
--- trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch 2007-11-19 05:28:58 UTC (rev 31272)
+++ trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch 2007-11-19 05:29:16 UTC (rev 31273)
@@ -1,25 +0,0 @@
---- src/command.c.orig 2004-01-05 16:42:31.000000000 +0900
-+++ src/command.c 2007-02-27 00:30:47.000000000 +0900
-@@ -413,6 +413,14 @@
- ConsoleClearRight();
- istr = CommandGetLine( f, prompt );
- if( NULL == istr ){
-+#if 1
-+ if( NULL != f->find.pattern ){
-+ res = CommandFindContinue( f, direction );
-+ return res;
-+ } else {
-+ return NULL;
-+ }
-+#else
- /*
- * $B%Q%?!<%sM-$j$+$iL5$7(B
- */
-@@ -426,6 +434,7 @@
- }
- }
- return NULL;
-+#endif
- } else {
- /*
- * $B%Q%?!<%s$N%;%C%H(B
Deleted: trunk/dports/textproc/lv/files/patch-src_Makefile.in
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_Makefile.in 2007-11-19 05:28:58 UTC (rev 31272)
+++ trunk/dports/textproc/lv/files/patch-src_Makefile.in 2007-11-19 05:29:16 UTC (rev 31273)
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig 2004-01-06 16:22:17.000000000 +0900
-+++ src/Makefile.in 2007-06-28 13:24:06.000000000 +0900
-@@ -41,7 +41,7 @@
- all: lv
-
- lv: $(OBJS) $(UNIOBJS)
-- $(PURIFY) $(CC) $(LDFLAGS) -o $@ $(OBJS) $(UNIOBJS) $(LIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(UNIOBJS) $(LIBS)
-
- .c.o:
- $(CC) $(CFLAGS) -c $<
Copied: trunk/dports/textproc/lv/files/patch-src_Makefile.in.diff (from rev 30574, trunk/dports/textproc/lv/files/patch-src_Makefile.in)
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_Makefile.in.diff (rev 0)
+++ trunk/dports/textproc/lv/files/patch-src_Makefile.in.diff 2007-11-19 05:29:16 UTC (rev 31273)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig 2004-01-06 16:22:17.000000000 +0900
++++ src/Makefile.in 2007-06-28 13:24:06.000000000 +0900
+@@ -41,7 +41,7 @@
+ all: lv
+
+ lv: $(OBJS) $(UNIOBJS)
+- $(PURIFY) $(CC) $(LDFLAGS) -o $@ $(OBJS) $(UNIOBJS) $(LIBS)
++ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(UNIOBJS) $(LIBS)
+
+ .c.o:
+ $(CC) $(CFLAGS) -c $<
Copied: trunk/dports/textproc/lv/files/patch-src_command.c.diff (from rev 30574, trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch)
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_command.c.diff (rev 0)
+++ trunk/dports/textproc/lv/files/patch-src_command.c.diff 2007-11-19 05:29:16 UTC (rev 31273)
@@ -0,0 +1,25 @@
+--- src/command.c.orig 2004-01-05 16:42:31.000000000 +0900
++++ src/command.c 2007-02-27 00:30:47.000000000 +0900
+@@ -413,6 +413,14 @@
+ ConsoleClearRight();
+ istr = CommandGetLine( f, prompt );
+ if( NULL == istr ){
++#if 1
++ if( NULL != f->find.pattern ){
++ res = CommandFindContinue( f, direction );
++ return res;
++ } else {
++ return NULL;
++ }
++#else
+ /*
+ * $B%Q%?!<%sM-$j$+$iL5$7(B
+ */
+@@ -426,6 +434,7 @@
+ }
+ }
+ return NULL;
++#endif
+ } else {
+ /*
+ * $B%Q%?!<%s$N%;%C%H(B
Deleted: trunk/dports/textproc/lv/files/patch-src_configure
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_configure 2007-11-19 05:28:58 UTC (rev 31272)
+++ trunk/dports/textproc/lv/files/patch-src_configure 2007-11-19 05:29:16 UTC (rev 31273)
@@ -1,159 +0,0 @@
---- src/configure.orig 2004-01-05 15:37:17.000000000 +0900
-+++ src/configure 2007-02-23 20:58:09.000000000 +0900
-@@ -1063,96 +1063,6 @@
- #define TERMCAP 1
- EOF
-
--echo $ac_n "checking for tgetstr in -lterminfo""... $ac_c" 1>&6
--echo "configure:1068: checking for tgetstr in -lterminfo" >&5
--ac_lib_var=`echo terminfo'_'tgetstr | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lterminfo $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1076 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char tgetstr();
--
--int main() {
--tgetstr()
--; return 0; }
--EOF
--if { (eval echo configure:1087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_lib=HAVE_LIB`echo terminfo | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
--
-- LIBS="-lterminfo $LIBS"
--
--else
-- echo "$ac_t""no" 1>&6
--echo $ac_n "checking for tgetstr in -ltermcap""... $ac_c" 1>&6
--echo "configure:1113: checking for tgetstr in -ltermcap" >&5
--ac_lib_var=`echo termcap'_'tgetstr | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-ltermcap $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1121 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char tgetstr();
--
--int main() {
--tgetstr()
--; return 0; }
--EOF
--if { (eval echo configure:1132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
--
-- LIBS="-ltermcap $LIBS"
--
--else
-- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for tgetstr in -lncurses""... $ac_c" 1>&6
- echo "configure:1158: checking for tgetstr in -lncurses" >&5
- ac_lib_var=`echo ncurses'_'tgetstr | sed 'y%./+-%__p_%'`
-@@ -1196,59 +1106,6 @@
-
- LIBS="-lncurses $LIBS"
-
--else
-- echo "$ac_t""no" 1>&6
--echo $ac_n "checking for tgetstr in -lcurses""... $ac_c" 1>&6
--echo "configure:1203: checking for tgetstr in -lcurses" >&5
--ac_lib_var=`echo curses'_'tgetstr | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lcurses $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 1211 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char tgetstr();
--
--int main() {
--tgetstr()
--; return 0; }
--EOF
--if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-- cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
--
-- LIBS="-lcurses $LIBS"
--
--else
-- echo "$ac_t""no" 1>&6
--fi
--
--fi
--
--fi
--
- fi
-
-
Copied: trunk/dports/textproc/lv/files/patch-src_configure.diff (from rev 30574, trunk/dports/textproc/lv/files/patch-src_configure)
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_configure.diff (rev 0)
+++ trunk/dports/textproc/lv/files/patch-src_configure.diff 2007-11-19 05:29:16 UTC (rev 31273)
@@ -0,0 +1,159 @@
+--- src/configure.orig 2004-01-05 15:37:17.000000000 +0900
++++ src/configure 2007-02-23 20:58:09.000000000 +0900
+@@ -1063,96 +1063,6 @@
+ #define TERMCAP 1
+ EOF
+
+-echo $ac_n "checking for tgetstr in -lterminfo""... $ac_c" 1>&6
+-echo "configure:1068: checking for tgetstr in -lterminfo" >&5
+-ac_lib_var=`echo terminfo'_'tgetstr | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lterminfo $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1076 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char tgetstr();
+-
+-int main() {
+-tgetstr()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- ac_tr_lib=HAVE_LIB`echo terminfo | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+- cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+- LIBS="-lterminfo $LIBS"
+-
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for tgetstr in -ltermcap""... $ac_c" 1>&6
+-echo "configure:1113: checking for tgetstr in -ltermcap" >&5
+-ac_lib_var=`echo termcap'_'tgetstr | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-ltermcap $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1121 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char tgetstr();
+-
+-int main() {
+-tgetstr()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+- cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+- LIBS="-ltermcap $LIBS"
+-
+-else
+- echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for tgetstr in -lncurses""... $ac_c" 1>&6
+ echo "configure:1158: checking for tgetstr in -lncurses" >&5
+ ac_lib_var=`echo ncurses'_'tgetstr | sed 'y%./+-%__p_%'`
+@@ -1196,59 +1106,6 @@
+
+ LIBS="-lncurses $LIBS"
+
+-else
+- echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for tgetstr in -lcurses""... $ac_c" 1>&6
+-echo "configure:1203: checking for tgetstr in -lcurses" >&5
+-ac_lib_var=`echo curses'_'tgetstr | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- ac_save_LIBS="$LIBS"
+-LIBS="-lcurses $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1211 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char tgetstr();
+-
+-int main() {
+-tgetstr()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+- echo "$ac_t""yes" 1>&6
+- ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+- cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+- LIBS="-lcurses $LIBS"
+-
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-fi
+-
+-fi
+-
+ fi
+
+
Deleted: trunk/dports/textproc/lv/files/patch-src_stream.c
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_stream.c 2007-11-19 05:28:58 UTC (rev 31272)
+++ trunk/dports/textproc/lv/files/patch-src_stream.c 2007-11-19 05:29:16 UTC (rev 31273)
@@ -1,11 +0,0 @@
---- src/stream.c~ 2003-11-13 12:08:19.000000000 +0900
-+++ src/stream.c 2006-02-24 11:30:10.000000000 +0900
-@@ -41,7 +41,7 @@
- #include <begin.h>
- #include "stream.h"
-
--private byte *gz_filter = "zcat";
-+private byte *gz_filter = "gzcat";
- private byte *bz2_filter = "bzcat";
-
- private stream_t *StreamAlloc()
Copied: trunk/dports/textproc/lv/files/patch-src_stream.c.diff (from rev 30574, trunk/dports/textproc/lv/files/patch-src_stream.c)
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_stream.c.diff (rev 0)
+++ trunk/dports/textproc/lv/files/patch-src_stream.c.diff 2007-11-19 05:29:16 UTC (rev 31273)
@@ -0,0 +1,11 @@
+--- src/stream.c~ 2003-11-13 12:08:19.000000000 +0900
++++ src/stream.c 2006-02-24 11:30:10.000000000 +0900
+@@ -41,7 +41,7 @@
+ #include <begin.h>
+ #include "stream.h"
+
+-private byte *gz_filter = "zcat";
++private byte *gz_filter = "gzcat";
+ private byte *bz2_filter = "bzcat";
+
+ private stream_t *StreamAlloc()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/93fcba94/attachment-0001.html
More information about the macports-changes
mailing list