From 5d97712ba2be454015a71ae240eb8b57b00d4225 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Thu, 10 Aug 2000 12:16:43 +0000
Subject: [PATCH] update to 0.9.16 (bugfixes, shrinks our patches)

---
 editors/nano/Makefile                        |  4 +-
 editors/nano/files/md5                       |  6 +-
 editors/nano/patches/patch-Makefile_in       | 10 +--
 editors/nano/patches/patch-configure         | 12 ---
 editors/nano/patches/patch-po_Makefile_in_in | 91 +++-----------------
 5 files changed, 21 insertions(+), 102 deletions(-)
 delete mode 100644 editors/nano/patches/patch-configure

diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index 17d62ee4ee9..da5554023e9 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.4 2000/08/04 15:06:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2000/08/10 12:16:43 naddy Exp $
 
-DISTNAME=	nano-0.9.15
+DISTNAME=	nano-0.9.16
 CATEGORIES=	editors
 NEED_VERSION=	1.319
 HOMEPAGE=	http://www.asty.org/nano/
diff --git a/editors/nano/files/md5 b/editors/nano/files/md5
index 8a2dfe8633e..677d1deba0c 100644
--- a/editors/nano/files/md5
+++ b/editors/nano/files/md5
@@ -1,3 +1,3 @@
-MD5 (nano-0.9.15.tar.gz) = 551722e738e2ed72049de2ed6b9b2e80
-RMD160 (nano-0.9.15.tar.gz) = 0931c24fd7a982b32aeb2d39a8ab2968f9ce70fd
-SHA1 (nano-0.9.15.tar.gz) = 4b253a1cd73f3405ef585ff7768f9895e617f5cf
+MD5 (nano-0.9.16.tar.gz) = dc2187ba6d8363b1f2a3769401daeaa6
+RMD160 (nano-0.9.16.tar.gz) = d5bb0452bdfe0e841e516eeff75da98868014bc1
+SHA1 (nano-0.9.16.tar.gz) = ff5d41cc19648afbf415fdfef1654a547ad5183f
diff --git a/editors/nano/patches/patch-Makefile_in b/editors/nano/patches/patch-Makefile_in
index 51af3d253c6..e08d9628e59 100644
--- a/editors/nano/patches/patch-Makefile_in
+++ b/editors/nano/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2000/08/01 13:07:39 naddy Exp $
---- Makefile.in.orig	Sun Jul 30 02:37:19 2000
-+++ Makefile.in	Sun Jul 30 02:39:28 2000
-@@ -73,7 +73,7 @@
+$OpenBSD: patch-Makefile_in,v 1.3 2000/08/10 12:16:43 naddy Exp $
+--- Makefile.in.orig	Wed Aug  9 23:56:05 2000
++++ Makefile.in	Thu Aug 10 13:49:48 2000
+@@ -73,7 +73,7 @@ GT_YES = @GT_YES@
  INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
  INSTOBJEXT = @INSTOBJEXT@
  INTLDEPS = @INTLDEPS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2000/08/01 13:07:39 naddy Exp $
  INTLOBJS = @INTLOBJS@
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
-@@ -92,15 +92,16 @@
+@@ -92,15 +92,16 @@ nano_SOURCES = cut.c 		files.c 		global.
  
  
  man_MANS = nano.1
diff --git a/editors/nano/patches/patch-configure b/editors/nano/patches/patch-configure
deleted file mode 100644
index 843483701a0..00000000000
--- a/editors/nano/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2000/06/24 14:31:38 naddy Exp $
---- configure.orig	Tue Jun 20 22:12:13 2000
-+++ configure	Fri Jun 23 11:57:36 2000
-@@ -1453,7 +1453,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
- #define USE_SLANG 1
- EOF
-  slang_support=yes
--		CURSES_LIB="-L${with_slang}/lib -lslang"
-+		CURSES_LIB="-L${with_slang}/lib -lslang -ltermcap -lm"
- 		CURSES_LIB_NAME=slang
- else
-   echo "$ac_t""no" 1>&6
diff --git a/editors/nano/patches/patch-po_Makefile_in_in b/editors/nano/patches/patch-po_Makefile_in_in
index 25a477db549..11b73414ec4 100644
--- a/editors/nano/patches/patch-po_Makefile_in_in
+++ b/editors/nano/patches/patch-po_Makefile_in_in
@@ -1,18 +1,18 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2000/06/24 14:31:38 naddy Exp $
---- po/Makefile.in.in.orig	Tue Jun  6 07:53:55 2000
-+++ po/Makefile.in.in	Sat Jun 24 03:18:13 2000
-@@ -19,8 +19,9 @@ VPATH = @srcdir@
+--- po/Makefile.in.in.orig	Mon Aug  7 04:16:24 2000
++++ po/Makefile.in.in	Thu Aug 10 13:53:06 2000
+@@ -19,9 +19,10 @@
+ 
  prefix = @prefix@
  exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
+-datadir = $(prefix)/@DATADIRNAME@
++datadir = $(prefix)/share
+ localedir = $(datadir)/locale
  gnulocaledir = $(prefix)/share/locale
 +gettextintldir = $(prefix)/share/gettext/intl
  gettextsrcdir = $(prefix)/share/gettext/po
  subdir = po
  
-@@ -39,7 +40,7 @@ DEFS = @DEFS@
+@@ -40,7 +41,7 @@
  CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
  
@@ -21,7 +21,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2000/06/24 14:31:38 naddy Exp $
  
  COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
  
-@@ -73,7 +74,7 @@ INSTOBJEXT = @INSTOBJEXT@
+@@ -74,7 +75,7 @@
  	  && rm -f $$file && $(GMSGFMT) -o $$file $<
  
  .po.cat:
@@ -30,7 +30,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2000/06/24 14:31:38 naddy Exp $
  	  && rm -f $@ && $(GENCAT) $@ $*.msg
  
  
-@@ -93,7 +94,7 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
+@@ -94,7 +95,7 @@
  $(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
  $(srcdir)/stamp-cat-id: $(PACKAGE).pot
  	rm -f cat-id-tbl.tmp
@@ -39,76 +39,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2000/06/24 14:31:38 naddy Exp $
  		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
  	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
  	  rm cat-id-tbl.tmp; \
-@@ -111,9 +112,9 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -125,27 +126,30 @@ install-data-yes: all
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $$dir; \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
- 	  fi; \
- 	  if test -r $$cat; then \
--	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
--	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    echo "installing $$cat as" \
-+		 "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  else \
--	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    $(INSTALL_DATA) $(srcdir)/$$cat \
-+	      $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
- 	    echo "installing $(srcdir)/$$cat as" \
--		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+		 "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  fi; \
- 	  if test -r $$cat.m; then \
--	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
--	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+	    $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+	    echo "installing $$cat.m as" \
-+		 "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	  else \
- 	    if test -r $(srcdir)/$$cat.m ; then \
- 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
--		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+		$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- 	      echo "installing $(srcdir)/$$cat as" \
--		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+		   "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	    else \
- 	      true; \
- 	    fi; \
-@@ -153,12 +157,12 @@ install-data-yes: all
- 	done
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- 	  fi; \
- 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(gettextsrcdir)/Makefile.in.in; \
-+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- 	else \
- 	  : ; \
- 	fi
-@@ -180,7 +184,7 @@ uninstall:
+@@ -184,7 +185,7 @@
  
  check: all