tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: thunderbird-enigmail



On 04.06.2015 15:41, Tobias Nygren wrote:
> On Thu, 4 Jun 2015 16:59:12 +0200
> Thomas Klausner <wiz%NetBSD.org@localhost> wrote:
> 
>> On Thu, Jun 04, 2015 at 02:46:32PM +0000, Kamil Rytarowski wrote:
>>> I can also try to upgrade the enigmail option of mail/thunderbird with
>>> wip/thunderbird-enigmail. What do you think?
>>
>> I think a separate package is better, since we can only build
>> thunderbird with the option enabled or disabled, but we can build both
>> of these packages and choose at install time what we want.
> 
> Agreed, I prefer the separate package only.
> 
> The reason it was done with an option is that it wasn't previously
> possible to build outside of the thunderbird source directory due to
> dependencies on internal generated headers. (This may still be the case
> for the calendar plugin.)
> 

I'm attaching a file to remove the enigmail from mail/thunderbird and
www/seamonkey.

Please review and apply.

wip/thunderbird-enigmail and wip/seamonkey-enigmail will replace it.
Index: mail/thunderbird/Makefile
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/mail/thunderbird/Makefile,v
retrieving revision 1.151
diff -u -r1.151 Makefile
--- mail/thunderbird/Makefile	26 May 2015 12:34:42 -0000	1.151
+++ mail/thunderbird/Makefile	4 Jun 2015 16:33:09 -0000
@@ -34,7 +34,6 @@
 #SUBST_CLASSES+=			ext-compat
 #SUBST_STAGE.ext-compat=		pre-configure
 #SUBST_MESSAGE.ext-compat=	Fixing extension compatibility
-#SUBST_FILES.ext-compat=		mailnews/extensions/enigmail/package/install.rdf
 #SUBST_FILES.ext-compat+=	calendar/*/install.rdf
 #SUBST_FILES.ext-compat+=	calendar/*/*/install.rdf
 #SUBST_SED.ext-compat=		-e 's,\(<em:maxVersion>\).*<,\19.0<,g'
Index: mail/thunderbird/PLIST.enigmail
===================================================================
RCS file: mail/thunderbird/PLIST.enigmail
diff -N mail/thunderbird/PLIST.enigmail
--- mail/thunderbird/PLIST.enigmail	30 Nov 2014 10:23:29 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST.enigmail,v 1.14 2014/11/30 10:23:29 markd Exp $
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.xpt
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeDecrypt.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeEncrypt.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/gpgAgentHandler.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/installGnuPG.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeVerify.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${MACHINE_ARCH}-gcc3/lib/libsubprocess-${MACHINE_ARCH}-gcc3.so
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
Index: mail/thunderbird/distinfo
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/mail/thunderbird/distinfo,v
retrieving revision 1.158
diff -u -r1.158 distinfo
--- mail/thunderbird/distinfo	26 May 2015 12:34:42 -0000	1.158
+++ mail/thunderbird/distinfo	4 Jun 2015 16:42:06 -0000
@@ -1,8 +1,5 @@
 $NetBSD: distinfo,v 1.158 2015/05/26 12:34:42 ryoon Exp $
 
-SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f
-RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7
-Size (enigmail-1.7.2.tar.gz) = 1420346 bytes
 SHA1 (thunderbird-31.7.0.source.tar.bz2) = 90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede
 RMD160 (thunderbird-31.7.0.source.tar.bz2) = eae13adba96477ddaa3fa7732d94accdc8dab57f
 Size (thunderbird-31.7.0.source.tar.bz2) = 171059989 bytes
Index: mail/thunderbird/enigmail.mk
===================================================================
RCS file: mail/thunderbird/enigmail.mk
diff -N mail/thunderbird/enigmail.mk
--- mail/thunderbird/enigmail.mk	14 Mar 2015 23:02:52 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-# $NetBSD: enigmail.mk,v 1.14 2015/03/14 23:02:52 tnn Exp $
-#
-# This Makefile fragment hooks the Enigmail OpenPGP extension
-# (see http://www.mozilla-enigmail.org/ ) into the build.
-
-ENIGMAIL_DIST=		enigmail-1.7.2.tar.gz
-XPI_FILES+=		${WRKDIR}/enigmail.xpi
-.if !defined(DISTFILES)
-DISTFILES=		${DEFAULT_DISTFILES}
-.endif
-DISTFILES+=		${ENIGMAIL_DIST}
-SITES.${ENIGMAIL_DIST}=	http://www.mozilla-enigmail.org/download/source/
-
-REPLACE_PERL+=		mailnews/extensions/enigmail/util/fixlang.pl
-
-DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
-PLIST_SRC+=		PLIST.enigmail
-
-TARGET_XPCOM_ABI=	${MACHINE_ARCH:S/i386/x86/}-gcc3
-PLIST_SUBST+=		TARGET_XPCOM_ABI=${TARGET_XPCOM_ABI}
-
-post-extract: enigmail-post-extract
-.PHONY: enigmail-post-extract
-enigmail-post-extract:
-	${RUN} mv ${WRKDIR}/enigmail ${WRKSRC}/mailnews/extensions/
-	${RUN} cd ${WRKSRC} && \
-		${PATCH} < ${FILESDIR}/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
-	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail && \
-		${PATCH} -p1 < ${FILESDIR}/patch-ipc_src_Makefile
-
-post-configure: enigmail-post-configure
-.PHONY: enigmail-post-configure
-enigmail-post-configure:
-	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail &&		\
-	  ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
-
-# We need to do a switcheroo of the dist directory while building enigmail;
-# otherwise we get extra files contamination in the PLIST.
-post-build: enigmail-post-build
-.PHONY: enigmail-post-build
-enigmail-post-build:
-	${RUN} cd ${WRKSRC}/${OBJDIR}/mozilla/dist && pax -rwpe . ../dist.save
-	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail &&		\
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} &&			\
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
-	${CP} ${WRKSRC}/mailnews/extensions/enigmail/build/enigmail*.xpi\
-	  ${WRKDIR}/enigmail.xpi
-#	${RUN} rm -rf ${WRKSRC}/mozilla/dist
-#	${RUN} cd ${WRKSRC}/mozilla/dist.save && pax -rwpe . ../dist
Index: mail/thunderbird/options.mk
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/mail/thunderbird/options.mk,v
retrieving revision 1.15
diff -u -r1.15 options.mk
--- mail/thunderbird/options.mk	11 Sep 2014 13:47:46 -0000	1.15
+++ mail/thunderbird/options.mk	4 Jun 2015 16:33:50 -0000
@@ -3,7 +3,7 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc gnome \
 			official-mozilla-branding pulseaudio \
-			mozilla-lightning mozilla-enigmail
+			mozilla-lightning
 PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
 PLIST_VARS+=		branding nobranding debug gnome jemalloc
@@ -66,10 +66,6 @@
 CONFIGURE_ARGS+=	--disable-calendar
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)
-.include "enigmail.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 CONFIGURE_ARGS+=	--enable-official-branding
 PLIST.branding=		yes
Index: mail/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
===================================================================
RCS file: mail/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
diff -N mail/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
--- mail/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm	27 Jul 2014 20:04:59 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: mailnews_extensions_enigmail_ipc_modules_subprocess.jsm,v 1.2 2014/07/27 20:04:59 ryoon Exp $
-
---- mailnews/extensions/enigmail/ipc/modules/subprocess.jsm.orig	2014-07-12 12:52:08.000000000 +0000
-+++ mailnews/extensions/enigmail/ipc/modules/subprocess.jsm
-@@ -338,8 +338,10 @@ function getPlatformValue(valueType) {
-         //            library name   O_NONBLOCK RLIM_T                RLIMIT_NOFILE
-         'darwin':  [ 'libc.dylib',   0x04     , ctypes.uint64_t     , 8 ],
-         'linux':   [ 'libc.so.6',    2024     , ctypes.unsigned_long, 7 ],
-+        'dragonfly': [ 'libc.so',    0x04     , ctypes.int64_t      , 8 ],
-         'freebsd': [ 'libc.so.7',    0x04     , ctypes.int64_t      , 8 ],
-         'gnu/kfreebsd': [ 'libc.so.0.1', 0x04 , ctypes.int64_t      , 8 ],
-+        'netbsd': [ 'libc.so', 0x04     , ctypes.int64_t      , 8 ],
-         'openbsd': [ 'libc.so.61.0', 0x04     , ctypes.int64_t      , 8 ],
-         'sunos':   [ 'libc.so',      0x80     , ctypes.unsigned_long, 5 ]
-     };
Index: www/seamonkey/PLIST.enigmail
===================================================================
RCS file: www/seamonkey/PLIST.enigmail
diff -N www/seamonkey/PLIST.enigmail
--- www/seamonkey/PLIST.enigmail	26 Mar 2015 20:41:53 -0000	1.11
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST.enigmail,v 1.11 2015/03/26 20:41:53 ryoon Exp $
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.xpt
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeDecrypt.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeEncrypt.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailConvert.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCore.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/fixExchangeMsg.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/gpgAgentHandler.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/installGnuPG.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeVerify.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/passwordCheck.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${TARGET_XPCOM_ABI}/lib/libsubprocess-${TARGET_XPCOM_ABI}.so
-lib/seamonkey/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
Index: www/seamonkey/distinfo
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/www/seamonkey/distinfo,v
retrieving revision 1.121
diff -u -r1.121 distinfo
--- www/seamonkey/distinfo	26 Mar 2015 20:41:53 -0000	1.121
+++ www/seamonkey/distinfo	4 Jun 2015 16:39:19 -0000
@@ -1,8 +1,5 @@
 $NetBSD: distinfo,v 1.121 2015/03/26 20:41:53 ryoon Exp $
 
-SHA1 (enigmail-1.8.1.tar.gz) = 2ddd71a752c8cfc0b110c9a05bddf16b4d5b59db
-RMD160 (enigmail-1.8.1.tar.gz) = 2c4c53d02901198f1111f47f31f5d7721e19fd5b
-Size (enigmail-1.8.1.tar.gz) = 1592706 bytes
 SHA1 (seamonkey-2.33.1.source.tar.bz2) = f50a8ca1590a046dbdcf5d33396b9d4c2a5bc2a9
 RMD160 (seamonkey-2.33.1.source.tar.bz2) = d454b105854dbb31f5811cc036ffc48807a5652a
 Size (seamonkey-2.33.1.source.tar.bz2) = 203015246 bytes
Index: www/seamonkey/enigmail.mk
===================================================================
RCS file: www/seamonkey/enigmail.mk
diff -N www/seamonkey/enigmail.mk
--- www/seamonkey/enigmail.mk	28 Mar 2015 22:12:27 -0000	1.17
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-# $NetBSD: enigmail.mk,v 1.17 2015/03/28 22:12:27 ryoon Exp $
-#
-# This Makefile fragment hooks the Enigmail OpenPGP extension
-# (see http://www.mozilla-enigmail.org/ ) into the build.
-
-ENIGMAIL_DIST=		enigmail-1.8.1.tar.gz
-XPI_FILES+=		${WRKDIR}/enigmail.xpi
-.if !defined(DISTFILES)
-DISTFILES=		${DEFAULT_DISTFILES}
-.endif
-DISTFILES+=		${ENIGMAIL_DIST}
-SITES.${ENIGMAIL_DIST}=	http://www.mozilla-enigmail.org/download/source/
-#SITES.${ENIGMAIL_DIST}=	https://dev.gentoo.org/~polynomial-c/mozilla/
-
-DEPENDS+=		gnupg2-[0-9]*:../../security/gnupg2
-FIND_PREFIX:=		GNUPG2DIR=gnupg2
-.include "../../mk/find-prefix.mk"
-
-PLIST_SRC+=		PLIST.enigmail
-
-TARGET_XPCOM_ABI=	${MACHINE_ARCH:S/i386/x86/}-gcc3
-PLIST_SUBST+=		TARGET_XPCOM_ABI=${TARGET_XPCOM_ABI}
-
-USE_TOOLS+=		patch pax
-
-REPLACE_PERL+=		${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/util/fixlang.pl
-
-SUBST_CLASSES+=		gpg2
-SUBST_STAGE.gpg2=	pre-configure
-SUBST_MESSAGE.gpg2=	Setting GnuPG2 command
-SUBST_FILES.gpg2+=	${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/package/prefs/enigmail.js
-SUBST_SED.gpg2+=          -e 's|"extensions.enigmail.agentPath","|"extensions.enigmail.agentPath","${GNUPG2DIR}/bin/gpg2"|'
-
-post-extract: enigmail-post-extract
-.PHONY: enigmail-post-extract
-enigmail-post-extract:
-	${RUN} mkdir ${WRKSRC}/${OBJDIR}/mailnews/extensions
-	${RUN} mv ${WRKDIR}/enigmail ${WRKSRC}/${OBJDIR}/mailnews/extensions
-	${RUN} cd ${WRKSRC}/${OBJDIR} && \
-		${PATCH} < ${FILESDIR}/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm && \
-		${PATCH} < ${FILESDIR}/patch-mailnews_extensions_enigmail_Makefile
-
-post-configure: enigmail-post-configure
-.PHONY: enigmail-post-configure
-enigmail-post-configure:
-	cd ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail && \
-		${SETENV} ${CONFIGURE_ENV} \
-		./configure --prefix=${PREFIX}
-
-# We need to do a switcheroo of the dist directory while building enigmail;
-# otherwise we get extra files contamination in the PLIST.
-post-build: enigmail-post-build
-.PHONY: enigmail-post-build
-enigmail-post-build:
-	rm -rf ${WRKSRC}/${OBJDIR}/mozilla/dist.save
-	cd ${WRKSRC}/${OBJDIR}/dist && pax -rwpe . ../dist.save
-	cd ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all xpi
-	${CP} ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/build/enigmail*.xpi \
-	  ${WRKDIR}/enigmail.xpi
-	rm -rf ${WRKSRC}/${OBJDIR}/dist
-	cd ${WRKSRC}/${OBJDIR}/dist.save && pax -rwpe . ../dist
Index: www/seamonkey/options.mk
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/www/seamonkey/options.mk,v
retrieving revision 1.31
diff -u -r1.31 options.mk
--- www/seamonkey/options.mk	17 Mar 2015 19:50:42 -0000	1.31
+++ www/seamonkey/options.mk	4 Jun 2015 16:36:16 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.31 2015/03/17 19:50:42 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.seamonkey
-PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc mozilla-enigmail # gnome
+PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc # gnome
 PKG_SUPPORTED_OPTIONS+=	mozilla-lightning webrtc mozilla-chatzilla pulseaudio
 
 PLIST_VARS+=	debug gnome jemalloc
@@ -62,10 +62,6 @@
 CONFIGURE_ARGS+=	--enable-install-strip
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)
-.include "enigmail.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mmozilla-lightning)
 CONFIGURE_ARGS+=	--enable-calendar
 PLIST_SRC+=		PLIST.lightning
Index: www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
===================================================================
RCS file: www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
diff -N www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
--- www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm	26 Mar 2015 20:41:53 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$NetBSD: mailnews_extensions_enigmail_ipc_modules_subprocess.jsm,v 1.3 2015/03/26 20:41:53 ryoon Exp $
-
---- mailnews/extensions/enigmail/ipc/modules/subprocess.jsm.orig	2015-03-23 16:38:43.000000000 +0000
-+++ mailnews/extensions/enigmail/ipc/modules/subprocess.jsm
-@@ -341,6 +341,7 @@ function getPlatformValue(valueType) {
-         'freebsd': [ 'libc.so.7',    0x04     , ctypes.int64_t      , 8 ],
-         'dragonfly':[ 'libc.so.8',   0x04,    , ctypes.int64_t      , 8 ],
-         'gnu/kfreebsd': [ 'libc.so.0.1', 0x04 , ctypes.int64_t      , 8 ],
-+        'netbsd':  [ 'libc.so',      0x04     , ctypes.int64_t      , 8 ],
-         'openbsd': [ 'libc.so.61.0', 0x04     , ctypes.int64_t      , 8 ],
-         'sunos':   [ 'libc.so',      0x80     , ctypes.unsigned_long, 5 ]
-     };
Index: www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile
===================================================================
RCS file: www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile
diff -N www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile
--- www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile	30 Mar 2014 04:13:17 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-mailnews_extensions_enigmail_Makefile,v 1.1 2014/03/30 04:13:17 ryoon Exp $
-
---- mailnews/extensions/enigmail/Makefile.orig	2014-01-12 13:08:29.000000000 +0000
-+++ mailnews/extensions/enigmail/Makefile
-@@ -36,10 +36,18 @@ ifeq ($(OS_TARGET),Darwin)
- PLATFORM_STR = darwin
- endif
- 
-+ifeq ($(OS_TARGET),DragonFly)
-+PLATFORM_STR = dragonfly
-+endif
-+
- ifeq ($(OS_TARGET),FreeBSD)
- PLATFORM_STR = freebsd
- endif
- 
-+ifeq ($(OS_TARGET),NetBSD)
-+PLATFORM_STR = netbsd
-+endif
-+
- ifeq ($(OS_TARGET),OpenBSD)
- PLATFORM_STR = openbsd
- endif


Home | Main Index | Thread Index | Old Index