9 files changed, 18 insertions, 132 deletions

diff --git a/editors/gate/Makefile b/editors/gate/Makefile
index bcd7515334e5..d8fcb384fde1 100644
--- a/editors/gate/Makefile
+++ b/editors/gate/Makefile
@@ -6,26 +6,33 @@
 #
 
 PORTNAME=	gate
-PORTVERSION=	2.04c
+PORTVERSION=	2.05
 CATEGORIES=	editors
-MASTER_SITES=   http://www.wwnet.net/~janc/software/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	http://www.unixpapa.com/software/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple and unobtrusive line-oriented text editor
 
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
 
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-aspell=${LOCALBASE}/bin/aspell
 ALL_TARGET=	gate gate.1
 
 MAN1=		gate.1
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${res_datadir}|${DATADIR}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|^char \*malloc();||g' ${WRKSRC}/term.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gate ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/gate.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/gate
-	${INSTALL_DATA} ${WRKSRC}/gate.help ${PREFIX}/share/gate
+	${INSTALL_MAN} ${WRKSRC}/gate.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/gate.help ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/editors/gate/distinfo b/editors/gate/distinfo
index 96bd0f3e5751..c7f729809bcf 100644
--- a/editors/gate/distinfo
+++ b/editors/gate/distinfo
@@ -1 +1 @@
-MD5 (gate.tar.gz) = d7c10db9858cf6ad0a48cbb6dd2949de
+MD5 (gate-2.05.tar.gz) = b071870246c6ecb03c6f74b328ef8ef8
diff --git a/editors/gate/files/patch-aa b/editors/gate/files/patch-aa
deleted file mode 100644
index 3ff505b0b2b8..000000000000
--- a/editors/gate/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Wed Jul 24 02:23:43 1996
-+++ Makefile	Fri Jul 21 17:57:55 2000
-@@ -150,17 +150,17 @@
- #LIB=	-ltermcap
- 
- # my Linux box with international ispell - Debugging only
--CFLAGS= -g \
-+CFLAGS+= -g \
- 	-DBSD \
- 	-DYAPP \
- 	-DNOVICE \
- 	-DIISPELL \
- 	-DPICO_BUG \
--	-DSPELL_PATH='"/usr/local/bin/ispell"' \
--	-DDICT_DIR='"/usr/local/lib"'  \
-+	-DSPELL_PATH='"$(LOCALBASE)/bin/ispell"' \
-+	-DDICT_DIR='"$(LOCALBASE)/share/ispell"'  \
- 	-DLANG_DEFAULT='"english"'\
- 	-DDEFAULT_EDITOR='"/usr/bin/vi"' \
--	-DHELP_FILE='"/home/janc/src/gate/gate.help"'
-+	-DHELP_FILE='"$(PREFIX)/share/gate/gate.help"'
- LIB=	-ltermcap
- 
- OBJS=main.o line.o syst.o util.o cmd.o file.o opt.o subs.o term.o proc.o spel.o
diff --git a/editors/gate/files/patch-ab b/editors/gate/files/patch-ab
deleted file mode 100644
index 24c8ab8e62b6..000000000000
--- a/editors/gate/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- file.c.orig	Mon Jul 17 23:05:48 2000
-+++ file.c	Mon Jul 17 23:12:29 2000
-@@ -59,12 +59,12 @@
-  * open file descriptor.
-  */
- 
--FILE *copy_file(char *wname)
-+FILE *copy_file(char *wname, int fd)
- {
- FILE *wfp;
- int ch;
- 	
--    if ((wfp= fopen(wname,"w+")) == NULL)
-+    if ((wfp= fdopen(fd,"w+")) == NULL)
-     {
- 	printf("Cannot open file %s\n",wname);
- 	return(NULL);
-@@ -84,10 +84,12 @@
- void write_file(char *wname)
- {
- FILE *fp;
-+int fd;
-   
-     if (expand_tilde(wname)) return;
- 
--    if ((fp= copy_file(wname)) == NULL) return;
-+    fd = open(wname, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-+    if ((fp= copy_file(wname, fd)) == NULL) return;
-     fclose(fp);
-     printf("Saved in file %s\n",wname);
- }
diff --git a/editors/gate/files/patch-ac b/editors/gate/files/patch-ac
deleted file mode 100644
index 242ace8e9b7b..000000000000
--- a/editors/gate/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- gate.h.orig	Mon Jul 17 23:20:52 2000
-+++ gate.h	Mon Jul 17 23:21:15 2000
-@@ -213,7 +213,7 @@
- 
- /* FILE.C */
- void read_file(char *rname, int strip);
--FILE *copy_file(char *wname);
-+FILE *copy_file(char *wname, int fd);
- void write_file(char *wname);
- void typefile(char *name);
- void emptyfile(void);
diff --git a/editors/gate/files/patch-ad b/editors/gate/files/patch-ad
deleted file mode 100644
index c010923f2395..000000000000
--- a/editors/gate/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
---- proc.c.orig	Mon Jul 17 23:13:54 2000
-+++ proc.c	Mon Jul 17 23:14:26 2000
-@@ -57,13 +57,14 @@
- char tmpname[20];
- FILE *cfp;
- long oldt;
-+int fd;
- 
-     /* We could use a call to make_copy() here, but this method survives
-      * interupts better
-      */
-     strcpy(tmpname, "/tmp/gateXXXXXX");
--    mktemp(tmpname);
--    if ((cfp= fopen(tmpname,"w+")) == NULL)
-+    fd = mkstemp(tmpname);
-+    if ((cfp= fdopen(fd,"w+")) == NULL)
-     {
- 	printf("Cannot open file %s.\n",tmpname);
- 	return(NULL);
diff --git a/editors/gate/files/patch-ae b/editors/gate/files/patch-ae
deleted file mode 100644
index dd8ec283c140..000000000000
--- a/editors/gate/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- spel.c.orig	Mon Jul 17 23:14:49 2000
-+++ spel.c	Mon Jul 17 23:15:57 2000
-@@ -9,7 +9,7 @@
- typedef struct dirent dirent;
- #define dnamlen(d) strlen(d->d_name)
- #else
--#include <sys/dir.h>
-+#include <dirent.h>
- typedef struct direct dirent;
- #define dnamlen(d) (d->d_namlen)
- #endif
-@@ -298,7 +298,7 @@
- #ifdef DICT_DIR
- char buf[BUFSIZE+1];
- DIR *ispd;
--dirent *de;
-+struct dirent *de;
- int n= 0;
- int namlen;
- 
diff --git a/editors/gate/files/patch-af b/editors/gate/files/patch-af
deleted file mode 100644
index 8753a62a639d..000000000000
--- a/editors/gate/files/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
---- subs.c.orig	Mon Jul 17 23:16:19 2000
-+++ subs.c	Mon Jul 17 23:16:45 2000
-@@ -40,10 +40,11 @@
- {
- char tmpname[18];
- FILE *fp;
-+int fd;
- 
-     strcpy(tmpname, "/tmp/gateXXXXXX");
--    mktemp(tmpname);
--    fp= copy_file(tmpname);
-+    fd = mkstemp(tmpname);
-+    fp= copy_file(tmpname, fd);
-     unlink(tmpname);
-     return(fp);
- }
diff --git a/editors/gate/pkg-descr b/editors/gate/pkg-descr
index e4c88ec596a5..08272da6c38c 100644
--- a/editors/gate/pkg-descr
+++ b/editors/gate/pkg-descr
@@ -17,4 +17,4 @@ commands. You can read in files, or save your text to a file. You can
 filter your text through something like the unix "fmt" command. It
 provides a nice spell-checking interface too. 
 
-WWW: http://www.wwnet.net/~janc/gate.html
+WWW: http://www.unixpapa.com/gate.html