summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormagick <magick@pkgsrc.org>2005-04-25 17:23:50 +0000
committermagick <magick@pkgsrc.org>2005-04-25 17:23:50 +0000
commit3801d08ec225dc5849165bdad5259787327a5b37 (patch)
tree967da804638bb75d9d4436fb1f66c9a758fd66f8 /editors
parent5edc3faf8c10c20717431905f997fb3cbe0c408b (diff)
downloadpkgsrc-3801d08ec225dc5849165bdad5259787327a5b37.tar.gz
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 (limited to 'editors')
-rw-r--r--editors/xemacs-nox11/Makefile4
-rw-r--r--editors/xemacs/Makefile4
-rw-r--r--editors/xemacs/PLIST4
3 files changed, 8 insertions, 4 deletions
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index 4fa19fa8077..5543c4acb0d 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -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-includes=${BUILDLINK_DIR}/include
CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib
CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib
+PLIST_SUBST+= X11ONLY="@comment "
+
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index def43c2db72..037724625b9 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -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-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/i
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 --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index 7bb2e82c6a3..a0b10303085 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -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-misc.elc
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}