[pkgsrc/trunk]: pkgsrc/devel/semi Register mime-bbdb.elc / mime-w3.elc only w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3de7a74acf06
branches:  trunk
changeset: 499263:3de7a74acf06
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Sat Sep 17 16:41:23 2005 +0000

description:
Register mime-bbdb.elc / mime-w3.elc only when thier options are enabled.
Should fix bulk build errors.

diffstat:

 devel/semi/Makefile   |  7 ++++++-
 devel/semi/PLIST      |  6 +++---
 devel/semi/options.mk |  8 +++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diffs (67 lines):

diff -r 84a8c374b28e -r 3de7a74acf06 devel/semi/Makefile
--- a/devel/semi/Makefile       Sat Sep 17 14:51:42 2005 +0000
+++ b/devel/semi/Makefile       Sat Sep 17 16:41:23 2005 +0000
@@ -1,4 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2005/08/28 04:28:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.20 2005/09/17 16:41:23 uebayasi Exp $
+#
+# TODO:
+# * Control ${WRKSRC}/SEMI-ELS explicitly, otherwise Emacs/XEmacs founds
+#   bbdb / w3 if installed.
+#
 
 DISTNAME=      semi-1.14.6
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
diff -r 84a8c374b28e -r 3de7a74acf06 devel/semi/PLIST
--- a/devel/semi/PLIST  Sat Sep 17 14:51:42 2005 +0000
+++ b/devel/semi/PLIST  Sat Sep 17 16:41:23 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/05 16:05:49 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/09/17 16:41:23 uebayasi Exp $
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/semi/auto-autoloads.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/semi/auto-autoloads.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/semi/custom-load.el
@@ -10,7 +10,7 @@
 ${EMACS_LISPPREFIX}/semi/mail-mime-setup.el
 ${EMACS_LISPPREFIX}/semi/mail-mime-setup.elc
 ${EMACS_LISPPREFIX}/semi/mime-bbdb.el
-${EMACS_LISPPREFIX}/semi/mime-bbdb.elc
+${FOR_bbdb}${EMACS_LISPPREFIX}/semi/mime-bbdb.elc
 ${EMACS_LISPPREFIX}/semi/mime-edit.el
 ${EMACS_LISPPREFIX}/semi/mime-edit.elc
 ${EMACS_LISPPREFIX}/semi/mime-image.el
@@ -26,7 +26,7 @@
 ${EMACS_LISPPREFIX}/semi/mime-view.el
 ${EMACS_LISPPREFIX}/semi/mime-view.elc
 ${EMACS_LISPPREFIX}/semi/mime-w3.el
-${EMACS_LISPPREFIX}/semi/mime-w3.elc
+${FOR_w3}${EMACS_LISPPREFIX}/semi/mime-w3.elc
 ${EMACS_LISPPREFIX}/semi/pgg-def.el
 ${EMACS_LISPPREFIX}/semi/pgg-def.elc
 ${EMACS_LISPPREFIX}/semi/pgg-gpg.el
diff -r 84a8c374b28e -r 3de7a74acf06 devel/semi/options.mk
--- a/devel/semi/options.mk     Sat Sep 17 14:51:42 2005 +0000
+++ b/devel/semi/options.mk     Sat Sep 17 16:41:23 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/08/28 04:30:03 uebayasi Exp $
+# $NetBSD: options.mk,v 1.2 2005/09/17 16:41:24 uebayasi Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.semi
 PKG_SUPPORTED_OPTIONS= semi-bbdb
@@ -10,10 +10,16 @@
 
 .if !empty(PKG_OPTIONS:Mbbdb)
 DEPENDS+=      bbdb-[0-9]*:../../misc/bbdb
+PLIST_SUBST+=  FOR_bbdb=
+.else
+PLIST_SUBST+=  FOR_bbdb="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mw3)
 DEPENDS+=      w3-[0-9]*:../../www/w3
+PLIST_SUBST+=  FOR_w3=
+.else
+PLIST_SUBST+=  FOR_w3="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mw3m)