Update to 0.4.i.

12 files changed, 42 insertions, 221 deletions

diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 433e98a2896e..61de2f70aefa 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	manedit
-PORTVERSION=	0.4.h
+PORTVERSION=	0.4.i
 CATEGORIES=	editors
 MASTER_SITES=	ftp://fox.mit.edu/pub/xsw/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.h/h/}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.i/i/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
@@ -25,7 +25,4 @@ pre-patch:
 	@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
 		xargs ${PERL} -pi -e 's|malloc\.h|stdlib.h|g'
 
-post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/manwrap.sh ${PREFIX}/bin/manwrap
-
 .include <bsd.port.mk>
diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo
index cc310b23a2c0..9d570b1c0de3 100644
--- a/editors/manedit/distinfo
+++ b/editors/manedit/distinfo
@@ -1 +1 @@
-MD5 (manedit0.4h.tgz) = 7aa6bf57705f3a8b21fc5d45ff654a4f
+MD5 (manedit0.4i.tgz) = 906b5eedd763cc57851e5411dbbc6c44
diff --git a/editors/manedit/files/manwrap.sh b/editors/manedit/files/manwrap.sh
deleted file mode 100644
index 34ffc19e012a..000000000000
--- a/editors/manedit/files/manwrap.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# A simple script to make man(1) behaviour more gnu'ish.
-#
-# $FreeBSD$
-#
-
-if [ x"${1}" = x"" ]; then
-  exit
-fi
-
-if [ -f "${1}" ]; then
-  COMPRESSED=`/usr/bin/file "${1}" | /usr/bin/grep "gzip compressed data"`
-  CAT_CMD=/bin/cat
-  if [ x"${COMPRESSED}" != x"" ]; then
-    CAT_CMD=/usr/bin/gzcat
-  fi
-  ${CAT_CMD} "${1}" | /usr/bin/nroff -mandoc
-else
-  /usr/bin/man -P "/bin/cat" "${@}" 2>/dev/null
-  ERRCODE=${?}
-  if [ ${ERRCODE} != 0 ]; then
-    /bin/echo "No such manpage!" >&2
-    exit ${ERRCODE}
-  fi
-fi
diff --git a/editors/manedit/files/patch-..::include::os.h b/editors/manedit/files/patch-..::include::os.h
deleted file mode 100644
index cf35e45568c5..000000000000
--- a/editors/manedit/files/patch-..::include::os.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- ../include/os.h.orig	Fri Feb  9 02:18:26 2001
-+++ ../include/os.h	Fri Feb  9 12:23:54 2001
-@@ -21,7 +21,7 @@
- 
- #include <limits.h>
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(__FreeBSD__)
- # include <paths.h>
- #endif
- 
-@@ -58,7 +58,7 @@
- # define _PATH_DEVNULL		"/dev/null"
- #endif
- 
--#ifndef _AIX
-+#if !defined(_AIX) && !defined(__FreeBSD__)
- # ifndef _PATH_MAILDIR
- #  define _PATH_MAILDIR		"/var/spool/mail"
- # endif
diff --git a/editors/manedit/files/patch-..::include::xsw_ctype.h b/editors/manedit/files/patch-..::include::xsw_ctype.h
deleted file mode 100644
index 360e59d6f7d2..000000000000
--- a/editors/manedit/files/patch-..::include::xsw_ctype.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- ../include/xsw_ctype.h.orig	Fri Feb  9 02:18:26 2001
-+++ ../include/xsw_ctype.h	Fri Feb  9 12:40:01 2001
-@@ -1,6 +1,7 @@
- // xsw_ctype.h
- // This is intended as a prototype for files using the global/ctype.cpp file.
- 
-+#ifndef __FreeBSD__
- #if defined(__cplusplus) || defined(c_plusplus)
- 
- extern bool isblank(char c);
-@@ -11,5 +12,6 @@
- extern int isblank( int );
- 
- #endif	// __cplusplus || c_plusplus
-+#endif	// __FreeBSD__
- 
- extern void ctype_dummy_func();
diff --git a/editors/manedit/files/patch-Makefile b/editors/manedit/files/patch-Makefile
index 01f9538a6ea9..5d30fbe97b91 100644
--- a/editors/manedit/files/patch-Makefile
+++ b/editors/manedit/files/patch-Makefile
@@ -1,64 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.orig	Fri Feb  9 02:18:25 2001
-+++ Makefile	Fri Feb  9 15:41:52 2001
-@@ -18,7 +18,7 @@
- #   You may modify any value as needed. Change only the ones you are
- #   absolutly sure that requires modification.
+--- Makefile	2001/03/20 16:46:26	1.1
++++ Makefile	2001/03/20 16:46:37
+@@ -52,7 +52,7 @@
  #
--PREFIX = /usr
-+PREFIX ?= /usr
+ GTK_CONFIG ?= gtk-config
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
+-CFLAGS += $(GTK_CFLAGS) -O2 -Wall \
++CFLAGS += $(GTK_CFLAGS) -Wall \
+           -DPREFIX=\"$(PREFIX)\" \
+           -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
  
- 
- # ########################################################################
-@@ -49,7 +49,9 @@
- #				to debug the program.
- #
- #CFLAGS = `gtk-config --cflags` -g -efence -Wall
--CFLAGS = `gtk-config --cflags` -O2 -Wall
-+GTK_CFLAGS !=  $(GTK_CONFIG) --cflags
-+CFLAGS += $(GTK_CFLAGS) -Wall -DPREFIX=\"$(PREFIX)\" \
-+	  -DLOCALBASE=\"$(LOCALBASE)\" -DX11BASE=\"$(X11BASE)\"
- 
- CPPFLAGS = -D__cplusplus -Dc_plusplus
- 
-@@ -65,7 +67,7 @@
- #   to the LIB line depending on what you have set in the CFLAGS line
- #   farther above.
- #
--LIB = `gtk-config --libs`
-+LIB != $(GTK_CONFIG) --libs
- 
- # Library Directories:
- #
-@@ -95,9 +97,10 @@
- #
- include Makefile.srclist
- 
--CC  = gcc
--CPP = g++
-+CC  ?= gcc
-+CPP = $(CXX)
- BIN = manedit
-+SED ?= sed
- OBJ_C = $(SRC_C:.c=.o)
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .c.o:
-@@ -112,7 +115,7 @@
- $(BIN): $(OBJ_C) $(OBJ_CPP)
- 	$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB) $(LIB_DIR)
- 
--all: $(BIN)
-+all: $(BIN) $(BIN).1.out
- 
- 
- # ########################################################################
-@@ -129,5 +132,7 @@
- clean:
- 	rm -f a.out core *.o
- 
-+$(BIN).1.out: $(BIN).1
-+	$(SED) 's|%%PREFIX%%|$(PREFIX)|g' $(BIN).1 > $(BIN).1.out
- 
- # ########################################################################
diff --git a/editors/manedit/files/patch-Makefile.install.UNIX b/editors/manedit/files/patch-Makefile.install.UNIX
index 91646fa44464..f7d04c6a3c4b 100644
--- a/editors/manedit/files/patch-Makefile.install.UNIX
+++ b/editors/manedit/files/patch-Makefile.install.UNIX
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.install.UNIX.orig	Fri Feb  9 02:18:25 2001
-+++ Makefile.install.UNIX	Fri Feb  9 15:42:27 2001
-@@ -28,27 +28,27 @@
+--- Makefile.install.UNIX.orig	Sun Feb 25 01:10:47 2001
++++ Makefile.install.UNIX	Tue Mar 20 18:55:36 2001
+@@ -28,29 +28,27 @@
  
  
  BIN_DIR   = $(PREFIX)/bin
@@ -14,21 +14,25 @@ $FreeBSD$
  
  install:
  	$(MKDIR) $(MKDIRFLAGS) $(BIN_DIR)
--	$(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR)
-+	$(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR)
- 
- 	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
+-	$(INSTALL) $(INSTBINFLAGS) $(BIN) $(BIN_DIR)/$(BIN)
+-	$(INSTALL) $(INSTBINFLAGS) utils/manview.sh $(BIN_DIR)/manview
+-	$(INSTALL) $(INSTBINFLAGS) utils/manwrap.sh $(BIN_DIR)/manwrap
++	$(BSD_INSTALL_PROGRAM) $(BIN) $(BIN_DIR)/$(BIN)
++	$(BSD_INSTALL_SCRIPT) utils/manview.sh $(BIN_DIR)/manview
++	$(BSD_INSTALL_SCRIPT) utils/manwrap.sh $(BIN_DIR)/manwrap
+ 
+-	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
  	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/help
 -	$(COPY) $(COPYFLAGS) help/* $(DATA_DIR)/help
-+	$(BSD_INSTALL_DATA) help/* $(DATA_DIR)/help
++	$(BSD_INSTALL_MAN) help/* $(DATA_DIR)/help
  
- 	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
+-	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)
  	$(MKDIR) $(MKDIRFLAGS) $(DATA_DIR)/templates
 -	$(COPY) $(COPYFLAGS) templates/* $(DATA_DIR)/templates
 +	$(BSD_INSTALL_DATA) templates/* $(DATA_DIR)/templates
  
  	$(MKDIR) $(MKDIRFLAGS) $(MAN_DIR)
--	$(INSTALL) $(INSTMANFLAGS) $(BIN).1 $(MAN_DIR)
+-	$(INSTALL) $(INSTMANFLAGS) $(BIN).1.out $(MAN_DIR)/$(BIN).1
 +	$(BSD_INSTALL_MAN) $(BIN).1.out $(MAN_DIR)/$(BIN).1
  
  	$(MKDIR) $(MKDIRFLAGS) $(ICONS_DIR)
diff --git a/editors/manedit/files/patch-config.h b/editors/manedit/files/patch-config.h
deleted file mode 100644
index 97904244acf3..000000000000
--- a/editors/manedit/files/patch-config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- config.h.orig	Mon Feb 19 12:58:51 2001
-+++ config.h	Mon Feb 19 19:56:21 2001
-@@ -22,7 +22,7 @@
- /*
-  *	ManEdit global directory:
-  */
--#define MEDIT_GLOBAL_DIR	"/usr/share/manedit"
-+#define MEDIT_GLOBAL_DIR	PREFIX"/share/manedit"
- 
- /*
-  *	Manual page help sub directory (MEDIT_GLOBAL_DIR will
-@@ -101,7 +101,7 @@
-  *	%f = filename
-  *	%p = optional parameters
-  */
--#define MEDIT_CMD_MANPAGE_TO_OUTPUT	"/usr/bin/man %p %f"
-+#define MEDIT_CMD_MANPAGE_TO_OUTPUT	PREFIX"/bin/manwrap %p %f"
- 
- 
- 
diff --git a/editors/manedit/files/patch-manedit.1 b/editors/manedit/files/patch-manedit.1
index aa7402d5a110..893e8bef0db8 100644
--- a/editors/manedit/files/patch-manedit.1
+++ b/editors/manedit/files/patch-manedit.1
@@ -1,20 +1,19 @@
 
 $FreeBSD$
 
---- manedit.1	2001/02/09 13:39:27	1.1
-+++ manedit.1	2001/02/09 13:40:09
-@@ -55,11 +55,11 @@
- .LP 
- \fI$HOME/.maneditrc\fP
- .br 
--\fI/usr/share/manedit/\fP 
-+\fI%%PREFIX%%/share/manedit/\fP 
- .br 
--\fI/usr/share/manedit/help/\fP
-+\fI%%PREFIX%%/share/manedit/help/\fP
- .br 
--\fI/usr/share/manedit/templates/\fP
-+\fI%%PREFIX%%/share/manedit/templates/\fP
- .SH "ENVIRONMENT VARIABLES"
+--- manedit.1.orig	Sun Feb 25 01:10:48 2001
++++ manedit.1	Tue Mar 20 18:49:02 2001
+@@ -67,12 +67,8 @@
+ Manual page template files, used in the creation
+ of new manual pages.
  .TP 
- \fBHOME\fP
+-/usr/man
+-Global manual pages directory.
+-.TP 
+ /usr/share/man
+-Global manual pages directory (used by newer UNIX
+-distributions).
++Global manual pages directory.
+ .TP 
+ %%X11BASE%%/man
+ Global X11 manual pages directory.
diff --git a/editors/manedit/files/patch-pref.c b/editors/manedit/files/patch-pref.c
deleted file mode 100644
index 4a27b8d155b3..000000000000
--- a/editors/manedit/files/patch-pref.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- pref.c	2001/02/09 13:07:09	1.1
-+++ pref.c	2001/02/09 13:08:32
-@@ -1709,15 +1709,15 @@
- 	{
- 	    gchar *text[2];
- 
--	    text[0] = "/usr/man";
-+	    text[0] = "/usr/share/man";
- 	    text[1] = "Global";
- 	    gtk_clist_append(GTK_CLIST(w), text);
- 
--            text[0] = "/usr/local/man";
-+            text[0] = LOCALBASE"/man";
-             text[1] = "Local";
-             gtk_clist_append(GTK_CLIST(w), text);
- 
--            text[0] = "/usr/X11R6/man";
-+            text[0] = X11BASE"/man";
-             text[1] = "X Window Systems";
-             gtk_clist_append(GTK_CLIST(w), text);
- 	}
diff --git a/editors/manedit/files/patch-prefcb.c b/editors/manedit/files/patch-prefcb.c
deleted file mode 100644
index e13d7c0c15e9..000000000000
--- a/editors/manedit/files/patch-prefcb.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- prefcb.c	2001/02/09 13:12:30	1.1
-+++ prefcb.c	2001/02/09 13:12:46
-@@ -698,7 +698,7 @@
- 
- 	PDialogDeleteAllPrompts();
- 	PDialogAddPromptWithBrowse(
--	    NULL, "Path:", "/usr/man",
-+	    NULL, "Path:", "/usr/share/man",
- 	    (void *)pref,
- 	    PrefManPageDirPromptBrowseCB
- 	);
diff --git a/editors/manedit/pkg-plist b/editors/manedit/pkg-plist
index c1c35e6c4815..3fb3623cfd10 100644
--- a/editors/manedit/pkg-plist
+++ b/editors/manedit/pkg-plist
@@ -1,4 +1,5 @@
 bin/manedit
+bin/manview
 bin/manwrap
 share/manedit/help/manpage_writing_procedures
 share/manedit/help/manpage_xml_referance