From owner-freebsd-ports Mon Nov 13 4:10:24 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DCBF237B4E5 for ; Mon, 13 Nov 2000 04:10:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id EAA89419; Mon, 13 Nov 2000 04:10:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 799DB37B479; Mon, 13 Nov 2000 04:09:47 -0800 (PST) Message-Id: <20001113120947.799DB37B479@hub.freebsd.org> Date: Mon, 13 Nov 2000 04:09:47 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/22811: Update port: editors/axe Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22811 >Category: ports >Synopsis: Update port: editors/axe >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 13 04:10:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Add x11-toolkits/Xaw3d to LIB_DEPENDS (to avoid compile error under XFree86 4.x) - Fix new compiler error - Add missing MAN1 line New file: files/patch-ab files/patch-ac files/patch-ad files/patch-ae files/patch-af files/patch-ag Remove file: files/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/editors/axe/Makefile editors/axe/Makefile --- /usr/ports/editors/axe/Makefile Fri Apr 14 18:47:51 2000 +++ editors/axe/Makefile Mon Nov 13 02:00:08 2000 @@ -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 @@ 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 diff -urN /usr/ports/editors/axe/files/patch-aa editors/axe/files/patch-aa --- /usr/ports/editors/axe/files/patch-aa Wed Jan 4 16:39:52 1995 +++ editors/axe/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -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 ---- diff -urN /usr/ports/editors/axe/files/patch-ab editors/axe/files/patch-ab --- /usr/ports/editors/axe/files/patch-ab Thu Jan 1 09:00:00 1970 +++ editors/axe/files/patch-ab Mon Nov 13 01:33:13 2000 @@ -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 -urN /usr/ports/editors/axe/files/patch-ac editors/axe/files/patch-ac --- /usr/ports/editors/axe/files/patch-ac Thu Jan 1 09:00:00 1970 +++ editors/axe/files/patch-ac Sat Nov 11 12:14:48 2000 @@ -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 -urN /usr/ports/editors/axe/files/patch-ad editors/axe/files/patch-ad --- /usr/ports/editors/axe/files/patch-ad Thu Jan 1 09:00:00 1970 +++ editors/axe/files/patch-ad Sat Nov 11 12:15:06 2000 @@ -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 -urN /usr/ports/editors/axe/files/patch-ae editors/axe/files/patch-ae --- /usr/ports/editors/axe/files/patch-ae Thu Jan 1 09:00:00 1970 +++ editors/axe/files/patch-ae Sat Nov 11 12:15:19 2000 @@ -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 -urN /usr/ports/editors/axe/files/patch-af editors/axe/files/patch-af --- /usr/ports/editors/axe/files/patch-af Thu Jan 1 09:00:00 1970 +++ editors/axe/files/patch-af Sat Nov 11 12:15:32 2000 @@ -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 -urN /usr/ports/editors/axe/files/patch-ag editors/axe/files/patch-ag --- /usr/ports/editors/axe/files/patch-ag Thu Jan 1 09:00:00 1970 +++ editors/axe/files/patch-ag Sat Nov 11 12:15:45 2000 @@ -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 -urN /usr/ports/editors/axe/pkg-plist editors/axe/pkg-plist --- /usr/ports/editors/axe/pkg-plist Mon Nov 18 22:57:53 1996 +++ editors/axe/pkg-plist Mon Nov 13 01:32:31 2000 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message