From 2e973367ade9d2fefaa6c078d681b985489c7765 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Mon, 30 Dec 2002 00:00:17 +0000
Subject: Update manedit to version 0.5.6 as requested in PR 19512.

The author does not keep any change log, so I don't know
what has been changed since the last packaged version...
---
 editors/manedit/Makefile         | 10 +++++++---
 editors/manedit/PLIST            |  4 +++-
 editors/manedit/distinfo         | 12 +++++++-----
 editors/manedit/patches/patch-aa | 28 +++++++++++++++++-----------
 editors/manedit/patches/patch-ab | 25 ++++++++++++-------------
 editors/manedit/patches/patch-ac | 30 ++++++++++++++++++++++++++++++
 editors/manedit/patches/patch-ad | 12 ++++++++++++
 7 files changed, 88 insertions(+), 33 deletions(-)
 create mode 100644 editors/manedit/patches/patch-ac
 create mode 100644 editors/manedit/patches/patch-ad

(limited to 'editors')

diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index f7ca7114dcb..10476ca88f9 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2002/10/13 12:03:30 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/12/30 00:00:17 kristerw Exp $
 #
 
-DISTNAME=	${PKGNAME:S,manedit-,manedit,}
-PKGNAME=	manedit-0.4j
+DISTNAME=	manedit-0.5.6
 CATEGORIES=	editors
 MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,8 +16,13 @@ USE_BUILDLINK2=	YES
 
 MAKE_ENV+=	CPP="${CXX}"
 
+# The FreeBSD makefile may be used as "generic UNIX".
+MAKEFILE=	Makefile.FreeBSD
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/manedit ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/manview.sh ${PREFIX}/bin/manview
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/manwrap.sh ${PREFIX}/bin/manwrap
 	${INSTALL_DATA_DIR} ${PREFIX}/share/manedit			\
 		${PREFIX}/share/manedit/templates			\
 		${PREFIX}/share/manedit/icons
diff --git a/editors/manedit/PLIST b/editors/manedit/PLIST
index bd407d27598..f015da9ebf6 100644
--- a/editors/manedit/PLIST
+++ b/editors/manedit/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:01 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/30 00:00:17 kristerw Exp $
 bin/manedit
+bin/manview
+bin/manwrap
 man/man7/manpage_writing_procedures.7
 man/man7/manpage_xml_reference.7
 man/man1/manedit.1
diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo
index e361c642ab6..034b40f89db 100644
--- a/editors/manedit/distinfo
+++ b/editors/manedit/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/06/17 10:15:04 zuntum Exp $
+$NetBSD: distinfo,v 1.5 2002/12/30 00:00:17 kristerw Exp $
 
-SHA1 (manedit0.4j.tar.bz2) = 2ad39c64817a23d42f2f2604d4dd6dd616e2d98b
-Size (manedit0.4j.tar.bz2) = 280083 bytes
-SHA1 (patch-aa) = 5abe006cf889b9029ad004390bb91a878806a49e
-SHA1 (patch-ab) = 2a914d2cb0be0954d674058d35197336750eb251
+SHA1 (manedit-0.5.6.tar.bz2) = 1a6f413f614e5f3620fd9fae16d754eb722984e6
+Size (manedit-0.5.6.tar.bz2) = 425714 bytes
+SHA1 (patch-aa) = 9ace1dfdc027cbda50e2c06f08db6c16e2c27b63
+SHA1 (patch-ab) = 80a4e693601b353c271d1fbd9afb31bace75f75e
+SHA1 (patch-ac) = 05b59bc0315256dc9486f361699e1fa1688a3a04
+SHA1 (patch-ad) = c59ff342f72f33834b1a25e300a36d2579330686
diff --git a/editors/manedit/patches/patch-aa b/editors/manedit/patches/patch-aa
index 0bd98032721..83501618fda 100644
--- a/editors/manedit/patches/patch-aa
+++ b/editors/manedit/patches/patch-aa
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2001/06/17 10:15:05 zuntum Exp $
-
---- ../include/xsw_ctype.h.orig	Tue Mar 27 03:39:01 2001
-+++ ../include/xsw_ctype.h
-@@ -1,7 +1,7 @@
- // xsw_ctype.h
- // This is intended as a prototype for files using the global/ctype.cpp file.
+$NetBSD: patch-aa,v 1.4 2002/12/30 00:00:18 kristerw Exp $
+--- prochandle.cpp.orig	Sun Dec 29 23:24:30 2002
++++ prochandle.cpp	Sun Dec 29 23:31:23 2002
+@@ -230,6 +230,7 @@
+ /*
+  *      Returns true if the process is still running.
+  */
++#if 0
+ int ExecProcessExists(pid_t pid)
+ {
+         struct sched_param sp;
+@@ -247,6 +248,7 @@
+         else
+             return(0);
+ }
++#endif
  
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- # if defined(__cplusplus) || defined(c_plusplus)
  
- extern bool isblank(char c);
+ /*
diff --git a/editors/manedit/patches/patch-ab b/editors/manedit/patches/patch-ab
index b65a43431fb..bab15d80e2f 100644
--- a/editors/manedit/patches/patch-ab
+++ b/editors/manedit/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2001/06/11 20:58:33 zuntum Exp $
-
---- ../include/os.h.orig	Tue Mar 27 03:39:01 2001
-+++ ../include/os.h
-@@ -58,7 +58,7 @@
- # define _PATH_DEVNULL		"/dev/null"
- #endif
- 
--#if !defined(_AIX) && !defined(__FreeBSD__)
-+#if !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- # ifndef _PATH_MAILDIR
- #  define _PATH_MAILDIR		"/var/spool/mail"
- # endif
+$NetBSD: patch-ab,v 1.4 2002/12/30 00:00:18 kristerw Exp $
+--- config.h.orig	Mon Dec 30 00:43:48 2002
++++ config.h	Mon Dec 30 00:42:47 2002
+@@ -135,7 +135,7 @@
+  *	%f = filename
+  *	%p = optional parameters
+  */
+-#if !defined(__FreeBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #define MEDIT_CMD_MANPAGE_TO_OUTPUT	(PREFIX "/bin/man %p %f")
+ #else
+ #define MEDIT_CMD_MANPAGE_TO_OUTPUT	(PREFIX "/bin/manwrap %p %f")
diff --git a/editors/manedit/patches/patch-ac b/editors/manedit/patches/patch-ac
new file mode 100644
index 00000000000..9768dba46c5
--- /dev/null
+++ b/editors/manedit/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.3 2002/12/30 00:00:18 kristerw Exp $
+--- pref.c.orig	Mon Dec 30 00:45:32 2002
++++ pref.c	Mon Dec 30 00:46:21 2002
+@@ -1725,7 +1725,7 @@
+ 	     * first index of the text array (that's text[0]).
+ 	     */
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ 	    text[0] = "/usr/share/man";
+ #else
+ 	    text[0] = "/usr/man";
+@@ -1733,7 +1733,7 @@
+ 	    text[1] = "Global";
+ 	    gtk_clist_append(GTK_CLIST(w), text);
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+             text[0] = LOCALBASE "/man";
+ #else
+             text[0] = "/usr/local/man";
+@@ -1741,7 +1741,7 @@
+             text[1] = "Local";
+             gtk_clist_append(GTK_CLIST(w), text);
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+             text[0] = X11BASE"/man";
+ #else
+             text[0] = "/usr/X11R6/man";
diff --git a/editors/manedit/patches/patch-ad b/editors/manedit/patches/patch-ad
new file mode 100644
index 00000000000..4f64309d8b9
--- /dev/null
+++ b/editors/manedit/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2002/12/30 00:00:18 kristerw Exp $
+--- prefcb.c.orig	Mon Dec 30 00:47:35 2002
++++ prefcb.c	Mon Dec 30 00:47:46 2002
+@@ -704,7 +704,7 @@
+ 	 */
+ 	PDialogAddPromptWithBrowse(
+ 	    NULL, "Path:",
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined (__NetBSD__)
+ 	    "/usr/share/man",
+ #else
+ 	    "/usr/man",
-- 
cgit v1.2.3