aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2011-07-06 07:18:34 +0000
committerAlex Dupre <ale@FreeBSD.org>2011-07-06 07:18:34 +0000
commit09edc80facefc6f6b352de3f494c8e4c7fb2ccf4 (patch)
treefa179147ba45d4ba22db69bb64644441da045480
parent977ac3a56277ef3071d70a2c5839cf1b5990e9c1 (diff)
downloadports-09edc80facefc6f6b352de3f494c8e4c7fb2ccf4.tar.gz
ports-09edc80facefc6f6b352de3f494c8e4c7fb2ccf4.zip
Make enigmail-thunderbird buildable, by compiling the whole tb as a workaround. [1]
Use 1.2a2 for sm 2.1. PR: ports/158651 Submitted by: Dominic Fandrey <kamikaze@bsdforen.de>
Notes
Notes: svn path=/head/; revision=277166
-rw-r--r--mail/enigmail-seamonkey/Makefile6
-rw-r--r--mail/enigmail/Makefile36
-rw-r--r--mail/enigmail/distinfo2
3 files changed, 28 insertions, 16 deletions
diff --git a/mail/enigmail-seamonkey/Makefile b/mail/enigmail-seamonkey/Makefile
index efe0b7bd5a5e..832029e3b17a 100644
--- a/mail/enigmail-seamonkey/Makefile
+++ b/mail/enigmail-seamonkey/Makefile
@@ -5,6 +5,8 @@
# $FreeBSD$
#
+DISTVERSION= 1.2a2
+
COMMENT= A GnuPG extension for the Seamonkey mail client
MASTERDIR= ${.CURDIR}/../enigmail
@@ -13,4 +15,8 @@ GECKO= seamonkey
GECKO_PORTDIR= www/${GECKO}
GECKO_EXTDIR= comm-2.0
+PORTSCOUT= skipv:1.2
+
+IGNORE= is for seamonkey 2.1, not yet in the ports tree
+
.include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index 5041d0840745..4633389c90ad 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= ${GECKO}-
MAINTAINER= ale@FreeBSD.org
COMMENT?= A GnuPG extension for the Mozilla mail clients
-EXTRACT_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:configure \
+EXTRACT_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:${GECKO_TARGET} \
${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
gmake:${PORTSDIR}/devel/gmake \
intltool-extract:${PORTSDIR}/textproc/intltool \
@@ -24,16 +24,18 @@ BUILD_DEPENDS= ${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR}
RUN_DEPENDS= ${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
gpg:${PORTSDIR}/security/gnupg
-.if ${PORTVERSION} == "1.2"
-IGNORE= doesn't currently build
-.endif
-
.if !defined(GECKO)
GECKO= libxul
GECKO_PORTDIR= www/${GECKO}
IGNORE= is an abstract port: use one of the slave ports
.endif
+.if ${PORTVERSION} == "1.2"
+GECKO_TARGET= build
+.else
+GECKO_TARGET= configure
+.endif
+
.if defined(GECKO_EXTDIR)
GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/${GECKO_EXTDIR}
WRKSRC= ${WRKDIR}/${GECKO_EXTDIR}
@@ -65,19 +67,21 @@ pre-patch:
`${FIND} ${WRKSRC} -name autoconf.mk`
do-build:
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_base)
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_nspr)
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_js)
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} export)
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/modules/libreg)
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/string)
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom)
+.if ${GECKO_TARGET} == "configure"
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_base)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_nspr)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_js)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} export)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/modules/libreg)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/string)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom)
.if ${PORTVERSION} == "1.0.1"
- @(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/obsolete)
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/obsolete)
+.endif
.endif
- @(cd ${WRKSRC}/mailnews/extensions/enigmail; ./makemake -r);
- @(cd ${WRKSRC}/mailnews/extensions/enigmail; ${SETENV} ${MAKE_ENV} ${GMAKE});
- @(cd ${WRKSRC}/mailnews/extensions/enigmail; ${SETENV} ${MAKE_ENV} ${GMAKE} xpi);
+ cd ${WRKSRC}/mailnews/extensions/enigmail && ./makemake -r
+ cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV} ${GMAKE}
+ cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV} ${GMAKE} xpi
do-install:
${MKDIR} ${DATADIR}
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
index d03b59a97cee..ba7e89652845 100644
--- a/mail/enigmail/distinfo
+++ b/mail/enigmail/distinfo
@@ -2,5 +2,7 @@ SHA256 (enigmail-1.0.1.tar.gz) = 7bc8541eef483d67246f3d83682ba13263f001fa94b5982
SIZE (enigmail-1.0.1.tar.gz) = 1201945
SHA256 (enigmail-1.1.2.tar.gz) = dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
SIZE (enigmail-1.1.2.tar.gz) = 1280923
+SHA256 (enigmail-1.2a2.tar.gz) = 18863773132340ed66884e1f825899d624a21d89e37dec3417b9cbc8af617f87
+SIZE (enigmail-1.2a2.tar.gz) = 1325188
SHA256 (enigmail-1.2.tar.gz) = e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4
SIZE (enigmail-1.2.tar.gz) = 1326482