diff options
| -rw-r--r-- | devel/flim/Makefile | 3 | ||||
| -rw-r--r-- | devel/pvs/Makefile | 4 | ||||
| -rw-r--r-- | devel/semantic/Makefile | 4 | ||||
| -rw-r--r-- | devel/semi/Makefile | 3 | ||||
| -rw-r--r-- | editors/emacs/modules.mk | 14 | ||||
| -rw-r--r-- | inputmethod/iiimecf/Makefile | 4 | ||||
| -rw-r--r-- | inputmethod/skk/Makefile | 3 | ||||
| -rw-r--r-- | mail/wl/Makefile | 4 | ||||
| -rw-r--r-- | misc/elscreen/Makefile | 4 | ||||
| -rw-r--r-- | misc/lookup/Makefile | 3 | ||||
| -rw-r--r-- | www/emacs-w3m/Makefile | 4 |
11 files changed, 39 insertions, 11 deletions
diff --git a/devel/flim/Makefile b/devel/flim/Makefile index ec1c8897e58..9096735f0cd 100644 --- a/devel/flim/Makefile +++ b/devel/flim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/10/11 09:31:55 uebayasi Exp $ +# $NetBSD: Makefile,v 1.29 2008/10/13 08:07:02 uebayasi Exp $ DISTNAME= flim-1.14.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -33,6 +33,7 @@ MAKEFLAGS.emacs+= MAKEFLAGS.xemacs+= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||} EMACS_MODULES= base +EMACS_BUILDLINK=# defined post-build: @cd ${WRKSRC}; for i in mime-en mime-ja; do \ diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index fd8e780c24e..0d295029312 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2008/10/11 09:31:55 uebayasi Exp $ +# $NetBSD: Makefile,v 1.36 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= pvs-${VERSION} @@ -43,6 +43,8 @@ MAINFILEEXT= ${EMUL_OPSYS} INSTALLATION_DIRS= bin +EMACS_BUILDLINK= # defined + do-build: ${SED} -e "s|@PREFIX@|${PREFIX}|" ${WRKSRC}/pvs > ${WRKSRC}/pvs.tmp ${MV} -f ${WRKSRC}/pvs.tmp ${WRKSRC}/pvs diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile index e27e4e39444..d888fff8f1c 100644 --- a/devel/semantic/Makefile +++ b/devel/semantic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2008/10/11 09:31:55 uebayasi Exp $ +# $NetBSD: Makefile,v 1.26 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= semantic-1.4.4 @@ -39,6 +39,8 @@ AUXFILES+= c.bnf make.bnf java.bnf scheme.bnf INSTALLATION_DIRS= ${EMACS_INFOPREFIX} +EMACS_BUILDLINK=# defined + do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/semantic cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} \ diff --git a/devel/semi/Makefile b/devel/semi/Makefile index 265747ff708..0cb0cd3c612 100644 --- a/devel/semi/Makefile +++ b/devel/semi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2008/10/11 09:31:55 uebayasi Exp $ +# $NetBSD: Makefile,v 1.28 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= semi-1.14.6 @@ -31,6 +31,7 @@ USE_TOOLS+= makeinfo INFO_FILES= # PLIST EMACS_MODULES= base +EMACS_BUILDLINK=# defined BUILD_TARGET.emacs= elc BUILD_TARGET.xemacs= package diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk index ef8acdebe5c..9461332ba1d 100644 --- a/editors/emacs/modules.mk +++ b/editors/emacs/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: modules.mk,v 1.2 2008/10/13 08:07:02 uebayasi Exp $ # # This Makefile fragment handles Emacs Lisp Packages (== ELPs). # @@ -63,6 +63,16 @@ # Default value: # emacs21, emacs21nox, emacs22, emacs22nox, emacs20, xemacs215, xemacs215nox, xemacs214, xemacs214nox # +# EMACS_BUILDLINK +# Description: +# Whether create buildlink directory of *.el / *.elc +# files. ELPs which include other ELP's buildlink3.mk +# must define this value. +# Possible values: +# <defined>, <undefined> +# Default value: +# <undefined> +# # Variables provided for ELPs: # # EMACS_BIN @@ -309,9 +319,11 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \ # Build environment (buildlink3) # +.if defined(EMACS_BUILDLINK) _EMACS_DIR= ${BUILDLINK_DIR}/share/emacs ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp .include "${_EMACS_PKGDIR}/buildlink3.mk" +.endif .endif # EMACS_MK diff --git a/inputmethod/iiimecf/Makefile b/inputmethod/iiimecf/Makefile index c9037f2ab11..349e93722d8 100644 --- a/inputmethod/iiimecf/Makefile +++ b/inputmethod/iiimecf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/10/11 09:31:57 uebayasi Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= IIIMECF-0.6 @@ -13,6 +13,8 @@ COMMENT= Emacs Lisp library for IIIM Protocol PKG_DESTDIR_SUPPORT= user-destdir +EMACS_BUILDLINK=# defined + do-build: @cd ${WRKSRC} && \ ${EMACS_BIN} -q --no-site-file -batch -l iiimcf-comp.el diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile index 89939c379c5..74f30ed35db 100644 --- a/inputmethod/skk/Makefile +++ b/inputmethod/skk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2008/10/11 09:31:57 uebayasi Exp $ +# $NetBSD: Makefile,v 1.19 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= ddskk-20080309 @@ -16,6 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFLICTS= ddskk-[0-9]* EMACS_MODULES+= base leim +EMACS_BUILDLINK=# defined MAKEFLAGS+= EMACS=${EMACS_BIN:Q} MAKE_ENV= prefix=${DESTDIR:Q}${PREFIX:Q} \ diff --git a/mail/wl/Makefile b/mail/wl/Makefile index 15d9274ef95..ab93aca8ee1 100644 --- a/mail/wl/Makefile +++ b/mail/wl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2008/10/11 09:31:57 uebayasi Exp $ +# $NetBSD: Makefile,v 1.39 2008/10/13 08:07:02 uebayasi Exp $ DISTNAME= wl-2.14.0 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -26,6 +26,8 @@ INSTALLATION_DIRS= ${DOCDIR}/en ${DOCDIR}/ja \ ${EXAMPLESDIR}/en ${EXAMPLESDIR}/ja \ ${EMACS_INFOPREFIX} +EMACS_BUILDLINK=# defined + post-install: @set -e; \ for f in BUGS NEWS README; do \ diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile index d9a828b7ddc..d430aa013a7 100644 --- a/misc/elscreen/Makefile +++ b/misc/elscreen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2008/10/11 09:31:57 uebayasi Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= elscreen-1.4.5 @@ -24,6 +24,8 @@ PKG_DESTDIR_SUPPORT= user-destdir NO_BUILD= yes +EMACS_BUILDLINK=# defined + do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EMACS_LISPPREFIX}/elscreen ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/elscreen diff --git a/misc/lookup/Makefile b/misc/lookup/Makefile index a783004f135..246d796f6db 100644 --- a/misc/lookup/Makefile +++ b/misc/lookup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/10/11 09:31:57 uebayasi Exp $ +# $NetBSD: Makefile,v 1.18 2008/10/13 08:07:02 uebayasi Exp $ # DISTNAME= lookup-1.4.1 @@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= eblook>=1.4:../../textproc/eblook EMACS_VERSIONS_ACCEPTED= emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215 +EMACS_BUILDLINK=# defined GNU_CONFIGURE= YES MAKEFLAGS+= lispdir=${EMACS_LISPPREFIX}/lookup diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 5309b91fd37..79961f198b7 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2008/10/11 09:31:58 uebayasi Exp $ +# $NetBSD: Makefile,v 1.24 2008/10/13 08:07:02 uebayasi Exp $ DISTNAME= emacs-w3m-1.4.4 PKGREVISION= 1 @@ -31,6 +31,8 @@ SUBST_FILES.fix-icondir= Makefile.in w3m.el w3mhack.el SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \ -e 's|images/w3m|w3m|g' +EMACS_BUILDLINK=# defined + .include "../../editors/emacs/modules.mk" # GNU Emacs 21 or later and XEmacs have GUI support |