summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjlam <jlam>2006-03-20 18:15:37 +0000
committerjlam <jlam>2006-03-20 18:15:37 +0000
commitba56a6d962bf14bb906ae2ad6fbe36b11088e35f (patch)
tree0f05903ff61fcd859ec72aa544fa1e5eda653bf6 /editors
parentcd12b581e049b51b7dda38fa3ff87b479c78aec2 (diff)
downloadpkgsrc-ba56a6d962bf14bb906ae2ad6fbe36b11088e35f.tar.gz
* Nuke all references to and definitions of INFO_DIR in package Makefiles
and replace with appropriate references to PKGINFODIR instead. * Properly account for split info files during installation. * Move info file listings directly into the package PLISTs. This fixes info-file-related PLIST problems.
Diffstat (limited to 'editors')
-rw-r--r--editors/ed/Makefile6
-rw-r--r--editors/ed/PLIST3
-rw-r--r--editors/ed/distinfo4
-rw-r--r--editors/ed/patches/patch-ab4
4 files changed, 9 insertions, 8 deletions
diff --git a/editors/ed/Makefile b/editors/ed/Makefile
index 252afdcd18c..25643a2997a 100644
--- a/editors/ed/Makefile
+++ b/editors/ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/20 18:15:38 jlam Exp $
DISTNAME= ed-0.2
PKGREVISION= 1
@@ -12,11 +12,11 @@ COMMENT= GNU version of line-oriented text editor
GNU_CONFIGURE= YES
CONFIGURE_HAS_INFODIR= NO
CONFIGURE_HAS_MANDIR= NO
-MAKE_ENV+= INFO_DIR=${INFO_DIR:Q}
+MAKE_ENV+= PKGINFODIR=${PKGINFODIR:Q}
.include "../../mk/bsd.prefs.mk"
-INFO_FILES= ${GNU_PROGRAM_PREFIX}ed.info
+INFO_FILES= # PLIST
.if defined(GNU_PROGRAM_PREFIX)
# the ./configure accepts --program-prefix, but doesn't use
diff --git a/editors/ed/PLIST b/editors/ed/PLIST
index 2e508a9dc92..54c48858903 100644
--- a/editors/ed/PLIST
+++ b/editors/ed/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/08 00:59:31 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/20 18:15:38 jlam Exp $
bin/${GNU_PROGRAM_PREFIX}ed
bin/${GNU_PROGRAM_PREFIX}red
+info/${GNU_PROGRAM_PREFIX}ed.info
man/man1/${GNU_PROGRAM_PREFIX}ed.1
man/man1/${GNU_PROGRAM_PREFIX}red.1
diff --git a/editors/ed/distinfo b/editors/ed/distinfo
index 39abbb6410c..216566cc82a 100644
--- a/editors/ed/distinfo
+++ b/editors/ed/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/10/16 05:07:58 reed Exp $
+$NetBSD: distinfo,v 1.5 2006/03/20 18:15:38 jlam Exp $
SHA1 (ed-0.2.tar.gz) = abb61231a3baeb988b145ffe97cdbaea8f651d93
RMD160 (ed-0.2.tar.gz) = 7db3240d13311616df11621566f94241a3721ca2
Size (ed-0.2.tar.gz) = 185913 bytes
SHA1 (patch-aa) = 21e217b85b6f52d07df9ae7127aba94857c9633e
-SHA1 (patch-ab) = b9c9b36353e6fd64bd294a69fe70168519a5a95e
+SHA1 (patch-ab) = 1896cc7df57d3b229126e34b63ce0f04a6ec6c9e
diff --git a/editors/ed/patches/patch-ab b/editors/ed/patches/patch-ab
index 76d6a195306..77abff3f110 100644
--- a/editors/ed/patches/patch-ab
+++ b/editors/ed/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2005/10/16 05:07:58 reed Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/20 18:15:38 jlam Exp $
--- Makefile.in.orig 1994-11-19 04:45:32.000000000 -0800
+++ Makefile.in 2005-10-15 16:09:14.000000000 -0700
@@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.2 2005/10/16 05:07:58 reed Exp $
bindir = $(exec_prefix)/bin
-infodir = $(prefix)/info
-mandir = $(prefix)/man/man1
-+infodir = $(prefix)/$(INFO_DIR)
++infodir = $(prefix)/$(PKGINFODIR)
+mandir = $(prefix)/$(PKGMANDIR)/man1
manext = .1