[pkgsrc/trunk]: pkgsrc/mail/thunderbird-enigmail thunderbird-enigmail: merge ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f70ce4bb5be5
branches:  trunk
changeset: 401255:f70ce4bb5be5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 13 17:20:41 2019 +0000

description:
thunderbird-enigmail: merge Makefile.common into Makefile

No other user of Makefile.common left.

diffstat:

 mail/thunderbird-enigmail/Makefile        |  49 +++++++++++++++++++++++++++--
 mail/thunderbird-enigmail/Makefile.common |  51 -------------------------------
 2 files changed, 45 insertions(+), 55 deletions(-)

diffs (120 lines):

diff -r db107b79d659 -r f70ce4bb5be5 mail/thunderbird-enigmail/Makefile
--- a/mail/thunderbird-enigmail/Makefile        Fri Sep 13 15:48:50 2019 +0000
+++ b/mail/thunderbird-enigmail/Makefile        Fri Sep 13 17:20:41 2019 +0000
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:21:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/09/13 17:20:41 wiz Exp $
 
-PKGREVISION= 1
-.include "Makefile.common"
+DISTNAME=      enigmail-2.0.12
+PKGNAME=       thunderbird-${DISTNAME}
+PKGREVISION=   1
+CATEGORIES=    mail security
+MASTER_SITES=  http://www.enigmail.net/download/source/
 
-PKGNAME=       thunderbird-${DISTNAME}
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.enigmail.net/
 COMMENT=       GnuPG support for mail/thunderbird
+LICENSE=       (mpl-1.1 OR gnu-gpl-v2 OR gnu-lgpl-v2.1) AND mpl-2.0
 
 # Minimal requirements are here: https://www.enigmail.net/download/source.php
 DEPENDS+=              thunderbird>=38:../../mail/thunderbird
@@ -13,4 +17,41 @@
 # Path used during the install stage
 XPIDIR=                ${PREFIX}/lib/thunderbird/extensions
 
+USE_TOOLS+=    gmake perl sed unzip zip
+
+# It doesn't work -- noted also here:
+# https://aur.archlinux.org/packages/th/thunderbird-enigmail/PKGBUILD
+MAKE_JOBS_SAFE=        no
+
+DEPENDS+=              gnupg2>=2.0.7:../../security/gnupg2
+DEPENDS+=              pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
+
+REPLACE_PERL+= util/fixlang.pl
+REPLACE_PERL+= util/make-lang-xpi.pl
+
+PYTHON_VERSIONS_ACCEPTED=       27 # as of 1.8.2
+REPLACE_PYTHON+=       util/checkFiles.py
+REPLACE_PYTHON+=       util/header.py
+REPLACE_PYTHON+=       util/typelib.py
+REPLACE_PYTHON+=       util/header.py
+REPLACE_PYTHON+=       util/xpidl.py
+REPLACE_PYTHON+=       util/xpt.py
+
+WRKSRC=                ${WRKDIR}/enigmail
+GNU_CONFIGURE= yes
+
+ENIGMAILXPI=   enigmail-${PKGVERSION_NOREV}.xpi
+XPIFILE=       ${WRKSRC}/build/${ENIGMAILXPI}
+
+# Build instructions: https://www.enigmail.net/download/build_instructions.php
+# Installation of extensions: http://kb.mozillazine.org/Installing_extensions
+# Model installation: https://aur.archlinux.org/packages/th/thunderbird-enigmail/PKGBUILD
+do-install:
+       ${RUN} EMID=`${SED} -n '/.*<em:id>\\(.*\\)<\\/em:id>.*/{s//\\1/p;q;}' \
+               ${WRKSRC}/package/install.rdf` && \
+               ${INSTALL_DATA_DIR} ${DESTDIR}${XPIDIR}/"$$EMID" && \
+               unzip -d ${DESTDIR}${XPIDIR}/"$$EMID" \
+               ${XPIFILE}
+
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r db107b79d659 -r f70ce4bb5be5 mail/thunderbird-enigmail/Makefile.common
--- a/mail/thunderbird-enigmail/Makefile.common Fri Sep 13 15:48:50 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile.common,v 1.27 2019/09/13 12:57:54 nia Exp $
-#
-# used by mail/thunderbird-enigmail/Makefile
-
-DISTNAME=      enigmail-2.0.12
-CATEGORIES=    mail security
-MASTER_SITES=  http://www.enigmail.net/download/source/
-
-HOMEPAGE=      https://www.enigmail.net/
-LICENSE=       (mpl-1.1 OR gnu-gpl-v2 OR gnu-lgpl-v2.1) AND mpl-2.0
-
-USE_TOOLS+=    gmake perl sed unzip zip
-
-# It doesn't work -- noted also here:
-# https://aur.archlinux.org/packages/th/thunderbird-enigmail/PKGBUILD
-MAKE_JOBS_SAFE=        no
-
-DEPENDS+=              gnupg2>=2.0.7:../../security/gnupg2
-DEPENDS+=              pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
-
-DISTINFO_FILE= ${.CURDIR}/../../mail/thunderbird-enigmail/distinfo
-#PATCHDIR=     ${.CURDIR}/../../mail/thunderbird-enigmail/patches
-
-REPLACE_PERL+= util/fixlang.pl
-REPLACE_PERL+= util/make-lang-xpi.pl
-
-PYTHON_VERSIONS_ACCEPTED=       27 # as of 1.8.2
-REPLACE_PYTHON+=       util/checkFiles.py
-REPLACE_PYTHON+=       util/header.py
-REPLACE_PYTHON+=       util/typelib.py
-REPLACE_PYTHON+=       util/header.py
-REPLACE_PYTHON+=       util/xpidl.py
-REPLACE_PYTHON+=       util/xpt.py
-
-WRKSRC=                ${WRKDIR}/enigmail
-GNU_CONFIGURE= yes
-
-ENIGMAILXPI=   enigmail-${PKGVERSION_NOREV}.xpi
-XPIFILE=       ${WRKSRC}/build/${ENIGMAILXPI}
-
-# Build instructions: https://www.enigmail.net/download/build_instructions.php
-# Installation of extensions: http://kb.mozillazine.org/Installing_extensions
-# Model installation: https://aur.archlinux.org/packages/th/thunderbird-enigmail/PKGBUILD
-do-install:
-       ${RUN} EMID=`${SED} -n '/.*<em:id>\\(.*\\)<\\/em:id>.*/{s//\\1/p;q;}' \
-               ${WRKSRC}/package/install.rdf` && \
-               ${INSTALL_DATA_DIR} ${DESTDIR}${XPIDIR}/"$$EMID" && \
-               unzip -d ${DESTDIR}${XPIDIR}/"$$EMID" \
-               ${XPIFILE}
-
-.include "../../lang/python/application.mk"