diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-11-27 16:02:43 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-11-27 16:02:43 +0000 |
| commit | 2ec1b74e75813a40d30c6f214d5284720b0d86c9 (patch) | |
| tree | 76bf184ee7bb28eaad20a6d5d1f9b282d389825c /mail | |
| parent | - Update to 2.0.7 (diff) | |
- Fix build of wanderlust-xemacs21-mule with apel in xemacs-packages.
- Fix build of wanderlust-xemacs21-mule with WRKDIRPREFIX. [*]
Reported by: kris [*]
Diffstat (limited to '')
| -rw-r--r-- | mail/wanderlust/Makefile | 7 | ||||
| -rw-r--r-- | mail/wanderlust/files/extra-patch-WL-MK | 13 | ||||
| -rw-r--r-- | mail/wanderlust/files/extra-patch-elmo:elmo-version.el | 22 |
3 files changed, 41 insertions, 1 deletions
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index 9022b9e3078a..ff32aae66e28 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -38,6 +38,10 @@ RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIME RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/bitmap/bitmap.el:${PORTSDIR}/editors/${BITMAP_PORT_NAME} .endif +.if (${EMACS_PORT_NAME} == "xemacs21-mule") +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-WL-MK ${PATCHDIR}/extra-patch-elmo:elmo-version.el +.endif + .include <bsd.port.pre.mk> .if exists(${EMACS_W3M_LISP_FILE}) @@ -74,9 +78,10 @@ PLIST_SUB+= EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \ SHIMBUN=${SHIMBUN} PLIST= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} +WRK_STARTUP_FILE= ${WRKDIR}/wanderlust-startup.el MAKE_ARGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \ LISPDIR=${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \ - FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el" + FLAGS="-batch -q -no-site-file -l ${WRK_STARTUP_FILE:C/\/\/*/\//g}" .if defined(EMACS_PACKAGESDIR) MAKE_ARGS+= PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR} .else diff --git a/mail/wanderlust/files/extra-patch-WL-MK b/mail/wanderlust/files/extra-patch-WL-MK new file mode 100644 index 000000000000..900a39e7ce4d --- /dev/null +++ b/mail/wanderlust/files/extra-patch-WL-MK @@ -0,0 +1,13 @@ +--- WL-MK.orig Sun Nov 27 22:32:36 2005 ++++ WL-MK Sun Nov 27 22:33:20 2005 +@@ -115,8 +115,8 @@ + (load "./WL-ELS" nil nil t) + ;; product.el version check + (require 'product) +- (if (not (fboundp 'product-version-as-string)) +- (error "Please install new APEL. See INSTALL or INSTALL.ja")) ++; (if (not (fboundp 'product-version-as-string)) ++; (error "Please install new APEL. See INSTALL or INSTALL.ja")) + ;; smtp.el version check. + (require 'smtp) + (if (not (fboundp 'smtp-send-buffer)) diff --git a/mail/wanderlust/files/extra-patch-elmo:elmo-version.el b/mail/wanderlust/files/extra-patch-elmo:elmo-version.el new file mode 100644 index 000000000000..11c8b6effda4 --- /dev/null +++ b/mail/wanderlust/files/extra-patch-elmo:elmo-version.el @@ -0,0 +1,22 @@ +--- elmo/elmo-version.el.orig Sun Nov 27 22:34:49 2005 ++++ elmo/elmo-version.el Sun Nov 27 22:41:22 2005 +@@ -42,6 +42,19 @@ + ;; Don't forget to check `wl-version.el' and Info. + (product-define "ELMO" nil '(2 14 0))) + ++(defun product-version-as-string (product) ++ "Return version number of product as a string. ++PRODUCT is a product structure which returned by `product-define'. ++If optional argument UPDATE is non-nil, then regenerate ++`produce-version-string' from `product-version'." ++ (setq product (product-find product)) ++ (or (product-version-string product) ++ (and (product-version product) ++ (product-set-version-string product ++ (mapconcat (function int-to-string) ++ (product-version product) ++ "."))))) ++ + ;; set version-string + (product-version-as-string 'elmo-version) + |