diff options
| -rw-r--r-- | editors/flim/Makefile | 4 | ||||
| -rw-r--r-- | editors/semi/Makefile | 4 | ||||
| -rw-r--r-- | mail/wanderlust/Makefile | 15 |
3 files changed, 16 insertions, 7 deletions
diff --git a/editors/flim/Makefile b/editors/flim/Makefile index d31dea04ea12..acaca213e8ad 100644 --- a/editors/flim/Makefile +++ b/editors/flim/Makefile @@ -45,12 +45,12 @@ MAKE_ARGS+= PREFIX="${LOCALBASE}" \ .include <bsd.port.pre.mk> .if defined(EMACS_PORT_NAME) -.if (${EMACS_PORT_NAME} == "emacs22") +.if (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs-devel") DEPPORT_SUFFIX= .else DEPPORT_SUFFIX= -${EMACS_PORT_NAME} .endif -.if (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22") +.if (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs-devel") PLIST= ${PKGDIR}/pkg-plist.emacs21 .endif # depends on apel (case of xemacs-21.x or later) diff --git a/editors/semi/Makefile b/editors/semi/Makefile index ef84768364db..9f464d3a5dfe 100644 --- a/editors/semi/Makefile +++ b/editors/semi/Makefile @@ -45,12 +45,12 @@ MAKE_ARGS+= PREFIX="${LOCALBASE}" \ .include <bsd.port.pre.mk> .if defined(EMACS_PORT_NAME) -.if (${EMACS_PORT_NAME} == "emacs22") +.if (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs-devel") DEPPORT_SUFFIX= .else DEPPORT_SUFFIX= -${EMACS_PORT_NAME} .endif -.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22") +.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs-devel") PLIST= ${PKGDIR}/pkg-plist.emacs20 .endif # depends on flim diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index f3a4118dd674..15c81b320b9b 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -23,7 +23,7 @@ USE_EMACS= yes .include <bsd.port.pre.mk> MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT} -.if (${EMACS_PORT_NAME} == "emacs22") +.if (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs-devel") BITMAP_PORT_NAME= bitmap .endif EMACS_W3M_PORT_NAME?= emacs-w3m @@ -76,8 +76,11 @@ PLIST_SUB+= EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \ WL_LISPDIR=${WL_LISPDIR} \ WL_ICONDIR=${WL_ICONDIR} \ SHIMBUN=${SHIMBUN} - +.if (${EMACS_PORT_NAME} == "emacs-devel") +PLIST= ${PKGDIR}/pkg-plist.emacs22 +.else PLIST= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} +.endif WRK_STARTUP_FILE= ${WRKDIR}/wanderlust-startup.el MAKE_ARGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \ LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \ @@ -91,13 +94,19 @@ MAKE_ARGS+= INFODIR=${INFODIR} post-extract: @${CP} ${FILESDIR}/WL-CFG ${WRKSRC} +.if (${EMACS_PORT_NAME} == "emacs-devel") +STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.emacs22.el.tmpl +.else +STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl +.endif + post-configure: @${SED} \ -e "s,%%PREFIX%%,${PREFIX},g" \ -e "s,%%EMACS_LIBDIR%%,${EMACS_LIBDIR},g" \ -e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \ -e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \ - < ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el + < ${STARTUP_TMPL} > ${WRKDIR}/wanderlust-startup.el pre-build: .if defined(EMACS_PACKAGESDIR) |