- Use MAKE_ARGS & INFO

- Track dependent port

Approved by: yoichi@

4 files changed, 17 insertions, 30 deletions

diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index 13a19e931f5e..4f303f01c5f1 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -18,7 +18,12 @@ COMMENT=	Emacs Lisp reference manual
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}
 GNU_CONFIGURE=	yes
-
 ALL_TARGET=	elisp
+MAKE_ARGS=	MAKEINFO="makeinfo --no-split"
+
+INFO=		elisp
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/elisp ${PREFIX}/${INFO_PATH}/elisp.info
 
 .include <bsd.port.mk>
diff --git a/lang/elisp-manual/files/patch-aa b/lang/elisp-manual/files/patch-aa
deleted file mode 100644
index b94eca9e30c6..000000000000
--- a/lang/elisp-manual/files/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig	Tue Oct 23 19:53:21 2001
-+++ Makefile.in	Mon Dec 17 23:28:20 2001
-@@ -13,7 +13,7 @@
- MAKE=make
- SHELL=/bin/sh
- INSTALL_INFO = install-info
--MAKEINFO=makeinfo
-+MAKEINFO=makeinfo --no-split
- 
- # Where the TeX macros are kept:
- texmacrodir = /usr/local/lib/tex/macros
-@@ -120,8 +120,7 @@
- 	fi
- 
- install: elisp
--	$(srcdir)/mkinstalldirs $(infodir)
--	cp elisp elisp-* $(infodir)
-+	cp elisp $(infodir)
- 	${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
- 
- installall: install
diff --git a/lang/elisp-manual/files/patch-ab b/lang/elisp-manual/files/patch-ab
index 226e2f286dfd..5cf7809c98f9 100644
--- a/lang/elisp-manual/files/patch-ab
+++ b/lang/elisp-manual/files/patch-ab
@@ -1,7 +1,13 @@
---- elisp.texi.orig	Wed Jun 28 13:22:31 2000
-+++ elisp.texi	Sat Dec 30 04:55:55 2000
-@@ -3,10 +3,9 @@
- @setfilename elisp
+
+$FreeBSD$
+
+--- elisp.texi.orig
++++ elisp.texi
+@@ -1,12 +1,11 @@
+ \input texinfo  @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename elisp
++@setfilename elisp.info
  @settitle GNU Emacs Lisp Reference Manual
  @c %**end of header
 -
@@ -12,4 +18,4 @@
 +* Elisp manual: (elisp).        The Emacs Lisp Reference Manual.
  @end direntry
  
- @c uncomment this if you want the result in @smallbook format
+ @smallbook
diff --git a/lang/elisp-manual/pkg-plist b/lang/elisp-manual/pkg-plist
deleted file mode 100644
index b867cad0d254..000000000000
--- a/lang/elisp-manual/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@unexec install-info --delete %D/info/elisp %D/info/dir
-info/elisp
-@exec install-info %D/info/elisp %D/info/dir