Tue Jun 9 10:18:50 2020 UTC ()
mutt: Depend on mime-types, don't install internal mime.types to SYSCONFDIR


(nia)
diff -r1.228 -r1.229 pkgsrc/mail/mutt/Makefile
cvs diff -r1.228 -r1.229 pkgsrc/mail/mutt/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mutt/Makefile 2020/05/22 10:56:19 1.228
+++ pkgsrc/mail/mutt/Makefile 2020/06/09 10:18:49 1.229
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile,v 1.228 2020/05/22 10:56:19 adam Exp $ 1# $NetBSD: Makefile,v 1.229 2020/06/09 10:18:49 nia Exp $
2 2
3DISTNAME= mutt-1.13.5 3DISTNAME= mutt-1.13.5
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ 6MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/
7 7
8MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
9HOMEPAGE= http://www.mutt.org/ 9HOMEPAGE= http://www.mutt.org/
10COMMENT= Text-based MIME mail client with PGP & S/MIME support 10COMMENT= Text-based MIME mail client with PGP & S/MIME support
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer 11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
12 12
 13DEPENDS+= mime-types-[0-9]*:../../misc/mime-types
 14
13BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
14BUILD_DEPENDS+= lynx-[0-9]*:../../www/lynx 16BUILD_DEPENDS+= lynx-[0-9]*:../../www/lynx
15 17
16.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
17 19
18USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
19USE_TOOLS+= gmake msgfmt perl 21USE_TOOLS+= gmake msgfmt perl
20GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
22CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/mutt 24CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/mutt
23CONFIGURE_ARGS+= --without-included-gettext 25CONFIGURE_ARGS+= --without-included-gettext
24CONFIGURE_ARGS+= --enable-external-dotlock 26CONFIGURE_ARGS+= --enable-external-dotlock
25CONFIGURE_ARGS+= --enable-pop 27CONFIGURE_ARGS+= --enable-pop
@@ -43,27 +45,26 @@ CONFIGURE_ARGS.SunOS+= --without-wc-func @@ -43,27 +45,26 @@ CONFIGURE_ARGS.SunOS+= --without-wc-func
43# there. 45# there.
44# 46#
45.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*) 47.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
46CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh 48CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh
47.endif 49.endif
48 50
49.include "options.mk" 51.include "options.mk"
50 52
51LDFLAGS+= ${_STRIPFLAG_CC} 53LDFLAGS+= ${_STRIPFLAG_CC}
52 54
53DOCDIR= ${PREFIX}/share/doc/mutt 55DOCDIR= ${PREFIX}/share/doc/mutt
54EGDIR= ${PREFIX}/share/examples/mutt 56EGDIR= ${PREFIX}/share/examples/mutt
55CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc 57CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
56CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 
57FILES_SUBST+= DOCDIR=${DOCDIR} 58FILES_SUBST+= DOCDIR=${DOCDIR}
58INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 59INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
59 60
60SUBST_CLASSES+= paths 61SUBST_CLASSES+= paths
61SUBST_FILES.paths= doc/Muttrc 62SUBST_FILES.paths= doc/Muttrc
62SUBST_VARS.paths+= DOCDIR PREFIX 63SUBST_VARS.paths+= DOCDIR PREFIX
63SUBST_STAGE.paths= pre-configure 64SUBST_STAGE.paths= pre-configure
64 65
65SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551 66SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
66INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 67INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
67 68
68.include "../../devel/zlib/buildlink3.mk" 69.include "../../devel/zlib/buildlink3.mk"
69.include "../../converters/libiconv/buildlink3.mk" 70.include "../../converters/libiconv/buildlink3.mk"