- Add x11-toolkits/Xaw3d to LIB_DEPENDS

- Fix new compiler error
- Add missing MAN1 line

PR: 22811
Submitted by: Ports Fury

8 files changed, 99 insertions, 7 deletions

diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index bce24f48ee65..7d41f0250e71 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aXe
 PORTVERSION=	6.1.2
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors
@@ -14,6 +15,10 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
+LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+
 USE_IMAKE=	yes
+ALL_TARGET=	Xaw3d all
+MAN1=		axe.1 axinfo.1
 
 .include <bsd.port.mk>
diff --git a/editors/axe/files/patch-ab b/editors/axe/files/patch-ab
new file mode 100644
index 000000000000..fb340aff5857
--- /dev/null
+++ b/editors/axe/files/patch-ab
@@ -0,0 +1,39 @@
+--- Axe.tmpl.orig	Thu Apr  7 01:07:33 1994
++++ Axe.tmpl	Mon Nov 13 01:33:05 2000
+@@ -8,7 +8,7 @@
+ Mandir = ${MANDIR}
+ 
+ /* Where do you want the ancilliary files to be installed */
+-AxeLibdir = ${LIBDIR}
++AxeLibdir = ${LIBDIR}/axe
+ 
+ /* As of aXe 6.0 the help is presented using a separate application called   */
+ /* axinfo. Repeat the above exercise for it.                                 */
+@@ -47,10 +47,10 @@
+ 
+ /* Uncomment the next but one line if you want to build an Xaw3d version */
+ /* Please read the file INSTALL for essential information in this area */
+-/* #define ThreeD */
++#define ThreeD
+ 
+ /* ... and state the pathname of the directory containing the Xaw3d headers */
+-/* #define Xaw3dIncDir /usr/local/Xaw3d/include/X11/Xaw3d */
++#define Xaw3dIncDir $(INCROOT)/X11/Xaw3d
+ 
+ /* ... and where the Xaw3d library is to be found. This can be omitted */
+ /* if the library is in the standard place in the installed X tree */
+@@ -121,7 +121,7 @@
+ #else
+  XAW3D_LDFLAGS = -L/**/Xaw3dLibDir
+ #endif
+-    XAW3D_LIBS = -lXaw3d
++        XAWLIB = -lXaw3d
+          XAW3D = -DXAW3D
+ #endif
+     XAW3D_DEPS = AxeCommand.o AxeMenuBtn.o AxeSmeBSB.o
+@@ -131,4 +131,4 @@
+   SCANDIR_OBJS = scandir.o
+ #endif
+ 
+-DEFINES = ${EXTENSION} ${XAW3D} ${HAVEX11R5PL20} ${MAXPATHLEN}
++DEFINES = ${EXTENSION} ${XAW3D} ${HAVEX11R5PL20} ${MAXPATHLEN} -D__BSD_4_4__
diff --git a/editors/axe/files/patch-ac b/editors/axe/files/patch-ac
new file mode 100644
index 000000000000..716ee68a6a6d
--- /dev/null
+++ b/editors/axe/files/patch-ac
@@ -0,0 +1,10 @@
+--- Help/Hyper.c.orig	Thu Apr  7 01:07:36 1994
++++ Help/Hyper.c	Sat Nov 11 12:14:03 2000
+@@ -977,7 +977,6 @@
+ char   *fname;
+ {
+     Widget widget = (Widget) hyper;
+-    extern char *sys_errlist[];
+ 
+     FILE *f = fopen(fname,"r");
+     if(f)
diff --git a/editors/axe/files/patch-ad b/editors/axe/files/patch-ad
new file mode 100644
index 000000000000..19169b4e5d4b
--- /dev/null
+++ b/editors/axe/files/patch-ad
@@ -0,0 +1,10 @@
+--- Widgets/CtrlCodeSel.h.orig	Thu Apr  7 01:07:46 1994
++++ Widgets/CtrlCodeSel.h	Sat Nov 11 12:14:03 2000
+@@ -40,7 +40,6 @@
+ #define XtNbase          "base"
+ #define XtCBase          "Base"
+ #define XtNenterCallback "enterCallback"
+-#define XtNcancelCallback "cancelCallback"
+ 
+ #endif /* _ControlCodeSelector_h */
+ 
diff --git a/editors/axe/files/patch-ae b/editors/axe/files/patch-ae
new file mode 100644
index 000000000000..5e3164f3c3e0
--- /dev/null
+++ b/editors/axe/files/patch-ae
@@ -0,0 +1,10 @@
+--- Widgets/FileNom.h.orig	Thu Apr  7 01:07:46 1994
++++ Widgets/FileNom.h	Sat Nov 11 12:14:04 2000
+@@ -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"
diff --git a/editors/axe/files/patch-af b/editors/axe/files/patch-af
new file mode 100644
index 000000000000..0cff99353705
--- /dev/null
+++ b/editors/axe/files/patch-af
@@ -0,0 +1,10 @@
+--- Widgets/NumericPad.h.orig	Thu Apr  7 01:07:47 1994
++++ Widgets/NumericPad.h	Sat Nov 11 12:14:04 2000
+@@ -47,7 +47,6 @@
+ #define XtNbase          "base"
+ #define XtCBase          "Base"
+ #define XtNenterCallback "enterCallback"
+-#define XtNcancelCallback "cancelCallback"
+ 
+ extern void NumericPadClear();
+ 
diff --git a/editors/axe/files/patch-ag b/editors/axe/files/patch-ag
new file mode 100644
index 000000000000..13ea7e0d2ed6
--- /dev/null
+++ b/editors/axe/files/patch-ag
@@ -0,0 +1,9 @@
+--- Widgets/Preference.h.orig	Thu Apr  7 01:07:47 1994
++++ Widgets/Preference.h	Sat Nov 11 12:14:04 2000
+@@ -47,6 +47,5 @@
+ } PreferenceReturnStruct;
+ 
+ #define XtNenterCallback "enterCallback"
+-#define XtNcancelCallback "cancelCallback"
+ 
+ #endif /* _Preference_h */
diff --git a/editors/axe/pkg-plist b/editors/axe/pkg-plist
index 3cdc6bdb3683..c226e1b59062 100644
--- a/editors/axe/pkg-plist
+++ b/editors/axe/pkg-plist
@@ -1,13 +1,12 @@
 bin/axe
-bin/coaxe
 bin/axinfo
+bin/coaxe
 bin/faxe
 bin/poleaxe
-man/man1/axe.1.gz
-man/man1/axinfo.1.gz
 lib/X11/app-defaults/Axe
 lib/X11/app-defaults/Axinfo
-lib/X11/axe.tcl
-lib/X11/axe.info
-lib/X11/axe.info-1
-lib/X11/axe.info-2
+lib/X11/axe/axe.info
+lib/X11/axe/axe.info-1
+lib/X11/axe/axe.info-2
+lib/X11/axe/axe.tcl
+@dirrm lib/X11/axe