[pkgsrc/trunk]: pkgsrc/editors/emacs Correct PLIST on Darwin. Based on patch...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/501459e9f42b
branches:  trunk
changeset: 493539:501459e9f42b
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon May 09 05:23:40 2005 +0000

description:
Correct PLIST on Darwin.  Based on patches provided by Tom Yu in PR pkg/26943.

diffstat:

 editors/emacs/Makefile |  15 ++++++++++++---
 editors/emacs/PLIST    |   6 +++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diffs (63 lines):

diff -r 873bfdd41d54 -r 501459e9f42b editors/emacs/Makefile
--- a/editors/emacs/Makefile    Mon May 09 05:14:08 2005 +0000
+++ b/editors/emacs/Makefile    Mon May 09 05:23:40 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.83 2005/05/09 05:23:40 minskim Exp $
 
 DISTNAME=      emacs-21.4a
 PKGREVISION=   1
@@ -16,8 +16,9 @@
 GNU_CONFIGURE=         yes
 
 # needed for 21.4a, can probably go away on next update
-WRKSRC=                ${WRKDIR}/emacs-21.4
-PLIST_SUBST+=  EMACSVERSION=21.4
+EMACSVERSION=  21.4
+WRKSRC=                ${WRKDIR}/emacs-${EMACSVERSION}
+PLIST_SUBST+=  EMACSVERSION=${EMACSVERSION}
 
 CONFIGURE_ARGS+=       --with-x
 CONFIGURE_ARGS+=       --with-x-toolkit=athena
@@ -57,6 +58,14 @@
 LDFLAGS+=      -Wl,-z,nocombreloc
 .endif
 
+.if ${OPSYS} == "Darwin"
+PLIST_SUBST+=  FNS_EL="@comment "
+PLIST_SUBST+=  DOCTAIL=""
+.else
+PLIST_SUBST+=  FNS_EL=""
+PLIST_SUBST+=  DOCTAIL="-${EMACSVERSION}.1"
+.endif
+
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3.*)
 CFLAGS+=       -fno-zero-initialized-in-bss
diff -r 873bfdd41d54 -r 501459e9f42b editors/emacs/PLIST
--- a/editors/emacs/PLIST       Mon May 09 05:14:08 2005 +0000
+++ b/editors/emacs/PLIST       Mon May 09 05:23:40 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/02/26 16:01:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/05/09 05:23:40 minskim Exp $
 bin/emacs
 bin/emacs-${EMACSVERSION}
 bin/emacs-b2m
@@ -12,7 +12,7 @@
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
+${FNS_EL}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail
 libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile
@@ -31,7 +31,7 @@
 share/emacs/${EMACSVERSION}/etc/COPYING
 share/emacs/${EMACSVERSION}/etc/DEBUG
 share/emacs/${EMACSVERSION}/etc/DISTRIB
-share/emacs/${EMACSVERSION}/etc/DOC-${EMACSVERSION}.1
+share/emacs/${EMACSVERSION}/etc/DOC${DOCTAIL}
 share/emacs/${EMACSVERSION}/etc/FTP
 share/emacs/${EMACSVERSION}/etc/GNU
 share/emacs/${EMACSVERSION}/etc/HELLO