diff options
| author | minskim <minskim@pkgsrc.org> | 2005-05-09 05:23:40 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2005-05-09 05:23:40 +0000 |
| commit | 75ff042c08a69c976e99393ed8416b18f0d48617 (patch) | |
| tree | 17a6016158f3ce135828f485feb0c440cda83772 /editors | |
| parent | 67ca8c8715ed2a3d5570245894f13cbe1d76009e (diff) | |
| download | pkgsrc-75ff042c08a69c976e99393ed8416b18f0d48617.tar.gz | |
Correct PLIST on Darwin. Based on patches provided by Tom Yu in PR pkg/26943.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 15 | ||||
| -rw-r--r-- | editors/emacs/PLIST | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 9c0c9ecd7b1..67a31bb9e83 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -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 @@ USE_GNU_TOOLS+= make 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 @@ MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp 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 --git a/editors/emacs/PLIST b/editors/emacs/PLIST index e0b29f6c682..cfd11228a60 100644 --- a/editors/emacs/PLIST +++ b/editors/emacs/PLIST @@ -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}/cvtmail 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/COOKIES 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 |