Adapt this package to NetBSD.

5 files changed, 60 insertions, 23 deletions

diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 2ae039b6295..b473cf82843 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -1,20 +1,15 @@
-# New ports collection makefile for:    xcoral
-# Version required:	3.2
-# Date created:         
-# Whom:                 erich@rrnet.com
-#
-# Id: Makefile,v 1.6 1999/01/26 02:16:00 steve Exp
+# $NetBSD: Makefile,v 1.2 1999/02/02 23:14:04 tron Exp $
+# FreeBSD Id: Makefile,v 1.6 1999/01/26 02:16:00 steve Exp
 #
 
-DISTNAME=	xcoral-3.2
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+DISTNAME=		xcoral-3.2
+CATEGORIES=		editors
+MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	editors
 
-MAINTAINER=	erich@FreeBSD.ORG
-
-USE_X_PREFIX=	yes
+MAINTAINER=	packages@netbsd.org
 
+USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 
 LIBFILES=	DEPEND README cmd.sc color.sc comments.sc compare-win.sc \
@@ -26,17 +21,12 @@ LIBFILES=	DEPEND README cmd.sc color.sc comments.sc compare-win.sc \
 		utilities.sc version.sc window-utilities.sc xcoralrc.lf
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/xcoral/
-
-.for i in ${LIBFILES}
-	${INSTALL_DATA} ${WRKSRC}/SmacLib/${i} ${PREFIX}/lib/xcoral/
+	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/lib/xcoral
+.for FILE in ${LIBFILES}
+	${INSTALL_DATA} ${WRKSRC}/SmacLib/${FILE} ${PREFIX}/lib/xcoral
 .endfor
-
-	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${PREFIX}/bin/
-
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/xcoral/HTML/icons
-	${CP} -r ${WRKSRC}/Doc/ ${PREFIX}/share/doc/xcoral/
-.endif
+	${CP} -r ${WRKSRC}/Doc/* ${PREFIX}/share/doc/xcoral
 
-.include <bsd.port.mk>
+.include <../../mk/bsd.pkg.mk>
diff --git a/editors/xcoral/files/md5 b/editors/xcoral/files/md5
index aea021b7c12..89df7fd9d3f 100644
--- a/editors/xcoral/files/md5
+++ b/editors/xcoral/files/md5
@@ -1 +1,3 @@
+$NetBSD: md5,v 1.2 1999/02/02 23:14:04 tron Exp $
+
 MD5 (xcoral-3.2.tar.gz) = 668fe3d0ef52f3677cd6cc8b52feaa2e
diff --git a/editors/xcoral/patches/patch-aa b/editors/xcoral/patches/patch-aa
index e69de29bb2d..25bd2909355 100644
--- a/editors/xcoral/patches/patch-aa
+++ b/editors/xcoral/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.2 1999/02/02 23:14:04 tron Exp $
+
+--- bm_search.c.orig	Sun Sep 20 18:49:08 1998
++++ bm_search.c	Wed Feb  3 00:00:27 1999
+@@ -57,7 +57,6 @@
+ #include <X11/Xutil.h>
+ #include <sys/types.h>
+ #define const
+-#include "regex.h"
+ 
+ #include "main_text.h"
+ #include "bm_search.h"
+@@ -69,6 +68,8 @@
+ #include "dial_box.h"
+ #include "ie_func.h"
+ #include "selection.h"
++/* Put this at the end since it overrides system includes */
++#include "regex.h"
+ 
+ static char *str_save = 0;
+ static char *str_old = 0;
diff --git a/editors/xcoral/patches/patch-ab b/editors/xcoral/patches/patch-ab
index e69de29bb2d..b18fd0f862e 100644
--- a/editors/xcoral/patches/patch-ab
+++ b/editors/xcoral/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.2 1999/02/02 23:14:04 tron Exp $
+
+--- fs_box.c.orig	Mon Oct 12 20:25:23 1998
++++ fs_box.c	Wed Feb  3 00:00:27 1999
+@@ -437,8 +437,16 @@
+       }
+     }
+   }
+-  qsort ( (char *) tmp_dir, ndir, sizeof ( char *), NewCompare ); 
+-  qsort ( (char *) tmp_file, nfile, sizeof ( char *), NewCompare ); 
++  qsort ( (char *) tmp_dir, ndir, sizeof ( char *),
++#if defined(__NetBSD__)
++			(int (*)(const void *, const void *))
++#endif
++			NewCompare ); 
++  qsort ( (char *) tmp_file, nfile, sizeof ( char *),
++#if defined(__NetBSD__)
++			(int (*)(const void *, const void *))
++#endif
++			NewCompare ); 
+   
+   for ( n = 0; n < ndir; n++ ) {
+     InsertNchar ( fs_box.buf_dir, (char *) tmp_dir [n], 
diff --git a/editors/xcoral/pkg/PLIST b/editors/xcoral/pkg/PLIST
index be385e5cd32..330d4499ebe 100644
--- a/editors/xcoral/pkg/PLIST
+++ b/editors/xcoral/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1999/02/02 23:14:04 tron Exp $
 bin/xcoral
 lib/xcoral/DEPEND
 lib/xcoral/README