[pkgsrc/trunk]: pkgsrc/editors * Correct PLIST when !defined(PKG_OPTIONS.xema...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8886057d249b
branches:  trunk
changeset: 490137:8886057d249b
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Thu Mar 03 16:16:03 2005 +0000

description:
* Correct PLIST when !defined(PKG_OPTIONS.xemacs:Mcanna).
* Move library/header path configurations from xemacs/Makefile.common
  to xemacs/Makefile and xemacs-nox11/Makefile.  Don't add X-related
  paths for -nox11.  Fix build failure reported by bulk builds.

diffstat:

 editors/xemacs-nox11/Makefile  |  5 ++++-
 editors/xemacs/Makefile        |  6 +++++-
 editors/xemacs/Makefile.common |  5 +----
 editors/xemacs/PLIST           |  4 ++--
 editors/xemacs/options.mk      |  4 +++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diffs (93 lines):

diff -r 90cc2a095cf0 -r 8886057d249b editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Thu Mar 03 15:50:33 2005 +0000
+++ b/editors/xemacs-nox11/Makefile     Thu Mar 03 16:16:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/15 03:01:57 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/03/03 16:16:03 uebayasi Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -17,5 +17,8 @@
 CONFIGURE_ARGS+=       --without-png   # XXX -nox
 CONFIGURE_ARGS+=       --without-tiff  # XXX -nox
 CONFIGURE_ARGS+=       --without-xpm   # XXX -nox
+CONFIGURE_ARGS+=       --site-includes=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff -r 90cc2a095cf0 -r 8886057d249b editors/xemacs/Makefile
--- a/editors/xemacs/Makefile   Thu Mar 03 15:50:33 2005 +0000
+++ b/editors/xemacs/Makefile   Thu Mar 03 16:16:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/02/28 16:20:09 uebayasi Exp $
+# $NetBSD: Makefile,v 1.76 2005/03/03 16:16:03 uebayasi Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -6,6 +6,10 @@
 
 USE_X11=       YES
 
+CONFIGURE_ARGS+=       --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include
+CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
+CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff -r 90cc2a095cf0 -r 8886057d249b editors/xemacs/Makefile.common
--- a/editors/xemacs/Makefile.common    Thu Mar 03 15:50:33 2005 +0000
+++ b/editors/xemacs/Makefile.common    Thu Mar 03 16:16:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/02/28 16:20:09 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/03/03 16:16:03 uebayasi Exp $
 
 DISTNAME=      xemacs-21.4.17
 CATEGORIES=    editors
@@ -92,9 +92,6 @@
 CONFIGURE_ARGS+=       --with-msw=no
 CONFIGURE_ARGS+=       ${WITH_DIALOGS}
 CONFIGURE_ARGS+=       --infopath="${INFOPATH}"
-CONFIGURE_ARGS+=       --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include:${WRKDIR}
-CONFIGURE_ARGS+=       --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}
-CONFIGURE_ARGS+=       --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib
 
 CFLAGS+=               -Dunix
 
diff -r 90cc2a095cf0 -r 8886057d249b editors/xemacs/PLIST
--- a/editors/xemacs/PLIST      Thu Mar 03 15:50:33 2005 +0000
+++ b/editors/xemacs/PLIST      Thu Mar 03 16:16:03 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/02/28 16:20:09 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/03/03 16:16:03 uebayasi Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -1057,7 +1057,7 @@
 lib/${DISTNAME}/lisp/mule/auto-autoloads.el${ELSUFX}
 lib/${DISTNAME}/lisp/mule/auto-autoloads.elc
 lib/${DISTNAME}/lisp/mule/canna-leim.el${ELSUFX}
-lib/${DISTNAME}/lisp/mule/canna-leim.elc
+${FOR_MULE}lib/${DISTNAME}/lisp/mule/canna-leim.elc
 lib/${DISTNAME}/lisp/mule/chinese.el${ELSUFX}
 lib/${DISTNAME}/lisp/mule/chinese.elc
 lib/${DISTNAME}/lisp/mule/custom-load.el${ELSUFX}
diff -r 90cc2a095cf0 -r 8886057d249b editors/xemacs/options.mk
--- a/editors/xemacs/options.mk Thu Mar 03 15:50:33 2005 +0000
+++ b/editors/xemacs/options.mk Thu Mar 03 16:16:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/02/28 16:20:10 uebayasi Exp $
+# $NetBSD: options.mk,v 1.4 2005/03/03 16:16:03 uebayasi Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS= ldap xface canna
@@ -22,6 +22,8 @@
 .if !empty(PKG_OPTIONS:Mcanna)
 .  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS=        --with-canna
+PLIST_SUBST+=  FOR_MULE=''
 .else
 CONFIGURE_ARGS=        --without-canna
+PLIST_SUBST+=  FOR_MULE='@comment '
 .endif