aboutsummaryrefslogtreecommitdiffstats
path: root/mail/wanderlust
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2009-09-26 19:00:14 +0800
committernobutaka <nobutaka@FreeBSD.org>2009-09-26 19:00:14 +0800
commitea8c6aad3d7a74895c7473f882f5d5f86a7938c0 (patch)
tree682d6f58f5cd04e397641d78704b82c231aa374c /mail/wanderlust
parent5de48342c9bf187d30308940d6f13df414c8378f (diff)
downloadfreebsd-ports-gnome-ea8c6aad3d7a74895c7473f882f5d5f86a7938c0.tar.gz
freebsd-ports-gnome-ea8c6aad3d7a74895c7473f882f5d5f86a7938c0.tar.zst
freebsd-ports-gnome-ea8c6aad3d7a74895c7473f882f5d5f86a7938c0.zip
Change dependency on editors/bitmap to mail/x-face-e21.
Suggested by: ume Feature safe: yes
Diffstat (limited to 'mail/wanderlust')
-rw-r--r--mail/wanderlust/Makefile11
-rw-r--r--mail/wanderlust/files/patch-samples_en_dot.wl11
-rw-r--r--mail/wanderlust/files/patch-samples_ja_dot.wl11
3 files changed, 26 insertions, 7 deletions
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 1a0a13a85000..4e839166dfa6 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -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")
diff --git a/mail/wanderlust/files/patch-samples_en_dot.wl b/mail/wanderlust/files/patch-samples_en_dot.wl
new file mode 100644
index 000000000000..cb2d5e450955
--- /dev/null
+++ b/mail/wanderlust/files/patch-samples_en_dot.wl
@@ -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))
diff --git a/mail/wanderlust/files/patch-samples_ja_dot.wl b/mail/wanderlust/files/patch-samples_ja_dot.wl
new file mode 100644
index 000000000000..ffecfd83733d
--- /dev/null
+++ b/mail/wanderlust/files/patch-samples_ja_dot.wl
@@ -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))