diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2010-07-18 13:59:19 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2010-07-18 13:59:19 +0800 |
| commit | d013871b2cb868cdbad0b81f29b37370f88f6a13 (patch) | |
| tree | e292866b95c71403ecc8922581dc2a973ef1bf87 /mail | |
| parent | bf2081a9203c8d78042ad53ceccdbfac5c5b4a9c (diff) | |
| download | freebsd-ports-gnome-d013871b2cb868cdbad0b81f29b37370f88f6a13.tar.gz freebsd-ports-gnome-d013871b2cb868cdbad0b81f29b37370f88f6a13.tar.zst freebsd-ports-gnome-d013871b2cb868cdbad0b81f29b37370f88f6a13.zip | |
Fix dependency conflict of wanderlust-emacs22.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/wanderlust-emacs22/Makefile | 2 | ||||
| -rw-r--r-- | mail/wanderlust/Makefile | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mail/wanderlust-emacs22/Makefile b/mail/wanderlust-emacs22/Makefile index 45c3f3aa3d7e..232d766f63db 100644 --- a/mail/wanderlust-emacs22/Makefile +++ b/mail/wanderlust-emacs22/Makefile @@ -14,6 +14,4 @@ EMACS_PORT_NAME= emacs22 MIMEUI_PORT_NAME= ${MIMEUI_PRODUCT}-${EMACS_PORT_NAME} EMACS_W3M_PORT_NAME= emacs-w3m-${EMACS_PORT_NAME} -BROKEN= conflicting dependencies - .include "${MASTERDIR}/Makefile" diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile index c919028b5e3e..6a1d19e557e8 100644 --- a/mail/wanderlust/Makefile +++ b/mail/wanderlust/Makefile @@ -35,7 +35,7 @@ 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 (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} >= 22) +.if (${EMACS_NAME} == "emacs") && (${EMACS_MAJOR_VER} == 23) RUN_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/x-face-e21.el:${PORTSDIR}/mail/x-face-e21 .endif |