diff options
| author | ale <ale@FreeBSD.org> | 2004-02-23 18:34:01 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2004-02-23 18:34:01 +0800 |
| commit | 0030831541a662a8ae1539983e54c73cce7238a2 (patch) | |
| tree | 227ef5732e5eafbe0703f52b8f79a35476eadb09 /mail | |
| parent | 1940428aaa87eefa369da446992bd33951a74e50 (diff) | |
| download | freebsd-ports-gnome-0030831541a662a8ae1539983e54c73cce7238a2.tar.gz freebsd-ports-gnome-0030831541a662a8ae1539983e54c73cce7238a2.tar.zst freebsd-ports-gnome-0030831541a662a8ae1539983e54c73cce7238a2.zip | |
Try to fix bento error (the correct way to locate the wrkdir of
another port is to do it relative to ${WRKDIR}).
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/enigmail-thunderbird/Makefile | 8 | ||||
| -rw-r--r-- | mail/enigmail/Makefile | 10 | ||||
| -rw-r--r-- | mail/enigmail/pkg-deinstall | 2 | ||||
| -rw-r--r-- | mail/enigmail/pkg-install | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile index d20d6caa9268..0c4bf90aa95f 100644 --- a/mail/enigmail-thunderbird/Makefile +++ b/mail/enigmail-thunderbird/Makefile @@ -9,17 +9,15 @@ PKGNAMESUFFIX= -thunderbird COMMENT= A GnuPG extension for the Thunderbird mail client -EXTRACT_DEPENDS=${WRKDIRPREFIX}${LOCAL_SRCDIR}/work/mozilla/Makefile:${LOCAL_SRCDIR}:configure -RUN_DEPENDS= thunderbird:${LOCAL_SRCDIR} +EXTRACT_DEPENDS=${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla/Makefile:${PORTSDIR}/${LOCAL_SRCDIR}:configure +RUN_DEPENDS= thunderbird:${PORTSDIR}/${LOCAL_SRCDIR} MASTERDIR= ${.CURDIR}/../enigmail PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall -LOCAL_SRCDIR= ${PORTSDIR}/mail/thunderbird +LOCAL_SRCDIR= mail/thunderbird LOCAL_SUBDIR= lib/thunderbird/lib/mozilla-1.6b -BROKEN= "Does not compile" - .include "${MASTERDIR}/Makefile" diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile index 0fda1c0cda2b..0d8ef9fd4fd5 100644 --- a/mail/enigmail/Makefile +++ b/mail/enigmail/Makefile @@ -19,15 +19,15 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ MAINTAINER= ale@FreeBSD.org COMMENT?= A GnuPG extension for the Mozilla mail client -EXTRACT_DEPENDS?= ${WRKDIRPREFIX}${LOCAL_SRCDIR}/work/mozilla/Makefile:${LOCAL_SRCDIR}:configure -RUN_DEPENDS?= mozilla:${LOCAL_SRCDIR} +EXTRACT_DEPENDS?= ${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla/Makefile:${PORTSDIR}/${LOCAL_SRCDIR}:configure +RUN_DEPENDS?= mozilla:${PORTSDIR}/${LOCAL_SRCDIR} USE_X_PREFIX= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/mozilla -LOCAL_SRCDIR?= ${PORTSDIR}/www/mozilla -LOCAL_SUBDIR?= lib/mozilla +LOCAL_SRCDIR?= www/mozilla +LOCAL_SUBDIR?= lib/mozilla-gtk2 LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR} COMPONENTS= ipc.xpt enigmime.xpt libenigmime.so enigmail.xpt enigmail.js enigprefs-service.js @@ -38,7 +38,7 @@ PLIST_SUB= LOCAL_SUBDIR=${LOCAL_SUBDIR} do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @${CP} -R ${WRKDIRPREFIX}${LOCAL_SRCDIR}/work/mozilla ${WRKSRC} + @${CP} -R ${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla ${WRKSRC} @for file in ${EXTRACT_ONLY}; do \ cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \ done diff --git a/mail/enigmail/pkg-deinstall b/mail/enigmail/pkg-deinstall index f3078aa9385e..ba41bbfca17e 100644 --- a/mail/enigmail/pkg-deinstall +++ b/mail/enigmail/pkg-deinstall @@ -1,7 +1,7 @@ #!/bin/sh if test "$2" = "POST-DEINSTALL"; then -FILE=${PKG_PREFIX}/lib/mozilla/chrome/installed-chrome.txt +FILE=${PKG_PREFIX}/lib/mozilla-gtk2/chrome/installed-chrome.txt cp ${FILE} ${FILE}.orig cat ${FILE}.orig | grep -v enigmail > ${FILE} rm ${FILE}.orig diff --git a/mail/enigmail/pkg-install b/mail/enigmail/pkg-install index c90d8db53b1e..023b7a7417ae 100644 --- a/mail/enigmail/pkg-install +++ b/mail/enigmail/pkg-install @@ -1,7 +1,7 @@ #!/bin/sh if test "$2" = "POST-INSTALL"; then -cat << EOF >> ${PKG_PREFIX}/lib/mozilla/chrome/installed-chrome.txt +cat << EOF >> ${PKG_PREFIX}/lib/mozilla-gtk2/chrome/installed-chrome.txt content,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/ skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/modern/enigmail/ skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/classic/enigmail/ |