[22252] trunk/dports/textproc/lv

source_changes at macosforge.org source_changes at macosforge.org
Fri Feb 23 21:55:18 PST 2007


Revision: 22252
          http://trac.macosforge.org/projects/macports/changeset/22252
Author:   takanori at macports.org
Date:     2007-02-23 21:55:18 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
Link against MacPorts' ncurses.

Modified Paths:
--------------
    trunk/dports/textproc/lv/Portfile
    trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch

Added Paths:
-----------
    trunk/dports/textproc/lv/files/patch-src_configure
    trunk/dports/textproc/lv/files/patch-src_stream.c

Removed Paths:
-------------
    trunk/dports/textproc/lv/files/gzcat.patch

Modified: trunk/dports/textproc/lv/Portfile
===================================================================
--- trunk/dports/textproc/lv/Portfile	2007-02-24 05:53:25 UTC (rev 22251)
+++ trunk/dports/textproc/lv/Portfile	2007-02-24 05:55:18 UTC (rev 22252)
@@ -3,7 +3,7 @@
 PortSystem        1.0
 name              lv
 version           4.51
-revision	  1
+revision	  2
 categories        textproc
 maintainers       takanori at macports.org
 description       Powerful Multilingual File Viewer / Grep
@@ -15,19 +15,19 @@
 checksums	  md5 85b70ae797f935741ec9a1cbe92f00e9 \
 		  sha1 1a70299c27aa317a436976a557853858db4dcb5f \
 		  rmd160 ae0d58b52dbf714f8b371f51ac87490ecba1c994
-depends_lib	  lib:libncurses:ncurses
+depends_lib	  port:ncurses
 depends_run	  bin:bzcat:bzip2 bin:gzcat:gzip
 
 worksrcdir        ${name}451
-patch.pre_args	  -p1
-patchfiles	  gzcat.patch
+patchfiles	  patch-src_stream.c patch-src_configure
 
-configure	{
-		system "cd ${worksrcpath}/build && ../src/configure --prefix=${prefix}"
-}
-build		{
-		system "cd ${worksrcpath}/build && make"
-}
+configure.env	CFLAGS="-I${prefix}/include/ncurses" LDFLAGS="-L${prefix}/lib"
+configure.dir	${worksrcpath}/build
+configure.cmd	../src/configure
+
+build.dir	${worksrcpath}/build
+build.target	
+
 destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/lib/lv
 
@@ -47,3 +47,7 @@
 variant lesslikeslash	{
 			patchfiles-append lv451_lesslikeslash.patch
 }
+
+livecheck.check regex
+livecheck.url   ${homepage}
+livecheck.regex The latest version is ver (\[0-9.a-z\]+)

Deleted: trunk/dports/textproc/lv/files/gzcat.patch
===================================================================
--- trunk/dports/textproc/lv/files/gzcat.patch	2007-02-24 05:53:25 UTC (rev 22251)
+++ trunk/dports/textproc/lv/files/gzcat.patch	2007-02-24 05:55:18 UTC (rev 22252)
@@ -1,11 +0,0 @@
---- lv451/src/stream.c~	2003-11-13 12:08:19.000000000 +0900
-+++ lv451/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()

Modified: trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch
===================================================================
--- trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch	2007-02-24 05:53:25 UTC (rev 22251)
+++ trunk/dports/textproc/lv/files/lv451_lesslikeslash.patch	2007-02-24 05:55:18 UTC (rev 22252)
@@ -1,5 +1,5 @@
-*** lv451.orig/src/command.c	Mon Jan  5 16:42:31 2004
---- lv451/src/command.c	Thu Mar 10 01:29:57 2005
+*** src/command.c	Mon Jan  5 16:42:31 2004
+--- src/command.c	Thu Mar 10 01:29:57 2005
 ***************
 *** 413,418 ****
 --- 413,426 ----

Added: trunk/dports/textproc/lv/files/patch-src_configure
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_configure	                        (rev 0)
+++ trunk/dports/textproc/lv/files/patch-src_configure	2007-02-24 05:55:18 UTC (rev 22252)
@@ -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
+ 
+ 

Added: trunk/dports/textproc/lv/files/patch-src_stream.c
===================================================================
--- trunk/dports/textproc/lv/files/patch-src_stream.c	                        (rev 0)
+++ trunk/dports/textproc/lv/files/patch-src_stream.c	2007-02-24 05:55:18 UTC (rev 22252)
@@ -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/20070223/769c66fc/attachment.html


More information about the macports-changes mailing list