[pkgsrc/trunk]: pkgsrc/devel/semi Buildlink3'ify. No functional change inten...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a20d001df47a
branches:  trunk
changeset: 534687:a20d001df47a
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Oct 29 13:01:37 2007 +0000

description:
Buildlink3'ify.  No functional change intended.

diffstat:

 devel/semi/Makefile   |  37 ++++++++++++++++++-------------------
 devel/semi/options.mk |  13 +++++++------
 2 files changed, 25 insertions(+), 25 deletions(-)

diffs (97 lines):

diff -r 08fc71053e37 -r a20d001df47a devel/semi/Makefile
--- a/devel/semi/Makefile       Mon Oct 29 12:59:00 2007 +0000
+++ b/devel/semi/Makefile       Mon Oct 29 13:01:37 2007 +0000
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/30 23:55:38 jlam Exp $
-#
-# TODO:
-# * Control ${WRKSRC}/SEMI-ELS explicitly, otherwise Emacs/XEmacs founds
-#   bbdb / w3 if installed.
+# $NetBSD: Makefile,v 1.25 2007/10/29 13:01:37 uebayasi Exp $
 #
 
 DISTNAME=      semi-1.14.6
@@ -21,26 +17,23 @@
 COMMENT=       Emacs lisp library to provide MIME feature
 
 BUILD_DEPENDS+=        qkc-[0-9]*:../../converters/qkc
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}flim>=1.14.2:../../devel/flim
-EMACS_MODULES= base
 
-.include "../../mk/emacs.mk"
-
-.if ${EMACS_FLAVOR} == "emacs"
-DEPENDS+=      ${EMACS_PKGNAME_PREFIX}apel>=9.22:../../devel/apel
-BUILD_TARGET=  elc
-INSTALL_TARGET=        install
-.else  # ${EMACS_FLAVOR} == "xemacs"
-BUILD_TARGET=  package
-INSTALL_TARGET=        install-package
-MAKEFLAGS+=    PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
-.endif
+BUILD_TARGET=  ${BUILD_TARGET.${EMACS_TYPE}}
+INSTALL_TARGET=        ${INSTALL_TARGET.${EMACS_TYPE}}
+MAKEFLAGS=     ${MAKEFLAGS.${EMACS_TYPE}}
 
 EVAL_PREFIX+=  QKC_PREFIX=qkc
 USE_TOOLS+=    makeinfo
 INFO_FILES=    # PLIST
 
-.include "options.mk"
+EMACS_MODULES= base
+
+BUILD_TARGET.emacs=    elc
+BUILD_TARGET.xemacs=   package
+INSTALL_TARGET.emacs=  install
+INSTALL_TARGET.xemacs= install-package
+MAKEFLAGS.emacs+=
+MAKEFLAGS.xemacs+=     PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 
 post-build:
        @cd ${WRKSRC}; for i in mime-ui-en mime-ui-ja; do               \
@@ -56,4 +49,10 @@
                ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};              \
        done
 
+.include "options.mk"
+
+.include "../../mk/emacs.mk"
+
+.include "../../devel/apel/buildlink3.mk"
+.include "../../devel/flim/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 08fc71053e37 -r a20d001df47a devel/semi/options.mk
--- a/devel/semi/options.mk     Mon Oct 29 12:59:00 2007 +0000
+++ b/devel/semi/options.mk     Mon Oct 29 13:01:37 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/07/24 17:17:18 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2007/10/29 13:01:37 uebayasi Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.semi
 PKG_SUPPORTED_OPTIONS= semi-bbdb
@@ -9,19 +9,20 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msemi-bbdb)
-DEPENDS+=      bbdb-[0-9]*:../../misc/bbdb
+.include "../../misc/bbdb/buildlink3.mk"
 PLIST_SUBST+=  FOR_bbdb=
 .else
 PLIST_SUBST+=  FOR_bbdb="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mw3)
-DEPENDS+=      w3-[0-9]*:../../www/w3
+.include "../../www/w3/buildlink3.mk"
 PLIST_SUBST+=  FOR_w3=
 .else
 PLIST_SUBST+=  FOR_w3="@comment "
 .endif
 
-.if !empty(PKG_OPTIONS:Mw3m)
-DEPENDS+=      w3m-[0-9]*:../../www/emacs-w3m
-.endif
+# XXX inter-dependency!?!?!?
+#.if !empty(PKG_OPTIONS:Mw3m)
+#.include "../../www/emacs-w3m/buildlink3.mk"
+#.endif