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
--- 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,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:40 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/10 10:43:28 obache Exp $
DISTNAME= lv451
PKGNAME= lv-4.51
@@ -9,12 +9,16 @@
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
HOMEPAGE= http://www.ff.iij4u.or.jp/~nrt/lv/
COMMENT= Powerful Multilingual File Viewer
+LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/${DISTNAME}/build
+PKG_DESTDIR_SUPPORT= user-destdir
+
+CONFIGURE_DIRS= build
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../src/configure
MAKE_ENV+= LN=${LN:Q}
-INSTALLATION_DIRS= lib/lv
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 lib/lv
+.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
--- 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 @@
-$NetBSD: distinfo,v 1.8 2005/12/03 17:43:47 christos Exp $
+$NetBSD: distinfo,v 1.9 2010/02/10 10:43:28 obache Exp $
SHA1 (lv451.tar.gz) = 1a70299c27aa317a436976a557853858db4dcb5f
RMD160 (lv451.tar.gz) = ae0d58b52dbf714f8b371f51ac87490ecba1c994
Size (lv451.tar.gz) = 605082 bytes
-SHA1 (patch-aa) = e8774485d7dae4b0660e108374b4809f0b61e722
+SHA1 (patch-aa) = b27cccdc222d4d8369b4791c581ed217e908b2ed
-SHA1 (patch-ab) = 4a249bc382064c5d2a100e48b1dd51710a5ec0c4
+SHA1 (patch-ab) = 7ddb94fa4e73bb3c75097f42d06079d717e97b24
-SHA1 (patch-ac) = aef4ccc3871870df3d43dfa31dd89aa29a5f3512
+SHA1 (patch-ac) = 860c891b0fff286435b526b57a2c696353f41764
+SHA1 (patch-ad) = f0f0d76991f5585ecafa3af68f4472d82dc314da
--- 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,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2005/04/05 14:56:06 cube Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/10 10:43:28 obache Exp $
---- ../src/Makefile.in.orig 2004-01-06 08:22:17.000000000 +0100
-+++ ../src/Makefile.in
+--- src/Makefile.in.orig 2004-01-06 07:22:17.000000000 +0000
++++ src/Makefile.in
@@ -64,18 +64,10 @@ depend::
#
@@ -18,10 +18,10 @@
- if test -d $(mandir) -a -d $(mandir)/man1; then \
- $(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \
- fi
-+ $(BSD_INSTALL_PROGRAM) lv $(bindir)/lv
-+ $(LN) -s lv $(bindir)/lgrep
-+ $(BSD_INSTALL_DATA) $(srcdir)/../lv.hlp $(lvlibdir)/lv.hlp
-+ $(BSD_INSTALL_MAN) $(srcdir)/../lv.1 $(mandir)/man1; \
++ $(BSD_INSTALL_PROGRAM) lv $(DESTDIR)$(bindir)/lv
++ $(LN) -s lv $(DESTDIR)$(bindir)/lgrep
++ $(BSD_INSTALL_DATA) $(srcdir)/../lv.hlp $(DESTDIR)$(lvlibdir)/lv.hlp
++ $(BSD_INSTALL_MAN) $(srcdir)/../lv.1 $(DESTDIR)$(mandir)/man1; \
uninstall::
for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \
--- 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,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/12/03 16:46:32 christos Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/10 10:43:28 obache Exp $
---- ../src/console.c.orig 2004-01-05 02:27:46.000000000 -0500
-+++ ../src/console.c 2005-12-03 11:37:19.000000000 -0500
-@@ -388,7 +388,22 @@
+--- src/console.c.orig 2004-01-05 07:27:46.000000000 +0000
++++ src/console.c
+@@ -388,7 +388,22 @@ public void ConsoleSetUp()
signal( SIGINT, InterruptIgnoreHandler );
#endif /* MSDOS */
@@ -26,7 +26,7 @@
struct sigvec sigVec;
sigVec.sv_handler = WindowChangeHandler;
-@@ -400,12 +415,13 @@
+@@ -400,12 +415,13 @@ public void ConsoleSetUp()
sigVec.sv_mask = sigmask( SIGINT );
sigVec.sv_flags = SV_INTERRUPT;
sigvec( SIGINT, &sigVec, NULL );
--- 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,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/12/03 16:46:32 christos Exp $
+$NetBSD: patch-ac,v 1.2 2010/02/10 10:43:28 obache Exp $
---- ../src/configure.in.orig 2004-01-05 01:35:44.000000000 -0500
-+++ ../src/configure.in 2005-12-03 11:37:40.000000000 -0500
-@@ -34,7 +34,7 @@
+--- src/configure.in.orig 2004-01-05 06:35:44.000000000 +0000
++++ src/configure.in
+@@ -34,7 +34,7 @@ AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
@@ -11,15 +11,3 @@
AC_FUNC_GETPGRP
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIGNAL
-
---- ../src/configure.orig 2004-01-05 01:37:17.000000000 -0500
-+++ ../src/configure 2005-12-03 11:37:58.000000000 -0500
-@@ -1440,7 +1440,7 @@
-
-
-
--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
$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