From 10e08ac327c3737ee7b9087b8c8e88ca6286a902 Mon Sep 17 00:00:00 2001
From: bjs <bjs>
Date: Sat, 9 Aug 2008 21:32:39 +0000
Subject: Update to most-5.0.0a, using libslang2.

Myriad feature enhancements (such as UTF-8 and enhanced regexp
support via libslang2) as well as bug fixes (notably proper shell
in some formerly problematic cases).  Also, mmap is enabled by
default now.
---
 misc/most/Makefile         | 15 ++++++++----
 misc/most/distinfo         | 11 ++++-----
 misc/most/patches/patch-aa | 18 --------------
 misc/most/patches/patch-ab | 58 ++++++++++++++++++++++++++++++++++++----------
 4 files changed, 61 insertions(+), 41 deletions(-)
 delete mode 100644 misc/most/patches/patch-aa

(limited to 'misc')

diff --git a/misc/most/Makefile b/misc/most/Makefile
index 976258a2361..2ef0ba1d8eb 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2007/02/10 04:53:08 obache Exp $
+# $NetBSD: Makefile,v 1.23 2008/08/09 21:32:39 bjs Exp $
 
-DISTNAME=	most-4.9.0
-PKGREVISION=	1
+DISTNAME=	most-5.0.0a
 CATEGORIES=	misc
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/most/
 
@@ -9,9 +8,15 @@ MAINTAINER=	rhwang@bigpanda.com
 HOMEPAGE=	http://www.jedsoft.org/most/
 COMMENT=	Pager (like less) which has support for windows and binary files
 
-GNU_CONFIGURE=	yes
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+MAKE_JOBS_SAFE=		no
+
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-x
 
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang2}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
@@ -19,5 +24,5 @@ CONFIGURE_ARGS+=	--without-x
 CFLAGS+= -D_POSIX_C_SOURCE
 .endif
 
-.include "../../devel/libslang/buildlink3.mk"
+.include "../../devel/libslang2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/most/distinfo b/misc/most/distinfo
index e82a5353133..b2833ea9347 100644
--- a/misc/most/distinfo
+++ b/misc/most/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:02:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2008/08/09 21:32:39 bjs Exp $
 
-SHA1 (most-4.9.0.tar.gz) = 7f8d02c6573ea58b00a9f85b06efa89bdc386dd2
-RMD160 (most-4.9.0.tar.gz) = ac1ca8540851dde71f603846a6b68b7c274ff34a
-Size (most-4.9.0.tar.gz) = 85661 bytes
-SHA1 (patch-aa) = 3dcc0d06882b2a25c165f2b3f3426b607c85c864
-SHA1 (patch-ab) = 5e512c09fce45e251fde0c393cdef9747dbade1f
+SHA1 (most-5.0.0a.tar.gz) = 99eedb7169754b9a47c7755ac48949d76531e3b2
+RMD160 (most-5.0.0a.tar.gz) = 5b0d1a1c5a883b94a972a5cfc1bd088d6c1cf578
+Size (most-5.0.0a.tar.gz) = 155233 bytes
+SHA1 (patch-ab) = 7d8a6519856fe05dcc94f745059dc321e5e4d625
diff --git a/misc/most/patches/patch-aa b/misc/most/patches/patch-aa
deleted file mode 100644
index e517c6b1a73..00000000000
--- a/misc/most/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/04/20 22:20:51 jtb Exp $
-
---- configure.orig	Fri Apr 20 22:08:26 2001
-+++ configure
-@@ -2363,12 +2363,7 @@
- # the other directories may have a better chance of containing a more recent
- # version.
- 
--JD_Search_Dirs="$JD_Search_Dirs \
--                $includedir,$libdir \
--                /usr/local/include,/usr/local/lib \
--		/usr/include,/usr/lib \
--		/usr/include/slang,/usr/lib \
--		/usr/include/slang,/usr/lib/slang"
-+JD_Search_Dirs="$prefix/include,$prefix/lib"
- 
- echo looking for the SLANG library
- 
diff --git a/misc/most/patches/patch-ab b/misc/most/patches/patch-ab
index 73f98aa4e7f..8b1248ef582 100644
--- a/misc/most/patches/patch-ab
+++ b/misc/most/patches/patch-ab
@@ -1,15 +1,49 @@
-$NetBSD: patch-ab,v 1.1 2001/04/20 22:20:51 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2008/08/09 21:32:39 bjs Exp $
 
---- src/Makefile.in.orig	Fri Apr 20 22:18:06 2001
+--- src/Makefile.in.orig	2007-09-09 12:14:17.000000000 -0400
 +++ src/Makefile.in
-@@ -87,8 +87,8 @@
- install: all $(BIN_DIR)
- 	$(INSTALL) -s $(OBJDIR)/most $(BIN_DIR)
- 	$(INSTALL_DATA) ../most.1 $(MAN_DIR)
--	$(INSTALL) -d $(DOC_DIR) -m 755
--	$(INSTALL_DATA) $(DOC_FILES) $(DOC_DIR)
-+#	$(INSTALL) -d $(DOC_DIR) -m 755
-+#	$(INSTALL_DATA) $(DOC_FILES) $(DOC_DIR)
- $(BIN_DIR):
- 	- ../mkinsdir.sh $(BIN_DIR)
+@@ -22,7 +22,7 @@ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ datarootdir	= @datarootdir@
+ BIN_DIR		= $(prefix)/bin
+-MAN_DIR		= $(datarootdir)/man
++MAN_DIR		= $(PREFIX)/$(PKGMANDIR)
+ DOC_DIR		= $(datarootdir)/doc/most
+ SYS_INITFILE	= @sysconfdir@/most.conf
+ MKINSDIR	= ../autoconf/mkinsdir.sh
+@@ -79,21 +79,21 @@ clean:
+ distclean: clean
+ 	/bin/rm -rf $(OBJDIR) Makefile sysconf.h
+ installdirs:
+-	$(MKINSDIR) $(DEST_DOCDIR)
+-	$(MKINSDIR) $(DEST_MANDIR)/man1
+-	$(MKINSDIR) $(DEST_BINDIR)
++	#$(MKINSDIR) $(DEST_DOCDIR)
++	$(BSD_INSTALL_MAN_DIR) $(DEST_MANDIR)/man1
++	$(BSD_INSTALL_PROGRAM_DIR) $(DEST_BINDIR)
+ install: all installdirs
+-	$(INSTALL) -s $(OBJDIR)/most $(DEST_BINDIR)
+-	$(INSTALL_DATA) ../most.1 $(DEST_MANDIR)/man1
+-	@for i in $(DOC_FILES); \
+-	do \
+-		i=../$$i; \
+-		echo $(INSTALL_DATA) $$i $(DEST_DOCDIR); \
+-		$(INSTALL_DATA) $$i $(DEST_DOCDIR); \
+-		if [ "$$?" != "0" ]; then \
+-		  exit 1; \
+-		fi; \
+-	done
++	$(BSD_INSTALL_PROGRAM) $(OBJDIR)/most $(DEST_BINDIR)
++	$(BSD_INSTALL_MAN) ../most.1 $(DEST_MANDIR)/man1
++	#@for i in $(DOC_FILES); \
++	#do \
++	#	i=../$$i; \
++	#	echo $(INSTALL_DATA) $$i $(DEST_DOCDIR); \
++	#	$(INSTALL_DATA) $$i $(DEST_DOCDIR); \
++	#	if [ "$$?" != "0" ]; then \
++	#	  exit 1; \
++	#	fi; \
++	#done
  # The symlinks target is for my own private use.  It simply creates the object
+ # directory as a symbolic link to a local disk instead of an NFS mounted one.
+ symlinks:
-- 
cgit v1.2.3