5 files changed, 41 insertions, 43 deletions

diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 6eda2032318b..67159fb9c1e1 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zile
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,28 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small emacs-like text editor
 
-USE_GCC=	3.4
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE_VER=	19
-USE_AUTOCONF_VER=	259
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	  --disable-allegro --disable-epocemx
 
 MAN1=		zile.1
 INFO=		zile
 PLIST_FILES=	bin/zile %%DATADIR%%/AUTODOC %%DATADIR%%/FAQ %%DATADIR%%/HELP \
-		%%DATADIR%%/TUTORIAL %%DATADIR%%/zilerc.sample
+		%%DATADIR%%/TUTORIAL %%DATADIR%%/dotzile.sample
 PLIST_DIRS=	%%DATADIR%%
 
-post-extract:
-	@${RM} -f ${WRKSRC}/doc/zile.info
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^BFD_CC_FOR_BUILD/d' ${WRKSRC}/configure.ac
-	@${GREP} -lR "Makefile.am" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|_FOR_BUILD||g'
-
-pre-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${ACLOCAL}
-
 .include <bsd.port.mk>
diff --git a/editors/zile/distinfo b/editors/zile/distinfo
index 032f9de37b0c..f19b773b47b7 100644
--- a/editors/zile/distinfo
+++ b/editors/zile/distinfo
@@ -1,2 +1,2 @@
-MD5 (zile-2.0.7.tar.gz) = f0243074ba36ab807be83a3ad9923f61
-SIZE (zile-2.0.7.tar.gz) = 340356
+MD5 (zile-2.2.0.tar.gz) = 1847cfd4e2ba83ff0b1b007c27d6f4a2
+SIZE (zile-2.2.0.tar.gz) = 333120
diff --git a/editors/zile/files/patch-configure b/editors/zile/files/patch-configure
new file mode 100644
index 000000000000..e0044713ee91
--- /dev/null
+++ b/editors/zile/files/patch-configure
@@ -0,0 +1,21 @@
+--- configure.orig	Mon Jul 11 15:17:20 2005
++++ configure	Mon Jul 11 23:25:52 2005
+@@ -2933,8 +2933,7 @@
+ echo "$as_me:$LINENO: result: $bfd_cv_build_exeext" >&5
+ echo "${ECHO_T}$bfd_cv_build_exeext" >&6
+   EXEEXT_FOR_BUILD=""
+-  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeex
+-t}
++  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+ fi
+ 
+ # Find a good install program.  We prefer a C program (faster),
+@@ -3995,7 +3994,7 @@
+ 
+ 
+ if test "$GCC" = "yes"; then
+-  CFLAGS="$CFLAGS -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wconversion -pedantic"
++  CFLAGS="$CFLAGS -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wconversion"
+ fi
+ 
+ 
diff --git a/editors/zile/files/patch-doc::zile.texi b/editors/zile/files/patch-doc::zile.texi
deleted file mode 100644
index 68df5e4b6829..000000000000
--- a/editors/zile/files/patch-doc::zile.texi
+++ /dev/null
@@ -1,25 +0,0 @@
---- doc/zile.texi.orig	Sun Feb  6 17:44:33 2005
-+++ doc/zile.texi	Wed Feb  9 00:07:44 2005
-@@ -1,6 +1,10 @@
- \input texinfo   @c -*-texinfo-*-
- @setfilename zile.info
- @settitle The Zile Manual
-+@dircategory Text editors
-+@direntry
-+* Zile: (zile).                 Zile emacs clone text editor.
-+@end direntry
- 
- @c If "finalout" is commented out, the printed output will show
- @c black boxes that mark lines that are too long.  Thus, it is
-@@ -18,11 +22,6 @@
- @subtitle Edition 2.0 for Zile version 2.0
- @subtitle December 2004
- @author Sandro Sigala and Reuben Thomas
--
--@dircategory Text editors
--@direntry
--* Zile: (zile).                 Zile emacs clone text editor.
--@end direntry
- 
- @page
- @vskip 0pt plus 1filll
diff --git a/editors/zile/files/patch-src-vasprintf.c b/editors/zile/files/patch-src-vasprintf.c
new file mode 100644
index 000000000000..045213c8545d
--- /dev/null
+++ b/editors/zile/files/patch-src-vasprintf.c
@@ -0,0 +1,13 @@
+--- src/vasprintf.c.orig	Sat May 21 19:01:50 2005
++++ src/vasprintf.c	Mon Jul 11 23:23:19 2005
+@@ -78,6 +78,10 @@
+ #include <ctype.h>
+ #include <limits.h>
+ 
++#ifndef va_copy
++#define va_copy(to,fr) ((to)=(fr))
++#endif
++
+ #define ALLOC_CHUNK 2048
+ #define ALLOC_SECURITY_MARGIN 1024   /* big value because some platforms have very big 'G' exponent */
+ #if ALLOC_CHUNK < ALLOC_SECURITY_MARGIN