diff options
| -rw-r--r-- | mail/enigmail-thunderbird/Makefile | 3 | ||||
| -rw-r--r-- | mail/enigmail-thunderbird/pkg-deinstall | 2 | ||||
| -rw-r--r-- | mail/enigmail-thunderbird/pkg-install | 2 | ||||
| -rw-r--r-- | mail/enigmail/Makefile | 8 |
4 files changed, 12 insertions, 3 deletions
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile index e7a0e9f706cc..ef525bc7c51f 100644 --- a/mail/enigmail-thunderbird/Makefile +++ b/mail/enigmail-thunderbird/Makefile @@ -5,6 +5,7 @@ # $FreeBSD$ # +PORTREVISION= 1 PKGNAMESUFFIX= -thunderbird COMMENT= A GnuPG extension for the Thunderbird mail client @@ -18,6 +19,6 @@ PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall LOCAL_SRCDIR= mail/thunderbird -LOCAL_SUBDIR= lib/thunderbird/lib/mozilla-1.6 +LOCAL_SUBDIR= lib/thunderbird/lib/thunderbird-0.6 .include "${MASTERDIR}/Makefile" diff --git a/mail/enigmail-thunderbird/pkg-deinstall b/mail/enigmail-thunderbird/pkg-deinstall index c9b2120fc448..c240267ca644 100644 --- a/mail/enigmail-thunderbird/pkg-deinstall +++ b/mail/enigmail-thunderbird/pkg-deinstall @@ -1,7 +1,7 @@ #!/bin/sh if test "$2" = "POST-DEINSTALL"; then -FILE=${PKG_PREFIX}/lib/thunderbird/lib/mozilla-1.6/chrome/installed-chrome.txt +FILE=${PKG_PREFIX}/lib/thunderbird/lib/thunderbird-0.6/chrome/installed-chrome.txt cp ${FILE} ${FILE}.orig cat ${FILE}.orig | grep -v enigmail > ${FILE} rm ${FILE}.orig diff --git a/mail/enigmail-thunderbird/pkg-install b/mail/enigmail-thunderbird/pkg-install index f2b33c1b5e66..dae8c8c395cd 100644 --- a/mail/enigmail-thunderbird/pkg-install +++ b/mail/enigmail-thunderbird/pkg-install @@ -1,7 +1,7 @@ #!/bin/sh if test "$2" = "POST-INSTALL"; then -cat << EOF >> ${PKG_PREFIX}/lib/thunderbird/lib/mozilla-1.6/chrome/installed-chrome.txt +cat << EOF >> ${PKG_PREFIX}/lib/thunderbird/lib/thunderbird-0.6/chrome/installed-chrome.txt content,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/ skin,install,url,jar:resource:/chrome/enigmail-skin-tbird.jar!/skin/classic/enigmail/ locale,install,url,jar:resource:/chrome/enigmail.jar!/locale/en-US/enigmail/ diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile index c6a546a20830..799fb3371e42 100644 --- a/mail/enigmail/Makefile +++ b/mail/enigmail/Makefile @@ -7,6 +7,7 @@ PORTNAME= enigmail PORTVERSION= 0.83.6 +PORTREVISION?= 0 CATEGORIES= mail security MASTER_SITES= http://mozdev.secsup.org/enigmail/src/ \ http://downloads.us-east3.mozdev.org/enigmail/src/ @@ -21,6 +22,7 @@ RUN_DEPENDS?= mozilla:${PORTSDIR}/${LOCAL_SRCDIR} USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes WRKSRC= ${WRKDIR}/mozilla LOCAL_SRCDIR?= www/mozilla @@ -41,6 +43,12 @@ do-extract: cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \ done +pre-patch: + @${REINPLACE_CMD} -e "s|${LOCAL_SRCDIR}|mail/enigmail${PKGNAMESUFFIX}|g" \ + ${WRKSRC}/config/autoconf.mk \ + ${WRKSRC}/directory/c-sdk/config/autoconf.mk \ + ${WRKSRC}/nsprpub/config/autoconf.mk + do-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} export) @(cd ${WRKSRC}/modules/libreg; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}) |