Sun Aug 2 21:22:29 2020 UTC ()
avrdude: only need texi2html & makeinfo when building w/ docs


(tnn)
diff -r1.48 -r1.49 pkgsrc/cross/avrdude/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/cross/avrdude/Makefile (switch to unified diff)

--- pkgsrc/cross/avrdude/Makefile 2020/08/02 21:20:33 1.48
+++ pkgsrc/cross/avrdude/Makefile 2020/08/02 21:22:29 1.49
@@ -1,68 +1,69 @@ @@ -1,68 +1,69 @@
1# $NetBSD: Makefile,v 1.48 2020/08/02 21:20:33 tnn Exp $ 1# $NetBSD: Makefile,v 1.49 2020/08/02 21:22:29 tnn Exp $
2 2
3DISTNAME= avrdude-6.3 3DISTNAME= avrdude-6.3
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= cross 5CATEGORIES= cross
6MASTER_SITES= http://download.savannah.gnu.org/releases/avrdude/ 6MASTER_SITES= http://download.savannah.gnu.org/releases/avrdude/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.nongnu.org/avrdude/ 9HOMEPAGE= https://www.nongnu.org/avrdude/
10COMMENT= Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers 10COMMENT= Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17TEXINFO_REQD= 4.9 17USE_TOOLS+= autoconf automake autoreconf lex yacc
18USE_TOOLS+= autoconf automake autoreconf lex makeinfo texi2html yacc 
19# Upstream does not documentat that GNU make is required, but BSD make 18# Upstream does not documentat that GNU make is required, but BSD make
20# leads to inexplicable errors about libavrdude. 19# leads to inexplicable errors about libavrdude.
21# \todo Resolve and/or discuss with upstream. 20# \todo Resolve and/or discuss with upstream.
22USE_TOOLS+= gmake 21USE_TOOLS+= gmake
23USE_LIBTOOL= yes 22USE_LIBTOOL= yes
24INFO_FILES= yes 23INFO_FILES= yes
25EGDIR= ${PREFIX}/share/examples/avrdude 24EGDIR= ${PREFIX}/share/examples/avrdude
26CONF_FILES_PERMS= ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \ 25CONF_FILES_PERMS= ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \
27 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 26 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
28 27
29PKG_OPTIONS_VAR= PKG_OPTIONS.avrdude 28PKG_OPTIONS_VAR= PKG_OPTIONS.avrdude
30PKG_SUPPORTED_OPTIONS= doc 29PKG_SUPPORTED_OPTIONS= doc
31PKG_SUGGESTED_OPTIONS= doc 30PKG_SUGGESTED_OPTIONS= doc
32 31
33.include "../../mk/bsd.options.mk" 32.include "../../mk/bsd.options.mk"
34 33
35PLIST_VARS+= doc 34PLIST_VARS+= doc
36.if !empty(PKG_OPTIONS:Mdoc) 35.if !empty(PKG_OPTIONS:Mdoc)
37PLIST.doc= yes 36PLIST.doc= yes
 37TEXINFO_REQD= 4.9
 38USE_TOOLS+= texi2html makeinfo
38BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk 39BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
39BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts 40BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
40BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex 41BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
41# DragonFly has stripped makeinfo in the base - without texi2dvi. 42# DragonFly has stripped makeinfo in the base - without texi2dvi.
42. if ${OPSYS} == "DragonFly" 43. if ${OPSYS} == "DragonFly"
43BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo 44BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
44. endif 45. endif
45CONFIGURE_ARGS+= --enable-doc 46CONFIGURE_ARGS+= --enable-doc
46.else 47.else
47CONFIGURE_ARGS+= --disable-doc 48CONFIGURE_ARGS+= --disable-doc
48.endif 49.endif
49 50
50CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 51CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
51CONFIGURE_ENV+= DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE} 52CONFIGURE_ENV+= DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE}
52PLIST_SUBST+= DISTNAME=${DISTNAME} 53PLIST_SUBST+= DISTNAME=${DISTNAME}
53 54
54# The autotools used by this pkg are older than what's in pkgsrc 55# The autotools used by this pkg are older than what's in pkgsrc
55# currently. This makes the diffs huge. 56# currently. This makes the diffs huge.
56pre-configure: 57pre-configure:
57 cd ${WRKSRC} && autoreconf -vif 58 cd ${WRKSRC} && autoreconf -vif
58 59
59 60
60.include "../../devel/libftdi/buildlink3.mk" 61.include "../../devel/libftdi/buildlink3.mk"
61.include "../../devel/libhid/buildlink3.mk" 62.include "../../devel/libhid/buildlink3.mk"
62.include "../../devel/libftdi1/buildlink3.mk" 63.include "../../devel/libftdi1/buildlink3.mk"
63.include "../../mk/libusb.buildlink3.mk" 64.include "../../mk/libusb.buildlink3.mk"
64.include "../../devel/libusb1/buildlink3.mk" 65.include "../../devel/libusb1/buildlink3.mk"
65# elf_getshdrstrndx 66# elf_getshdrstrndx
66.include "../../devel/libelf/buildlink3.mk" 67.include "../../devel/libelf/buildlink3.mk"
67.include "../../devel/readline/buildlink3.mk" 68.include "../../devel/readline/buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 69.include "../../mk/bsd.pkg.mk"