- re-enable

- regen patches
- make it build and work with XF4; patches from Hwei Sheng Teoh
  <hsteoh@debian.org> via Debian
- prettify

editors/axe/Makefile

@@ -1,24 +1,21 @@
-# $OpenBSD: Makefile,v 1.13 2001/08/18 22:13:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2001/08/22 00:04:41 naddy Exp $
-
-BROKEN=			"does not build with XFree86-4"
 
 COMMENT=		"simple to use text editor for X11"
 
+PKGNAME=		${DISTNAME:L}
 DISTNAME=		aXe-6.1.2
-PKGNAME=		axe-6.1.2
 CATEGORIES=		editors
 NEED_VERSION=		1.402
-MASTER_SITES=           ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=     editors
-EXTRACT_SUFX=		.tar.Z
-
-MAINTAINER=		ports@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	editors
+EXTRACT_SUFX=		.tar.Z
+
 CONFIGURE_STYLE=	imake
 
 .include <bsd.port.mk>

editors/axe/patches/patch-Axe_rules

@@ -1,6 +1,7 @@
---- Axe.rules.orig	Sun Mar 19 18:14:36 2000
+$OpenBSD: patch-Axe_rules,v 1.1 2001/08/22 00:04:41 naddy Exp $
-+++ Axe.rules	Sun Mar 19 18:15:25 2000
+--- Axe.rules.orig	Wed Apr  6 18:07:33 1994
-@@ -72,7 +72,7 @@
++++ Axe.rules	Tue Aug 21 02:43:48 2001
+@@ -72,7 +72,7 @@ extension::								@@\
  #define InstallCoaxe(bindest)						@@\
  InstallProgram(coaxe,bindest)						@@\
  install::								@@\

editors/axe/patches/patch-Axe_tmpl

@@ -0,0 +1,9 @@
+$OpenBSD: patch-Axe_tmpl,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Axe.tmpl.orig	Wed Apr  6 18:07:33 1994
++++ Axe.tmpl	Tue Aug 21 02:43:48 2001
+@@ -131,4 +131,4 @@ XAW3D_INCLUDES = -I./X11/Xaw3d
+   SCANDIR_OBJS = scandir.o
+ #endif
+ 
+-DEFINES = ${EXTENSION} ${XAW3D} ${HAVEX11R5PL20} ${MAXPATHLEN}
++DEFINES = ${EXTENSION} ${XAW3D} ${HAVEX11R5PL20} ${MAXPATHLEN} -D__BSD_4_4__

editors/axe/patches/patch-Help_Hyper_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-Help_Hyper_c,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Help/Hyper.c.orig	Wed Apr  6 18:07:36 1994
++++ Help/Hyper.c	Tue Aug 21 02:43:48 2001
+@@ -977,7 +977,6 @@ HyperWidget hyper;
+ char   *fname;
+ {
+     Widget widget = (Widget) hyper;
+-    extern char *sys_errlist[];
+ 
+     FILE *f = fopen(fname,"r");
+     if(f)

editors/axe/patches/patch-Widgets_AxeTextDeck_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-Widgets_AxeTextDeck_c,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/AxeTextDeck.c.orig	Wed Aug 22 01:00:20 2001
++++ Widgets/AxeTextDeck.c	Wed Aug 22 01:01:32 2001
+@@ -177,7 +177,7 @@ Initialize(req, new, args, num_args)
+ 	}
+ 	else
+ 	{
+-	    expandedName = theFile;
++	    expandedName = XtNewString("");
+ 	}
+ 	
+ 	XtVaCreateManagedWidget("ed", axeTextWidgetClass, new,

editors/axe/patches/patch-Widgets_AxeiiText_c

@@ -0,0 +1,36 @@
+$OpenBSD: patch-Widgets_AxeiiText_c,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/AxeiiText.c.orig	Wed Aug 22 01:02:27 2001
++++ Widgets/AxeiiText.c	Wed Aug 22 01:04:31 2001
+@@ -35,7 +35,6 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <sys/file.h>
+-#include "AxeiiSink.h"
+ #include "AxeiiTextP.h"
+ #include "AxeiiUndo.h"
+ #include "regexp.h"
+@@ -319,19 +318,18 @@ Initialize(req, new, args, num_args)
+     {
+ 	XtVaSetValues(new,
+ 		      XtNtextSink,
+-		         XtVaCreateWidget("axeiisink",
+-				      axeiiSinkObjectClass,
++		         XtVaCreateWidget("asciisink",
++				      asciiSinkObjectClass,
+ 				      new,
+-				      XtNcursorBitmap, atw->axeii.caret_bitmap,
++				      XtNcursorName, atw->axeii.caret_bitmap,
+ 				      NULL),
+ 		      NULL);
+     }
+     else if (atw->axeii.block_caret)
+     {
+ 	XtVaSetValues(new,
+-		      XtNtextSink, XtVaCreateWidget("axeiisink",
+-						    axeiiSinkObjectClass, new,
+-						    XtNblockCursor, True,
++		      XtNtextSink, XtVaCreateWidget("asciisink",
++						    asciiSinkObjectClass, new,
+ 						    NULL),
+ 		      NULL);
+     }

editors/axe/patches/patch-Widgets_CtrlCodeSel_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-Widgets_CtrlCodeSel_h,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/CtrlCodeSel.h.orig	Wed Apr  6 18:07:46 1994
++++ Widgets/CtrlCodeSel.h	Tue Aug 21 02:43:48 2001
+@@ -40,7 +40,6 @@ typedef struct _ControlCodeSelectorRec  
+ #define XtNbase          "base"
+ #define XtCBase          "Base"
+ #define XtNenterCallback "enterCallback"
+-#define XtNcancelCallback "cancelCallback"
+ 
+ #endif /* _ControlCodeSelector_h */
+ 

editors/axe/patches/patch-Widgets_FileNom_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-Widgets_FileNom_h,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/FileNom.h.orig	Wed Apr  6 18:07:46 1994
++++ Widgets/FileNom.h	Tue Aug 21 02:43:48 2001
+@@ -33,7 +33,6 @@
+ #define XtNinitialDirectory "initialDirectory"
+ #define XtNselectCallback "selectCallback"
+ #define XtNpathList "pathList"
+-#define XtNcancelCallback "cancelCallback"
+ #define XtNmargin "margin"
+ #define XtNnumberRows "numberRows"
+ #define XtNshowDotFiles "showDotFiles"

editors/axe/patches/patch-Widgets_Imakefile

@@ -0,0 +1,21 @@
+$OpenBSD: patch-Widgets_Imakefile,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/Imakefile.orig	Wed Aug 22 01:05:50 2001
++++ Widgets/Imakefile	Wed Aug 22 01:06:12 2001
+@@ -4,7 +4,7 @@
+ SRCS = ${TABLE_SRCS} ${EXTN_SRCS} \
+        AxeWindow.c AxeEditor.c AxeMenuBtn.c AxeSimMenu.c \
+        AxeSmeBSB.c AxeCommand.c AxeTextDeck.c AxeText.c \
+-       AxeiiText.c AxeiiUndo.c AxeiiSink.c \
++       AxeiiText.c AxeiiUndo.c \
+        FileNomWin.c FileNom.c ${R5ONLY_SRCS} ${R4ONLY_SRCS} ScrollText.c \
+        NumericPad.c CtrlCodeSel.c Preference.c Confirmer.c \
+        ${SCANDIR_SRCS} regexp.c insertfile.c match.c util.c
+@@ -12,7 +12,7 @@ SRCS = ${TABLE_SRCS} ${EXTN_SRCS} \
+ OBJS = ${TABLE_OBJS} ${EXTN_OBJS} \
+        AxeWindow.o AxeEditor.o AxeMenuBtn.o AxeSimMenu.o \
+        AxeSmeBSB.o AxeTextDeck.o AxeCommand.o AxeText.o \
+-       AxeiiText.o AxeiiUndo.o AxeiiSink.o \
++       AxeiiText.o AxeiiUndo.o \
+        FileNomWin.o FileNom.o ${R5ONLY_OBJS} ${R4ONLY_OBJS} ScrollText.o \
+        NumericPad.o CtrlCodeSel.o Preference.o Confirmer.o \
+        ${SCANDIR_OBJS} regexp.o insertfile.o match.o util.o

editors/axe/patches/patch-Widgets_NumericPad_h

@@ -0,0 +1,11 @@
+$OpenBSD: patch-Widgets_NumericPad_h,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/NumericPad.h.orig	Wed Apr  6 18:07:47 1994
++++ Widgets/NumericPad.h	Tue Aug 21 02:43:48 2001
+@@ -47,7 +47,6 @@ typedef struct
+ #define XtNbase          "base"
+ #define XtCBase          "Base"
+ #define XtNenterCallback "enterCallback"
+-#define XtNcancelCallback "cancelCallback"
+ 
+ extern void NumericPadClear();
+ 

editors/axe/patches/patch-Widgets_Preference_h

@@ -0,0 +1,10 @@
+$OpenBSD: patch-Widgets_Preference_h,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/Preference.h.orig	Wed Apr  6 18:07:47 1994
++++ Widgets/Preference.h	Tue Aug 21 02:43:48 2001
+@@ -47,6 +47,5 @@ typedef struct {
+ } PreferenceReturnStruct;
+ 
+ #define XtNenterCallback "enterCallback"
+-#define XtNcancelCallback "cancelCallback"
+ 
+ #endif /* _Preference_h */

editors/axe/patches/patch-Widgets_ScrollText_c

@@ -0,0 +1,47 @@
+$OpenBSD: patch-Widgets_ScrollText_c,v 1.1 2001/08/22 00:04:41 naddy Exp $
+--- Widgets/ScrollText.c.orig	Wed Aug 22 01:06:39 2001
++++ Widgets/ScrollText.c	Wed Aug 22 01:13:09 2001
+@@ -222,6 +222,7 @@ AdjustForMovement(widget, client_data, a
+ 	strcmp(action, "beginning-of-line")  == 0 ||
+ 	strcmp(action, "end-of-line")        == 0)
+     {
++#if 0
+        /*
+         * Positioning with the mouse results in work_proc being corrupted with
+         * the result that the test fails and scrolling stops happening. I don't
+@@ -236,9 +237,11 @@ AdjustForMovement(widget, client_data, a
+ 		XtAppAddWorkProc(XtWidgetToApplicationContext(widget),
+ 				              AfterAction, (XtPointer) widget);
+      /* } */
++#endif
+     }
+ }
+ 
++#if 0
+ static Boolean
+ AfterAction(client_data)
+      XtPointer client_data;
+@@ -252,6 +255,7 @@ AfterAction(client_data)
+ 
+     return True;
+ }
++#endif
+ 
+ /* ARGSUSED */
+ static void
+@@ -259,6 +263,7 @@ AdjustForChange(widget, client_data, cal
+      Widget widget;
+      XtPointer client_data, call_data;
+ {
++#if 0
+     Widget source, sink, text = XtParent(widget), porthole = XtParent(text);
+     Position x, prevx, top;
+     Dimension lm, width, phwidth, fwidth = PRIVATE(porthole,font_width);
+@@ -299,6 +304,7 @@ AdjustForChange(widget, client_data, cal
+     width = ed + fwidth;
+     
+     XtVaSetValues(text, XtNx, x, XtNwidth, width, NULL);
++#endif
+ }
+ 
+ #undef PRIVATE

editors/axe/patches/patch-aa

@@ -1,78 +0,0 @@
-diff -rc ./Axe.tmpl ../aXe-6.1.2/Axe.tmpl
-*** ./Axe.tmpl	Wed Apr  6 12:07:33 1994
---- ../aXe-6.1.2/Axe.tmpl	Tue Dec 27 13:10:14 1994
-***************
-*** 131,134 ****
-    SCANDIR_OBJS = scandir.o
-  #endif
-  
-! DEFINES = ${EXTENSION} ${XAW3D} ${HAVEX11R5PL20} ${MAXPATHLEN}
---- 131,134 ----
-    SCANDIR_OBJS = scandir.o
-  #endif
-  
-! DEFINES = ${EXTENSION} ${XAW3D} ${HAVEX11R5PL20} ${MAXPATHLEN} -D__BSD_4_4__
-diff -rc ./Help/Hyper.c ../aXe-6.1.2/Help/Hyper.c
-*** ./Help/Hyper.c	Wed Apr  6 12:07:36 1994
---- ../aXe-6.1.2/Help/Hyper.c	Tue Dec 27 13:23:20 1994
-***************
-*** 977,983 ****
-  char   *fname;
-  {
-      Widget widget = (Widget) hyper;
--     extern char *sys_errlist[];
-  
-      FILE *f = fopen(fname,"r");
-      if(f)
---- 977,982 ----
-diff -rc ./Widgets/CtrlCodeSel.h ../aXe-6.1.2/Widgets/CtrlCodeSel.h
-*** ./Widgets/CtrlCodeSel.h	Wed Apr  6 12:07:46 1994
---- ../aXe-6.1.2/Widgets/CtrlCodeSel.h	Tue Dec 27 13:14:17 1994
-***************
-*** 40,46 ****
-  #define XtNbase          "base"
-  #define XtCBase          "Base"
-  #define XtNenterCallback "enterCallback"
-- #define XtNcancelCallback "cancelCallback"
-  
-  #endif /* _ControlCodeSelector_h */
-  
---- 40,45 ----
-diff -rc ./Widgets/FileNom.h ../aXe-6.1.2/Widgets/FileNom.h
-*** ./Widgets/FileNom.h	Wed Apr  6 12:07:46 1994
---- ../aXe-6.1.2/Widgets/FileNom.h	Tue Dec 27 13:12:31 1994
-***************
-*** 33,39 ****
-  #define XtNinitialDirectory "initialDirectory"
-  #define XtNselectCallback "selectCallback"
-  #define XtNpathList "pathList"
-- #define XtNcancelCallback "cancelCallback"
-  #define XtNmargin "margin"
-  #define XtNnumberRows "numberRows"
-  #define XtNshowDotFiles "showDotFiles"
---- 33,38 ----
-diff -rc ./Widgets/NumericPad.h ../aXe-6.1.2/Widgets/NumericPad.h
-*** ./Widgets/NumericPad.h	Wed Apr  6 12:07:47 1994
---- ../aXe-6.1.2/Widgets/NumericPad.h	Tue Dec 27 13:13:55 1994
-***************
-*** 47,53 ****
-  #define XtNbase          "base"
-  #define XtCBase          "Base"
-  #define XtNenterCallback "enterCallback"
-- #define XtNcancelCallback "cancelCallback"
-  
-  extern void NumericPadClear();
-  
---- 47,52 ----
-diff -rc ./Widgets/Preference.h ../aXe-6.1.2/Widgets/Preference.h
-*** ./Widgets/Preference.h	Wed Apr  6 12:07:47 1994
---- ../aXe-6.1.2/Widgets/Preference.h	Tue Dec 27 13:14:34 1994
-***************
-*** 47,52 ****
-  } PreferenceReturnStruct;
-  
-  #define XtNenterCallback "enterCallback"
-- #define XtNcancelCallback "cancelCallback"
-  
-  #endif /* _Preference_h */
---- 47,51 ----

editors/axe/pkg/DESCR

@@ -1,42 +1,11 @@
-aXe-6.1.2
+aXe is a simple to use text editor for X11 that represents a significant
-
+improvement over xedit.  Also built around the Athena Text Widget it
-Here is an extract from the source distribution aXe-6.1.2 README file:
-
-This, version 6.1.2, is an interim release that has been brought out
-purely to enable aXe 6.1 to work under X11R6. It does not support
-internationalisation.
-
-                           ...oooOOOooo...
-
-aXe is a simple to use text editor for X that represents a significant
-improvement over xedit. Also built around the Athena Text Widget it
 features, amongst other things,
-
+  o multiple windows, buffers
-   o multiple windows
+  o configurable menus, optional configurable button interface
-   o multiple buffers
+  o provision for defining keyboard macros
-   o default menu interface
+  o file selection via a browser
-   o configurable menus
+  o parenthesis matching, regular expression searching
-   o optional configurable button interface
+  o restricted or unlimited undo
-   o minibuffer for expert use and access to external filters
+  o ability to change font
-   o provision for defining a keyboard macro
+  o both brief and comprehensive (hypertext) on-line help
-   o geometry specification and resizing in terms of characters
-   o file selection via a browser
-   o knowledge of line numbers
-   o parenthesis matching
-   o regular expression searching
-   o restricted or unlimited undo
-   o ability to change font
-   o easy entry of control codes
-   o xterm-like keymap feature
-   o easy runtime setting of selected preferences (resources)
-   o both brief and comprehensive (hypertext) on-line help
-   o server mode with cooperating client programs
-   o optional extension language using Tcl
-   o optional Xaw3d widget set compatability
-   o collection of reusable widgets that embody the functionality of aXe
-
-Jim
----
-J.K.Wight@newcastle.ac.uk
-Department of Computing Science, University of Newcastle,  Tel: +44 91 222 8238
-Newcastle upon Tyne, NE1 7RU, United Kingdom.              Fax: +44 91 222 8232

editors/axe/pkg/PLIST

@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.6 2001/08/22 00:04:41 naddy Exp $
 bin/axe
 bin/axinfo
 bin/coaxe