5 files changed, 42 insertions, 32 deletions

diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 8b653a1fa46c..7df38f4591e7 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	emacs-lisp-intro
-PORTVERSION=	1.05
+PORTVERSION=	2.04
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
 
-MAINTAINER=	croyle@gelemna.org
+MAINTAINER=	ports@freebsd.org
+
+USE_AUTOCONF=	yes
 
 .include <bsd.port.mk>
diff --git a/lang/emacs-lisp-intro/distinfo b/lang/emacs-lisp-intro/distinfo
index cc2a66960168..5c8499d07924 100644
--- a/lang/emacs-lisp-intro/distinfo
+++ b/lang/emacs-lisp-intro/distinfo
@@ -1 +1 @@
-MD5 (emacs-lisp-intro-1.05.tar.gz) = d132619678e3e22f0cb4d32b4468326d
+MD5 (emacs-lisp-intro-2.04.tar.gz) = a2e839f6ec82ccadcd36427d32df709a
diff --git a/lang/emacs-lisp-intro/files/patch-aa b/lang/emacs-lisp-intro/files/patch-aa
index 824421660761..e69de29bb2d1 100644
--- a/lang/emacs-lisp-intro/files/patch-aa
+++ b/lang/emacs-lisp-intro/files/patch-aa
@@ -1,14 +0,0 @@
---- Makefile.orig	Sat Sep 19 06:12:34 1998
-+++ Makefile	Sat Sep 19 06:21:14 1998
-@@ -0,0 +1,11 @@
-+all: emacs-lisp-intro.info
-+
-+emacs-lisp-intro.info:
-+	makeinfo --no-split emacs-lisp-intro.texi
-+
-+install: all
-+	${BSD_INSTALL_DATA} emacs-lisp-intro.info ${PREFIX}/info/
-+	install-info ${PREFIX}/info/emacs-lisp-intro.info ${PREFIX}/info/dir
-+
-+clean:
-+	rm -f emacs-lisp-intro.info
diff --git a/lang/emacs-lisp-intro/files/patch-ab b/lang/emacs-lisp-intro/files/patch-ab
index 8e4ac8541292..2b001489e137 100644
--- a/lang/emacs-lisp-intro/files/patch-ab
+++ b/lang/emacs-lisp-intro/files/patch-ab
@@ -1,15 +1,26 @@
-*** emacs-lisp-intro.texi.orig	Tue Oct 21 11:33:24 1997
---- emacs-lisp-intro.texi	Tue Nov 18 20:34:18 1997
-***************
-*** 3,8 ****
---- 3,12 ----
-  @setfilename emacs-lisp-intro.info
-  @c sethtmlfilename emacs-lisp-intro.html
-  @settitle Programming in Emacs Lisp
-+ @dircategory Emacs Lisp programming
-+ @direntry
-+ * Emacs Lisp Intro: (emacs-lisp-intro.info).    Programming in Emacs Lisp.
-+ @end direntry
-  @syncodeindex vr cp
-  @syncodeindex fn cp
-  @setchapternewpage odd
+--- emacs-lisp-intro.texi.orig	Mon Dec 17 19:19:08 2001
++++ emacs-lisp-intro.texi	Tue Jan  8 22:35:19 2002
+@@ -3,6 +3,10 @@
+ @setfilename emacs-lisp-intro.info
+ @c sethtmlfilename emacs-lisp-intro.html
+ @settitle Programming in Emacs Lisp
++@dircategory Emacs Lisp programming
++@direntry
++* Emacs Lisp Intro: (emacs-lisp-intro.info).    Programming in Emacs Lisp.
++@end direntry
+ @syncodeindex vr cp
+ @syncodeindex fn cp
+ @setchapternewpage odd
+@@ -218,12 +222,6 @@
+ @end tex
+ 
+ @c ----------------------------------------------------
+-
+-@dircategory Emacs
+-@direntry
+-* Emacs Lisp Intro: (eintr).
+-  			A simple introduction to Emacs Lisp programming.
+-@end direntry
+ 
+ @ifinfo
+ This is an introduction to @cite{Programming in Emacs Lisp}, for
diff --git a/lang/emacs-lisp-intro/files/patch-ac b/lang/emacs-lisp-intro/files/patch-ac
new file mode 100644
index 000000000000..7ba386f9bfd8
--- /dev/null
+++ b/lang/emacs-lisp-intro/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Dec 17 19:24:43 2001
++++ Makefile.in	Sun Dec 23 05:29:31 2001
+@@ -57,7 +57,7 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+