Hi,

if you use & rely on enigmail, please test this update, which targets
thunderbird 5.0 and seamonkey 2.2. It works in my light testing on
amd64. Check ports@ archive for the corresponding tb/sm updates.

If i don't hear from anyone, this will probably be commited this
weekend, along sm/tb.

Landry
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/mail/enigmail/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- Makefile.inc        26 Nov 2010 07:51:00 -0000      1.5
+++ Makefile.inc        22 Jul 2011 05:15:39 -0000
@@ -15,11 +15,11 @@
 
 MASTER_SITES = http://www.mozilla-enigmail.org/download/source/
 
-BUILD_DEPENDS =        ${MOZAPP_PKGPATH}:configure \
+BUILD_DEPENDS =        ${MOZAPP_PKGSTEM}:${MOZAPP_PKGPATH}:configure \
                archivers/unzip
 RUN_DEPENDS =  security/gnupg
 LIB_DEPENDS =  ${MOZAPP_PKGPATH},-main
-WANTLIB =      c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom 
${MOZAPP_DIR}/xpcom_core
+WANTLIB =      c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom 
${MOZAPP_DIR}/xul ${MOZAPP_DIR}/mozalloc
 
 USE_GMAKE =    Yes
 NO_REGRESS =   Yes
@@ -37,23 +37,26 @@
 SUBST_VARS =   GUID
 
 post-extract:
-       @perl -pi -e 's|(genxpi.*) (\$$\(TARGET_XPCOM_ABI\))|\1 "\2"|g' \
+       # strip off the TARGET_XPCOM_ABI variable part
+       perl -pi -e 's|(genxpi.*) (\$$\(TARGET_XPCOM_ABI\))|\1 "\2"|g' \
                ${WRKDIST}/Makefile.in
-       @perl -pi -e 's|[-_]?\$${xpcomAbi}||g' ${WRKDIST}/genxpi
-       @mv ${WRKDIST} ${MOZBASE}/mailnews/extensions
+       # strip xpcomABI from platform and ABI in chrome.manifest
+       perl -pi -e 's|[-_]?\$${xpcomAbi}||g ; s| ABI=.\$${platform}.||g' 
${WRKDIST}/genxpi
+       mv ${WRKDIST} ${MOZBASE}/mailnews/extensions
 
 do-build:
-       @cd ${MOZBASE} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export
-       @cd ${MOZBASE}/mozilla/modules/libreg && ${SETENV} ${MAKE_ENV} 
${MAKE_PROGRAM}
-       @cd ${MOZBASE}/mozilla/xpcom/string && ${SETENV} ${MAKE_ENV} 
${MAKE_PROGRAM}
-       @cd ${MOZBASE}/mozilla/xpcom && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-       @cd ${MOZBASE}/mozilla/xpcom/obsolete && ${SETENV} ${MAKE_ENV} 
${MAKE_PROGRAM}
-       @cd ${WRKSRC} && ./makemake -r
-       @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-       @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
+       cd ${MOZBASE}/mozilla && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_base
+       cd ${MOZBASE}/mozilla && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_js
+       cd ${MOZBASE}/mozilla && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} 
tier_platform
+       cd ${MOZBASE} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export
+       cd ${WRKSRC} && ./makemake -r
+       # hax: switch to jar format to generate enigmail.jar
+       perl -pi -e 's|MOZ_CHROME_FILE_FORMAT.*|MOZ_CHROME_FILE_FORMAT=jar|' 
${MOZBASE}/config/autoconf.mk
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
 
 do-install:
        ${INSTALL_DATA_DIR} ${GLOBALDIR}
        unzip -q ${MOZBIN}/${ENIGMAIL_XPI} -d ${GLOBALDIR}
-       cp ${GLOBALDIR}/platform/OpenBSD*/components/lib*.so.* \
-               ${GLOBALDIR}/components/
+       # enigmail 1.2 works in seamonkey 2.2 so adjust install.rdf
+       perl -pi -e 
's|<em:maxVersion>2.1.*</em:maxVersion>|<em:maxVersion>2.2.*</em:maxVersion>|' 
${GLOBALDIR}/install.rdf
Index: seamonkey/Makefile
===================================================================
RCS file: /cvs/ports/mail/enigmail/seamonkey/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- seamonkey/Makefile  14 Jan 2011 22:58:49 -0000      1.4
+++ seamonkey/Makefile  22 Jul 2011 05:15:39 -0000
@@ -2,18 +2,19 @@
 
 COMMENT =      GnuPG extension for Seamonkey
 
-VERSION =      1.0.1
+VERSION =      1.2
 PKGNAME =      enigmail-seamonkey-${VERSION}
-REVISION =     4
 
 # must be in sync with SO_VERSION in
 # www/seamonkey
-SHARED_LIBS =  enigmime        16.1
+SHARED_LIBS =  enigmime        18.0 \
+               ipc             18.0
 
+MOZAPP_PKGSTEM =       seamonkey->=2.2
 MOZAPP_PKGPATH =       www/seamonkey
-MOZAPP_DIR =           seamonkey
-MOZAPP_BRANCH =                1.9.1
+MOZAPP_DIR =           lib/seamonkey-2.2
+MOZAPP_BRANCH =                release
 
-ENIGMAIL_XPI=  ${DISTNAME:S/.1//}-openbsd-${GNU_ARCH}.xpi
+ENIGMAIL_XPI = ${DISTNAME}-openbsd-${GNU_ARCH}.xpi
 
 .include <bsd.port.mk>
Index: seamonkey/distinfo
===================================================================
RCS file: /cvs/ports/mail/enigmail/seamonkey/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- seamonkey/distinfo  27 Jul 2010 20:18:24 -0000      1.1.1.1
+++ seamonkey/distinfo  22 Jul 2011 05:15:39 -0000
@@ -1,5 +1,5 @@
-MD5 (enigmail-1.0.1.tar.gz) = UIypqwOWr7Segu2ogBSSSw==
-RMD160 (enigmail-1.0.1.tar.gz) = Kr2OcPz80udecal6Wjx9HgwpJmY=
-SHA1 (enigmail-1.0.1.tar.gz) = M05wcj//wGMdrbb9REmv/96vw/I=
-SHA256 (enigmail-1.0.1.tar.gz) = e8hUHu9IPWckbz2DaCuhMmPwAfqUtZgsDPvlTlvf0yo=
-SIZE (enigmail-1.0.1.tar.gz) = 1201945
+MD5 (enigmail-1.2.tar.gz) = +LoVFkrcHA6DKFghRkYa7A==
+RMD160 (enigmail-1.2.tar.gz) = hoxzqihWaJXUtsa5y/RgLXXfCnM=
+SHA1 (enigmail-1.2.tar.gz) = BfuAqZVE+Vv6JTHmzVysjPHnh4A=
+SHA256 (enigmail-1.2.tar.gz) = 5eUWhdCetah70h+AtLZO64111kJLIc/q6nucFnI8nMQ=
+SIZE (enigmail-1.2.tar.gz) = 1326482
Index: seamonkey/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/enigmail/seamonkey/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- seamonkey/pkg/PLIST 2 Aug 2010 08:45:32 -0000       1.2
+++ seamonkey/pkg/PLIST 22 Jul 2011 05:15:39 -0000
@@ -2,24 +2,32 @@
 @conflict enigmail-seamonkey-<=1.0.1
 @pkgpath mail/enigmail,-seamonkey
 @pkgpath mail/enigmail-seamonkey
-seamonkey/extensions/${GUID}/
-seamonkey/extensions/${GUID}/chrome/
-seamonkey/extensions/${GUID}/chrome.manifest
-seamonkey/extensions/${GUID}/chrome/enigmail.jar
-seamonkey/extensions/${GUID}/components/
-seamonkey/extensions/${GUID}/components/enigMsgCompFields.js
-seamonkey/extensions/${GUID}/components/enigmail.js
-seamonkey/extensions/${GUID}/components/enigmail.xpt
-seamonkey/extensions/${GUID}/components/enigmime.xpt
-seamonkey/extensions/${GUID}/components/enigprefs-service.js
-seamonkey/extensions/${GUID}/components/ipc.xpt
-@lib 
seamonkey/extensions/${GUID}/components/libenigmime.so.${LIBenigmime_VERSION}
-seamonkey/extensions/${GUID}/defaults/
-seamonkey/extensions/${GUID}/defaults/pref/
-seamonkey/extensions/${GUID}/defaults/pref/enigmail.js
-seamonkey/extensions/${GUID}/defaults/preferences/
-seamonkey/extensions/${GUID}/defaults/preferences/enigmail.js
-seamonkey/extensions/${GUID}/install.rdf
-seamonkey/extensions/${GUID}/wrappers/
-seamonkey/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
-seamonkey/extensions/${GUID}/wrappers/gpg-wrapper.sh
+lib/seamonkey-2.2/extensions/${GUID}/
+lib/seamonkey-2.2/extensions/${GUID}/chrome/
+lib/seamonkey-2.2/extensions/${GUID}/chrome.manifest
+lib/seamonkey-2.2/extensions/${GUID}/chrome/enigmail.jar
+lib/seamonkey-2.2/extensions/${GUID}/components/
+lib/seamonkey-2.2/extensions/${GUID}/components/enigMsgCompFields.js
+lib/seamonkey-2.2/extensions/${GUID}/components/enigmail.js
+lib/seamonkey-2.2/extensions/${GUID}/components/enigmail.xpt
+lib/seamonkey-2.2/extensions/${GUID}/components/enigmime.xpt
+lib/seamonkey-2.2/extensions/${GUID}/components/enigprefs-service.js
+lib/seamonkey-2.2/extensions/${GUID}/components/ipc.xpt
+lib/seamonkey-2.2/extensions/${GUID}/defaults/
+lib/seamonkey-2.2/extensions/${GUID}/defaults/pref/
+lib/seamonkey-2.2/extensions/${GUID}/defaults/pref/enigmail.js
+lib/seamonkey-2.2/extensions/${GUID}/defaults/preferences/
+lib/seamonkey-2.2/extensions/${GUID}/defaults/preferences/enigmail.js
+lib/seamonkey-2.2/extensions/${GUID}/install.rdf
+lib/seamonkey-2.2/extensions/${GUID}/modules/
+lib/seamonkey-2.2/extensions/${GUID}/modules/commonFuncs.jsm
+lib/seamonkey-2.2/extensions/${GUID}/modules/enigmailCommon.jsm
+lib/seamonkey-2.2/extensions/${GUID}/modules/subprocess.jsm
+lib/seamonkey-2.2/extensions/${GUID}/platform/
+lib/seamonkey-2.2/extensions/${GUID}/platform/OpenBSD/
+lib/seamonkey-2.2/extensions/${GUID}/platform/OpenBSD/components/
+@lib 
lib/seamonkey-2.2/extensions/${GUID}/platform/OpenBSD/components/libenigmime.so.${LIBenigmime_VERSION}
+@lib 
lib/seamonkey-2.2/extensions/${GUID}/platform/OpenBSD/components/libipc.so.${LIBipc_VERSION}
+lib/seamonkey-2.2/extensions/${GUID}/wrappers/
+lib/seamonkey-2.2/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
+lib/seamonkey-2.2/extensions/${GUID}/wrappers/gpg-wrapper.sh
Index: thunderbird/Makefile
===================================================================
RCS file: /cvs/ports/mail/enigmail/thunderbird/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- thunderbird/Makefile        14 Jan 2011 22:58:49 -0000      1.4
+++ thunderbird/Makefile        22 Jul 2011 05:15:39 -0000
@@ -2,17 +2,17 @@
 
 COMMENT =      GnuPG extension for Thunderbird
 
-VERSION =      1.1.2
-REVISION =     2
+VERSION =      1.2
 
 # must be in sync with SO_VERSION in
 # mail/mozilla-thunderbird
-SHARED_LIBS =  enigmime        17.1 \
-               ipc             17.1
+SHARED_LIBS =  enigmime        18.0 \
+               ipc             18.0
 
-MOZAPP_PKGPATH =       mail/mozilla-thunderbird
-MOZAPP_DIR =           mozilla-thunderbird
-MOZAPP_BRANCH =                1.9.2
+MOZAPP_PKGSTEM =       mozilla-thunderbird->=5.0
+MOZAPP_PKGPATH =       mail/mozilla-thunderbird,enigmail
+MOZAPP_DIR =           lib/thunderbird-5.0
+MOZAPP_BRANCH =                miramar
 
 ENIGMAIL_XPI = ${DISTNAME}-openbsd-${GNU_ARCH}.xpi
 
Index: thunderbird/distinfo
===================================================================
RCS file: /cvs/ports/mail/enigmail/thunderbird/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- thunderbird/distinfo        27 Jul 2010 20:18:24 -0000      1.1.1.1
+++ thunderbird/distinfo        22 Jul 2011 05:15:39 -0000
@@ -1,5 +1,5 @@
-MD5 (enigmail-1.1.2.tar.gz) = fTKdXor7uyghTKGZW+sJyQ==
-RMD160 (enigmail-1.1.2.tar.gz) = LB+jSUwcJFhjWj1okpzn/4/bSOc=
-SHA1 (enigmail-1.1.2.tar.gz) = 0p/OKyCjbSELEsKPy77pZQB8lao=
-SHA256 (enigmail-1.1.2.tar.gz) = 3WIG9mIggbWV173nqqj2PKLD+dsqzRPHUcfdlB3vnkE=
-SIZE (enigmail-1.1.2.tar.gz) = 1280923
+MD5 (enigmail-1.2.tar.gz) = +LoVFkrcHA6DKFghRkYa7A==
+RMD160 (enigmail-1.2.tar.gz) = hoxzqihWaJXUtsa5y/RgLXXfCnM=
+SHA1 (enigmail-1.2.tar.gz) = BfuAqZVE+Vv6JTHmzVysjPHnh4A=
+SHA256 (enigmail-1.2.tar.gz) = 5eUWhdCetah70h+AtLZO64111kJLIc/q6nucFnI8nMQ=
+SIZE (enigmail-1.2.tar.gz) = 1326482
Index: thunderbird/pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/enigmail/thunderbird/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- thunderbird/pkg/PLIST       2 Aug 2010 08:45:32 -0000       1.2
+++ thunderbird/pkg/PLIST       22 Jul 2011 05:15:39 -0000
@@ -2,25 +2,32 @@
 @conflict enigmail-<=1.0.1
 @pkgpath mail/enigmail,main
 @pkgpath mail/enigmail
-mozilla-thunderbird/extensions/${GUID}/
-mozilla-thunderbird/extensions/${GUID}/chrome/
-mozilla-thunderbird/extensions/${GUID}/chrome.manifest
-mozilla-thunderbird/extensions/${GUID}/chrome/enigmail.jar
-mozilla-thunderbird/extensions/${GUID}/components/
-mozilla-thunderbird/extensions/${GUID}/components/enigMsgCompFields.js
-mozilla-thunderbird/extensions/${GUID}/components/enigmail.js
-mozilla-thunderbird/extensions/${GUID}/components/enigmail.xpt
-mozilla-thunderbird/extensions/${GUID}/components/enigmime.xpt
-mozilla-thunderbird/extensions/${GUID}/components/enigprefs-service.js
-mozilla-thunderbird/extensions/${GUID}/components/ipc.xpt
-@lib 
mozilla-thunderbird/extensions/${GUID}/components/libenigmime.so.${LIBenigmime_VERSION}
-@lib 
mozilla-thunderbird/extensions/${GUID}/components/libipc.so.${LIBipc_VERSION}
-mozilla-thunderbird/extensions/${GUID}/defaults/
-mozilla-thunderbird/extensions/${GUID}/defaults/pref/
-mozilla-thunderbird/extensions/${GUID}/defaults/pref/enigmail.js
-mozilla-thunderbird/extensions/${GUID}/defaults/preferences/
-mozilla-thunderbird/extensions/${GUID}/defaults/preferences/enigmail.js
-mozilla-thunderbird/extensions/${GUID}/install.rdf
-mozilla-thunderbird/extensions/${GUID}/wrappers/
-mozilla-thunderbird/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
-mozilla-thunderbird/extensions/${GUID}/wrappers/gpg-wrapper.sh
+lib/thunderbird-5.0/extensions/${GUID}/
+lib/thunderbird-5.0/extensions/${GUID}/chrome/
+lib/thunderbird-5.0/extensions/${GUID}/chrome.manifest
+lib/thunderbird-5.0/extensions/${GUID}/chrome/enigmail.jar
+lib/thunderbird-5.0/extensions/${GUID}/components/
+lib/thunderbird-5.0/extensions/${GUID}/components/enigMsgCompFields.js
+lib/thunderbird-5.0/extensions/${GUID}/components/enigmail.js
+lib/thunderbird-5.0/extensions/${GUID}/components/enigmail.xpt
+lib/thunderbird-5.0/extensions/${GUID}/components/enigmime.xpt
+lib/thunderbird-5.0/extensions/${GUID}/components/enigprefs-service.js
+lib/thunderbird-5.0/extensions/${GUID}/components/ipc.xpt
+lib/thunderbird-5.0/extensions/${GUID}/defaults/
+lib/thunderbird-5.0/extensions/${GUID}/defaults/pref/
+lib/thunderbird-5.0/extensions/${GUID}/defaults/pref/enigmail.js
+lib/thunderbird-5.0/extensions/${GUID}/defaults/preferences/
+lib/thunderbird-5.0/extensions/${GUID}/defaults/preferences/enigmail.js
+lib/thunderbird-5.0/extensions/${GUID}/install.rdf
+lib/thunderbird-5.0/extensions/${GUID}/modules/
+lib/thunderbird-5.0/extensions/${GUID}/modules/commonFuncs.jsm
+lib/thunderbird-5.0/extensions/${GUID}/modules/enigmailCommon.jsm
+lib/thunderbird-5.0/extensions/${GUID}/modules/subprocess.jsm
+lib/thunderbird-5.0/extensions/${GUID}/platform/
+lib/thunderbird-5.0/extensions/${GUID}/platform/OpenBSD/
+lib/thunderbird-5.0/extensions/${GUID}/platform/OpenBSD/components/
+@lib 
lib/thunderbird-5.0/extensions/${GUID}/platform/OpenBSD/components/libenigmime.so.${LIBenigmime_VERSION}
+@lib 
lib/thunderbird-5.0/extensions/${GUID}/platform/OpenBSD/components/libipc.so.${LIBipc_VERSION}
+lib/thunderbird-5.0/extensions/${GUID}/wrappers/
+lib/thunderbird-5.0/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
+lib/thunderbird-5.0/extensions/${GUID}/wrappers/gpg-wrapper.sh

Reply via email to