Wed Feb 10 10:43:28 2010 UTC ()
Some improvements:
* set LICENSE=gnu-gpl-v2
* add user-destdir support
* reset WRKSRC setting, use CONFIGURE_DIRS instead,
  so that pkgsrc magick affect to all files
* regen patches, split out patch-ad from patch-ac
  (one patch file to multiple files is not good).
* need termcap to build.


(obache)
diff -r1.17 -r1.18 pkgsrc/misc/lv/Makefile
diff -r1.8 -r1.9 pkgsrc/misc/lv/distinfo
diff -r1.4 -r1.5 pkgsrc/misc/lv/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/misc/lv/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/misc/lv/patches/patch-ac
diff -r0 -r1.1 pkgsrc/misc/lv/patches/patch-ad
cvs diff -r1.17 -r1.18 pkgsrc/misc/lv/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/lv/Makefile 2005/12/05 20:50:40 1.17
+++ pkgsrc/misc/lv/Makefile 2010/02/10 10:43:28 1.18
@@ -1,20 +1,24 @@ @@ -1,20 +1,24 @@
1# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:40 rillig Exp $ 1# $NetBSD: Makefile,v 1.18 2010/02/10 10:43:28 obache Exp $
2 2
3DISTNAME= lv451 3DISTNAME= lv451
4PKGNAME= lv-4.51 4PKGNAME= lv-4.51
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= misc 6CATEGORIES= misc
7MASTER_SITES= http://www.ff.iij4u.or.jp/~nrt/freeware/ 7MASTER_SITES= http://www.ff.iij4u.or.jp/~nrt/freeware/
8 8
9MAINTAINER= tech-pkg-ja@jp.NetBSD.org 9MAINTAINER= tech-pkg-ja@jp.NetBSD.org
10HOMEPAGE= http://www.ff.iij4u.or.jp/~nrt/lv/ 10HOMEPAGE= http://www.ff.iij4u.or.jp/~nrt/lv/
11COMMENT= Powerful Multilingual File Viewer 11COMMENT= Powerful Multilingual File Viewer
 12LICENSE= gnu-gpl-v2
12 13
13WRKSRC= ${WRKDIR}/${DISTNAME}/build 14PKG_DESTDIR_SUPPORT= user-destdir
 15
 16CONFIGURE_DIRS= build
14GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
15CONFIGURE_SCRIPT= ../src/configure 18CONFIGURE_SCRIPT= ../src/configure
16 19
17MAKE_ENV+= LN=${LN:Q} 20MAKE_ENV+= LN=${LN:Q}
18INSTALLATION_DIRS= lib/lv 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 lib/lv
19 22
 23.include "../../mk/termcap.buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/misc/lv/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/lv/distinfo 2005/12/03 17:43:47 1.8
+++ pkgsrc/misc/lv/distinfo 2010/02/10 10:43:28 1.9
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.8 2005/12/03 17:43:47 christos Exp $ 1$NetBSD: distinfo,v 1.9 2010/02/10 10:43:28 obache Exp $
2 2
3SHA1 (lv451.tar.gz) = 1a70299c27aa317a436976a557853858db4dcb5f 3SHA1 (lv451.tar.gz) = 1a70299c27aa317a436976a557853858db4dcb5f
4RMD160 (lv451.tar.gz) = ae0d58b52dbf714f8b371f51ac87490ecba1c994 4RMD160 (lv451.tar.gz) = ae0d58b52dbf714f8b371f51ac87490ecba1c994
5Size (lv451.tar.gz) = 605082 bytes 5Size (lv451.tar.gz) = 605082 bytes
6SHA1 (patch-aa) = e8774485d7dae4b0660e108374b4809f0b61e722 6SHA1 (patch-aa) = b27cccdc222d4d8369b4791c581ed217e908b2ed
7SHA1 (patch-ab) = 4a249bc382064c5d2a100e48b1dd51710a5ec0c4 7SHA1 (patch-ab) = 7ddb94fa4e73bb3c75097f42d06079d717e97b24
8SHA1 (patch-ac) = aef4ccc3871870df3d43dfa31dd89aa29a5f3512 8SHA1 (patch-ac) = 860c891b0fff286435b526b57a2c696353f41764
 9SHA1 (patch-ad) = f0f0d76991f5585ecafa3af68f4472d82dc314da
cvs diff -r1.4 -r1.5 pkgsrc/misc/lv/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/lv/patches/patch-aa 2005/04/05 14:56:06 1.4
+++ pkgsrc/misc/lv/patches/patch-aa 2010/02/10 10:43:28 1.5
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-aa,v 1.4 2005/04/05 14:56:06 cube Exp $ 1$NetBSD: patch-aa,v 1.5 2010/02/10 10:43:28 obache Exp $
2 2
3--- ../src/Makefile.in.orig 2004-01-06 08:22:17.000000000 +0100 3--- src/Makefile.in.orig 2004-01-06 07:22:17.000000000 +0000
4+++ ../src/Makefile.in 4+++ src/Makefile.in
5@@ -64,18 +64,10 @@ depend:: 5@@ -64,18 +64,10 @@ depend::
6 # 6 #
7  7
8 install:: 8 install::
9- $(INSTALL) -s -m 555 lv $(bindir) 9- $(INSTALL) -s -m 555 lv $(bindir)
10- if test -f $(bindir)/lgrep; then \ 10- if test -f $(bindir)/lgrep; then \
11- /bin/rm -f $(bindir)/lgrep; \ 11- /bin/rm -f $(bindir)/lgrep; \
12- fi 12- fi
13- (cd $(bindir); ln lv lgrep) 13- (cd $(bindir); ln lv lgrep)
14- if test ! -d $(lvlibdir); then \ 14- if test ! -d $(lvlibdir); then \
15- mkdir -p $(lvlibdir); \ 15- mkdir -p $(lvlibdir); \
16- fi 16- fi
17- $(INSTALL) -m 444 $(srcdir)/../lv.hlp $(lvlibdir) 17- $(INSTALL) -m 444 $(srcdir)/../lv.hlp $(lvlibdir)
18- if test -d $(mandir) -a -d $(mandir)/man1; then \ 18- if test -d $(mandir) -a -d $(mandir)/man1; then \
19- $(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \ 19- $(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \
20- fi 20- fi
21+ $(BSD_INSTALL_PROGRAM) lv $(bindir)/lv 21+ $(BSD_INSTALL_PROGRAM) lv $(DESTDIR)$(bindir)/lv
22+ $(LN) -s lv $(bindir)/lgrep 22+ $(LN) -s lv $(DESTDIR)$(bindir)/lgrep
23+ $(BSD_INSTALL_DATA) $(srcdir)/../lv.hlp $(lvlibdir)/lv.hlp 23+ $(BSD_INSTALL_DATA) $(srcdir)/../lv.hlp $(DESTDIR)$(lvlibdir)/lv.hlp
24+ $(BSD_INSTALL_MAN) $(srcdir)/../lv.1 $(mandir)/man1; \ 24+ $(BSD_INSTALL_MAN) $(srcdir)/../lv.1 $(DESTDIR)$(mandir)/man1; \
25  25
26 uninstall:: 26 uninstall::
27 for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \ 27 for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \
cvs diff -r1.1 -r1.2 pkgsrc/misc/lv/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/lv/patches/patch-ab 2005/12/03 16:46:32 1.1
+++ pkgsrc/misc/lv/patches/patch-ab 2010/02/10 10:43:28 1.2
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-ab,v 1.1 2005/12/03 16:46:32 christos Exp $ 1$NetBSD: patch-ab,v 1.2 2010/02/10 10:43:28 obache Exp $
2 2
3--- ../src/console.c.orig 2004-01-05 02:27:46.000000000 -0500 3--- src/console.c.orig 2004-01-05 07:27:46.000000000 +0000
4+++ ../src/console.c 2005-12-03 11:37:19.000000000 -0500 4+++ src/console.c
5@@ -388,7 +388,22 @@ 5@@ -388,7 +388,22 @@ public void ConsoleSetUp()
6 signal( SIGINT, InterruptIgnoreHandler ); 6 signal( SIGINT, InterruptIgnoreHandler );
7 #endif /* MSDOS */ 7 #endif /* MSDOS */
8  8
9-#ifdef HAVE_SIGVEC 9-#ifdef HAVE_SIGVEC
10+#ifdef HAVE_SIGACTION 10+#ifdef HAVE_SIGACTION
11+ struct sigaction sa; 11+ struct sigaction sa;
12+ 12+
13+ sigemptyset( &sa.sa_mask ); 13+ sigemptyset( &sa.sa_mask );
14+# ifndef SA_RESTART 14+# ifndef SA_RESTART
15+ sa.sa_flags = 0; 15+ sa.sa_flags = 0;
16+# else 16+# else
17+ sa.sa_flags = SA_RESTART; 17+ sa.sa_flags = SA_RESTART;
18+# endif 18+# endif
19+ sa.sa_handler = WindowChangeHandler; 19+ sa.sa_handler = WindowChangeHandler;
20+ (void)sigaction( SIGWINCH, &sa, NULL ); 20+ (void)sigaction( SIGWINCH, &sa, NULL );
21+ 21+
22+ sa.sa_handler = InterruptHandler; 22+ sa.sa_handler = InterruptHandler;
23+ (void)sigaction( SIGINT, &sa, NULL ); 23+ (void)sigaction( SIGINT, &sa, NULL );
24+#else 24+#else
25+# ifdef SV_INTERRUPT 25+# ifdef SV_INTERRUPT
26 struct sigvec sigVec; 26 struct sigvec sigVec;
27  27
28 sigVec.sv_handler = WindowChangeHandler; 28 sigVec.sv_handler = WindowChangeHandler;
29@@ -400,12 +415,13 @@ 29@@ -400,12 +415,13 @@ public void ConsoleSetUp()
30 sigVec.sv_mask = sigmask( SIGINT ); 30 sigVec.sv_mask = sigmask( SIGINT );
31 sigVec.sv_flags = SV_INTERRUPT; 31 sigVec.sv_flags = SV_INTERRUPT;
32 sigvec( SIGINT, &sigVec, NULL ); 32 sigvec( SIGINT, &sigVec, NULL );
33-#else 33-#else
34-# ifdef SIGWINCH 34-# ifdef SIGWINCH
35+# else 35+# else
36+# ifdef SIGWINCH 36+# ifdef SIGWINCH
37 signal( SIGWINCH, WindowChangeHandler ); 37 signal( SIGWINCH, WindowChangeHandler );
38-# endif  38-# endif
39+# endif  39+# endif
40 signal( SIGINT, InterruptHandler ); 40 signal( SIGINT, InterruptHandler );
41-#endif /* HAVE_SIGVEC */ 41-#endif /* HAVE_SIGVEC */
42+# endif /* SV_INTERRUPT */ 42+# endif /* SV_INTERRUPT */
cvs diff -r1.1 -r1.2 pkgsrc/misc/lv/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/misc/lv/patches/patch-ac 2005/12/03 16:46:32 1.1
+++ pkgsrc/misc/lv/patches/patch-ac 2010/02/10 10:43:28 1.2
@@ -1,25 +1,13 @@ @@ -1,25 +1,13 @@
1$NetBSD: patch-ac,v 1.1 2005/12/03 16:46:32 christos Exp $ 1$NetBSD: patch-ac,v 1.2 2010/02/10 10:43:28 obache Exp $
2 2
3--- ../src/configure.in.orig 2004-01-05 01:35:44.000000000 -0500 3--- src/configure.in.orig 2004-01-05 06:35:44.000000000 +0000
4+++ ../src/configure.in 2005-12-03 11:37:40.000000000 -0500 4+++ src/configure.in
5@@ -34,7 +34,7 @@ 5@@ -34,7 +34,7 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys
6 dnl Checks for typedefs, structures, and compiler characteristics. 6 dnl Checks for typedefs, structures, and compiler characteristics.
7  7
8 dnl Checks for library functions. 8 dnl Checks for library functions.
9-AC_CHECK_FUNCS(sigvec tgetnum setlocale) 9-AC_CHECK_FUNCS(sigvec tgetnum setlocale)
10+AC_CHECK_FUNCS(sigaction tgetnum setlocale) 10+AC_CHECK_FUNCS(sigaction tgetnum setlocale)
11 AC_FUNC_GETPGRP 11 AC_FUNC_GETPGRP
12 AC_PROG_GCC_TRADITIONAL 12 AC_PROG_GCC_TRADITIONAL
13 AC_TYPE_SIGNAL 13 AC_TYPE_SIGNAL
14 
15--- ../src/configure.orig 2004-01-05 01:37:17.000000000 -0500 
16+++ ../src/configure 2005-12-03 11:37:58.000000000 -0500 
17@@ -1440,7 +1440,7 @@ 
18  
19  
20  
21-for ac_func in sigvec tgetnum setlocale 
22+for ac_func in sigaction tgetnum setlocale 
23 do 
24 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 
25 echo "configure:1447: checking for $ac_func" >&5 
File Added: pkgsrc/misc/lv/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2010/02/10 10:43:28 obache Exp $

--- src/configure.orig	2004-01-05 06:37:17.000000000 +0000
+++ src/configure
@@ -1440,7 +1440,7 @@ done
 
 
 
-for ac_func in sigvec tgetnum setlocale
+for ac_func in sigaction tgetnum setlocale
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:1447: checking for $ac_func" >&5