[pkgsrc/trunk]: pkgsrc/editors Xemacs and Xemacs-nox11 share the same PLIST b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a3f27d7b5dd2
branches:  trunk
changeset: 493021:a3f27d7b5dd2
user:      magick <magick%pkgsrc.org@localhost>
date:      Mon Apr 25 17:23:50 2005 +0000

description:
Xemacs and Xemacs-nox11 share the same PLIST but netbsd-x11 doesn't
install mule-x-init.elc which breaks "make package"
Fix this by uncommenting the entry for mule-x-init.elc in the
nox11 package as suggested by the submitter of pr 30020.
This fixes pr 30020

diffstat:

 editors/xemacs-nox11/Makefile |  4 +++-
 editors/xemacs/Makefile       |  4 +++-
 editors/xemacs/PLIST          |  4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 3b830dee20fa -r a3f27d7b5dd2 editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Mon Apr 25 16:52:10 2005 +0000
+++ b/editors/xemacs-nox11/Makefile     Mon Apr 25 17:23:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/03/03 16:16:03 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2005/04/25 17:23:50 magick Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -21,4 +21,6 @@
 CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib
 CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib
 
+PLIST_SUBST+=  X11ONLY="@comment "
+
 .include "../../mk/bsd.pkg.mk"
diff -r 3b830dee20fa -r a3f27d7b5dd2 editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Mon Apr 25 16:52:10 2005 +0000
+++ b/editors/xemacs/Makefile   Mon Apr 25 17:23:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2005/03/03 16:16:03 uebayasi Exp $
+# $NetBSD: Makefile,v 1.77 2005/04/25 17:23:50 magick Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -10,6 +10,8 @@
 CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
 CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib
 
+PLIST_SUBST+=  X11ONLY=""
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff -r 3b830dee20fa -r a3f27d7b5dd2 editors/xemacs/PLIST
--- a/editors/xemacs/PLIST      Mon Apr 25 16:52:10 2005 +0000
+++ b/editors/xemacs/PLIST      Mon Apr 25 17:23:50 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/03/03 16:16:03 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/04/25 17:23:50 magick Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -1103,7 +1103,7 @@
 lib/${DISTNAME}/lisp/mule/mule-tty-init.el${ELSUFX}
 lib/${DISTNAME}/lisp/mule/mule-tty-init.elc
 lib/${DISTNAME}/lisp/mule/mule-x-init.el${ELSUFX}
-lib/${DISTNAME}/lisp/mule/mule-x-init.elc
+${X11ONLY}lib/${DISTNAME}/lisp/mule/mule-x-init.elc
 lib/${DISTNAME}/lisp/mule/thai-xtis-chars.el${ELSUFX}
 lib/${DISTNAME}/lisp/mule/thai-xtis-chars.elc
 lib/${DISTNAME}/lisp/mule/thai-xtis.el${ELSUFX}