1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

Change dependency on editors/bitmap to mail/x-face-e21.

Suggested by:	  ume
Feature safe:	yes
This commit is contained in:
MANTANI Nobutaka 2009-09-26 11:00:14 +00:00
parent 5f075c30ae
commit c9fa5dfb69
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=242128
4 changed files with 26 additions and 8 deletions

View File

@ -13,6 +13,5 @@ USE_EMACS= yes
EMACS_PORT_NAME= emacs21
MIMEUI_PORT_NAME= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}
EMACS_W3M_PORT_NAME= emacs-w3m-${EMACS_PORT_NAME}
BITMAP_PORT_NAME= bitmap-${EMACS_PORT_NAME}
.include "${MASTERDIR}/Makefile"

View File

@ -7,7 +7,7 @@
PORTNAME= wanderlust
PORTVERSION= 2.14.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= mail elisp
MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
@ -22,13 +22,10 @@ USE_EMACS= yes
.include <bsd.port.pre.mk>
MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}
.if (${EMACS_PORT_NAME} == "emacs22") || (${EMACS_PORT_NAME} == "emacs-devel")
BITMAP_PORT_NAME= bitmap
.endif
EMACS_W3M_PORT_NAME?= emacs-w3m
EMACS_W3M_LISP_FILE?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
MIMEUI_PORT_NAME?= ${MIMEUI_PRODUCT}
MIMEUI_PRODUCT= semi
MIMEUI_VERSION= 1.14
MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-packages
@ -36,8 +33,8 @@ MIMEUI_COOKIE= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_VERSION}.FreeBSD-pa
BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
.if !defined(WITHOUT_X11) && !defined(WITHOUT_BITMAP) && defined(BITMAP_PORT_NAME)
RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/${BITMAP_PORT_NAME}
.if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} >= 21)
RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:${PORTSDIR}/mail/x-face-e21
.endif
.if (${EMACS_PORT_NAME} == "xemacs21-mule")

View File

@ -0,0 +1,11 @@
--- samples/en/dot.wl.orig 2009-09-26 19:47:36.000000000 +0900
+++ samples/en/dot.wl 2009-09-26 19:47:42.000000000 +0900
@@ -314,7 +314,7 @@
;; for Emacs21
((and (not (featurep 'xemacs))
- (= emacs-major-version 21)
+ (>= emacs-major-version 21)
(module-installed-p 'x-face-e21))
(autoload 'x-face-decode-message-header "x-face-e21")
(setq wl-highlight-x-face-function 'x-face-decode-message-header))

View File

@ -0,0 +1,11 @@
--- samples/ja/dot.wl.orig 2009-09-26 19:48:32.000000000 +0900
+++ samples/ja/dot.wl 2009-09-26 19:49:02.000000000 +0900
@@ -320,7 +320,7 @@
;; for Emacs21
((and (not (featurep 'xemacs))
- (= emacs-major-version 21)
+ (>= emacs-major-version 21)
(module-installed-p 'x-face-e21))
(autoload 'x-face-decode-message-header "x-face-e21")
(setq wl-highlight-x-face-function 'x-face-decode-message-header))