CVS commit: pkgsrc/cross/avrdude

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug  2 21:20:33 UTC 2020

Modified Files:
        pkgsrc/cross/avrdude: Makefile PLIST

Log Message:
avrdude: make docs optional (TeX is quite heavy dependency)


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/cross/avrdude/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/cross/avrdude/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cross/avrdude/Makefile
diff -u pkgsrc/cross/avrdude/Makefile:1.47 pkgsrc/cross/avrdude/Makefile:1.48
--- pkgsrc/cross/avrdude/Makefile:1.47  Sat Jan 18 23:30:15 2020
+++ pkgsrc/cross/avrdude/Makefile       Sun Aug  2 21:20:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2020/01/18 23:30:15 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2020/08/02 21:20:33 tnn Exp $
 
 DISTNAME=              avrdude-6.3
 PKGREVISION=           2
@@ -10,9 +10,6 @@ HOMEPAGE=             https://www.nongnu.org/avrdud
 COMMENT=               Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
 LICENSE=               gnu-gpl-v2
 
-BUILD_DEPENDS+=                dvipsk-[0-9]*:../../print/dvipsk
-BUILD_DEPENDS+=                tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
-BUILD_DEPENDS+=                tex-pdftex-[0-9]*:../../print/tex-pdftex
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,7 +26,27 @@ EGDIR=                       ${PREFIX}/share/examples/avrdud
 CONF_FILES_PERMS=      ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \
                        ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
 
+PKG_OPTIONS_VAR=               PKG_OPTIONS.avrdude
+PKG_SUPPORTED_OPTIONS=         doc
+PKG_SUGGESTED_OPTIONS=         doc
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           doc
+.if !empty(PKG_OPTIONS:Mdoc)
+PLIST.doc=             yes
+BUILD_DEPENDS+=                dvipsk-[0-9]*:../../print/dvipsk
+BUILD_DEPENDS+=                tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
+BUILD_DEPENDS+=                tex-pdftex-[0-9]*:../../print/tex-pdftex
+# DragonFly has stripped makeinfo in the base - without texi2dvi.
+.  if ${OPSYS} == "DragonFly"
+BUILD_DEPENDS+=                gtexinfo-[0-9]*:../../devel/gtexinfo
+.  endif
 CONFIGURE_ARGS+=       --enable-doc
+.else
+CONFIGURE_ARGS+=       --disable-doc
+.endif
+
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=                DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE}
 PLIST_SUBST+=          DISTNAME=${DISTNAME}
@@ -39,10 +56,6 @@ PLIST_SUBST+=                DISTNAME=${DISTNAME}
 pre-configure:
        cd ${WRKSRC} && autoreconf -vif
 
-# DragonFly has stripped makeinfo in the base - without texi2dvi.
-.if ${OPSYS} == "DragonFly"
-BUILD_DEPENDS+=                gtexinfo-[0-9]*:../../devel/gtexinfo
-.endif
 
 .include "../../devel/libftdi/buildlink3.mk"
 .include "../../devel/libhid/buildlink3.mk"

Index: pkgsrc/cross/avrdude/PLIST
diff -u pkgsrc/cross/avrdude/PLIST:1.11 pkgsrc/cross/avrdude/PLIST:1.12
--- pkgsrc/cross/avrdude/PLIST:1.11     Sun Jan 29 02:24:54 2017
+++ pkgsrc/cross/avrdude/PLIST  Sun Aug  2 21:20:33 2020
@@ -1,32 +1,32 @@
-@comment $NetBSD: PLIST,v 1.11 2017/01/29 02:24:54 mef Exp $
+@comment $NetBSD: PLIST,v 1.12 2020/08/02 21:20:33 tnn Exp $
 bin/avrdude
 include/libavrdude.h
-info/avrdude.info
+${PLIST.doc}info/avrdude.info
 lib/libavrdude.la
 man/man1/avrdude.1
-share/doc/${DISTNAME}/avrdude-html/avrdude.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_1.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_10.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_11.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_12.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_13.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_14.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_15.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_16.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_17.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_18.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_19.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_2.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_20.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_3.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_4.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_5.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_6.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_7.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_8.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_9.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_abt.html
-share/doc/${DISTNAME}/avrdude-html/avrdude_toc.html
-share/doc/${DISTNAME}/avrdude.pdf
-share/doc/${DISTNAME}/avrdude.ps
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_1.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_10.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_11.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_12.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_13.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_14.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_15.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_16.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_17.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_18.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_19.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_2.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_20.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_3.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_4.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_5.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_6.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_7.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_8.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_9.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_abt.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_toc.html
+${PLIST.doc}share/doc/${DISTNAME}/avrdude.pdf
+${PLIST.doc}share/doc/${DISTNAME}/avrdude.ps
 share/examples/avrdude/avrdude.conf