From 66111c6d15be91debc28f649061f5ed03d48e340 Mon Sep 17 00:00:00 2001
From: seb <seb@pkgsrc.org>
Date: Mon, 18 Feb 2002 15:14:00 +0000
Subject: Introduce new framework for handling info files generation and
 installation.

Summary of changes:
- removal of USE_GTEXINFO
- addition of mk/texinfo.mk
- inclusion of this file in package Makefiles requiring it
- `install-info' substituted by `${INSTALL_INFO}' in PLISTs
- tuning of mk/bsd.pkg.mk:
    removal of USE_GTEXINFO
    INSTALL_INFO added to PLIST_SUBST
    `${INSTALL_INFO}' replace `install-info' in target rules
    print-PLIST target now generate `${INSTALL_INFO}' instead of `install-info'
- a couple of new patch files added for a handful of packages
- setting of the TEXINFO_OVERRIDE "switch" in packages Makefiles requiring it
- devel/cssc marked requiring texinfo 4.0
- a couple of packages Makefiles were tuned with respect of INFO_FILES and
  makeinfo command usage

See -newly added by this commit- section 10.24 of Packages.txt for
further information.
---
 lang/eieio/Makefile         |  3 ++-
 lang/eieio/PLIST            |  6 +++---
 lang/eieio/distinfo         |  3 ++-
 lang/eieio/patches/patch-aa | 21 +++++++++++++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 lang/eieio/patches/patch-aa

(limited to 'lang/eieio')

diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index d117894e148..29d94d54d42 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:16 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:24 seb Exp $
 #
 
 DISTNAME=	eieio-0.16
@@ -38,4 +38,5 @@ do-install:
 			${PREFIX}/${LISPDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/info
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/eieio/PLIST b/lang/eieio/PLIST
index 41fece602f9..3fa5d01b2a0 100644
--- a/lang/eieio/PLIST
+++ b/lang/eieio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:24 seb Exp $
 ${LISPDIR}/eieio.el
 ${LISPDIR}/eieio.elc
 ${LISPDIR}/eieio-comp.el
@@ -13,7 +13,7 @@ ${LISPDIR}/eieio-base.el
 ${LISPDIR}/eieio-base.elc
 ${LISPDIR}/compare-strings.el
 ${LISPDIR}/compare-strings.elc
-@unexec install-info --delete %D/info/eieio.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/eieio.info %D/info/dir
 info/eieio.info
-@exec install-info %D/info/eieio.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/eieio.info %D/info/dir
 @unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
diff --git a/lang/eieio/distinfo b/lang/eieio/distinfo
index 2d13da41576..3ce63fc4fc9 100644
--- a/lang/eieio/distinfo
+++ b/lang/eieio/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/08 20:22:00 cjones Exp $
+$NetBSD: distinfo,v 1.2 2002/02/18 15:14:24 seb Exp $
 
 SHA1 (eieio-0.16.tar.gz) = efad4e46a8c699241eb9e1e09796f7ac86430e9e
 Size (eieio-0.16.tar.gz) = 77843 bytes
+SHA1 (patch-aa) = fa4f0bd7cb20224997d08d15d4051514c862299d
diff --git a/lang/eieio/patches/patch-aa b/lang/eieio/patches/patch-aa
new file mode 100644
index 00000000000..c488acc545f
--- /dev/null
+++ b/lang/eieio/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 2002/02/18 15:14:24 seb Exp $
+
+--- Makefile.orig	Mon Feb 19 18:43:10 2001
++++ Makefile
+@@ -12,7 +12,6 @@
+ EMACS=emacs
+ examples_LISP=tree.el call-tree.el chart.el eieio-speedbar.el
+ eieio_info_TEXINFOS=eieio.texi
+-MAKEINFO=makeinfo
+ test_LISP=eieio-tests.el
+ Misc_MISC=INSTALL
+ VERSION=0.16
+@@ -43,7 +42,7 @@
+ 	$(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^
+ 
+ eieio.info: $(eieio_info_TEXINFOS)
+-	makeinfo -o $@ $<
++	$(MAKEINFO) -o $@ $<
+ 
+ test: $(test_LISP)
+ 	@echo "(add-to-list 'load-path nil)" > $@-compile-script
-- 
cgit v1.2.3