avrdude: options.mk away the docs

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: avrdude: options.mk away the docs
From: i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Date: Tue, 26 Jun 2018 14:12:33 +0000
Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Tue Jun 26 15:12:33 2018 +0100
Changeset:	e1d767fec48bdec9fbe0e98ecd86fefd0b45651f

Modified Files:
	avrdude/Makefile
	avrdude/PLIST
	avrdude/distinfo
	avrdude/patches/patch-ae
Added Files:
	avrdude/options.mk

Log Message:
avrdude: options.mk away the docs

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e1d767fec48bdec9fbe0e98ecd86fefd0b45651f

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

diffstat:
 avrdude/Makefile         | 16 +++----------
 avrdude/PLIST            | 60 ++++++++++++++++++++++++++----------------------
 avrdude/distinfo         |  9 ++++----
 avrdude/options.mk       | 27 ++++++++++++++++++++++
 avrdude/patches/patch-ae | 14 +++++------
 5 files changed, 75 insertions(+), 51 deletions(-)

diffs:
diff --git a/avrdude/Makefile b/avrdude/Makefile
index 2f21fd049f..7052f24123 100644
--- a/avrdude/Makefile
+++ b/avrdude/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.6 2015/01/18 07:50:32 makoto Exp $
 
-DISTNAME=		avrdude-6.1
+DISTNAME=		avrdude-6.3
 CATEGORIES=		cross
 MASTER_SITES=		http://download.savannah.gnu.org/releases/avrdude/
 
@@ -9,24 +9,18 @@ HOMEPAGE=		http://www.nongnu.org/avrdude/
 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
-
 # make: make: don't know how to make ./libavrdude.a. Stop
 MAKE_JOBS_SAFE=		no
 
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
-TEXINFO_REQD=		4.9
-USE_TOOLS+=		autoconf automake autoreconf makeinfo texi2html yacc lex
+USE_TOOLS+=		autoconf automake autoreconf
 INFO_FILES=		yes
 EGDIR=			${PREFIX}/share/examples/avrdude
 CONF_FILES_PERMS=	${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \
 			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
 
-CONFIGURE_ARGS+=	--enable-doc
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE:Q}
 PLIST_SUBST+=		DISTNAME=${DISTNAME}
@@ -36,11 +30,7 @@ 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 "options.mk"
 .include "../../devel/libftdi/buildlink3.mk"
 .include "../../devel/libhid/buildlink3.mk"
 .include "../../wip/libftdi1/buildlink3.mk"
diff --git a/avrdude/PLIST b/avrdude/PLIST
index aec97effce..cff1fe81bd 100644
--- a/avrdude/PLIST
+++ b/avrdude/PLIST
@@ -1,30 +1,36 @@
-@comment $NetBSD: PLIST,v 1.2 2015/01/18 07:50:32 makoto Exp $
+@comment $NetBSD$
 bin/avrdude
-info/avrdude.info
+include/libavrdude.h
+lib/libavrdude.a
+lib/libavrdude.la
+lib/libavrdude.so
+lib/libavrdude.so.1
+lib/libavrdude.so.1.0
 man/man1/avrdude.1
-share/doc/${PKGNAME}/avrdude-html/avrdude.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_1.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_10.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_11.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_12.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_13.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_14.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_15.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_16.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_17.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_18.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_19.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_2.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_20.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_3.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_4.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_5.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_6.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_7.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_8.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_9.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_abt.html
-share/doc/${PKGNAME}/avrdude-html/avrdude_toc.html
-share/doc/${PKGNAME}/avrdude.pdf
-share/doc/${PKGNAME}/avrdude.ps
 share/examples/avrdude/avrdude.conf
+${PLIST.doc}info/avrdude.info
+${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
diff --git a/avrdude/distinfo b/avrdude/distinfo
index 2c91ceec4b..039fb99ba7 100644
--- a/avrdude/distinfo
+++ b/avrdude/distinfo
@@ -1,12 +1,13 @@
 $NetBSD: distinfo,v 1.4 2015/01/18 07:50:32 makoto Exp $
 
-SHA1 (avrdude-6.1.tar.gz) = 15525cbff5918568ef3955d871dbb94feaf83c79
-RMD160 (avrdude-6.1.tar.gz) = f2c31951c0941e86ff6deab6bd0348b54d05658c
-Size (avrdude-6.1.tar.gz) = 714595 bytes
+SHA1 (avrdude-6.3.tar.gz) = c6a84df8f6392b671e546efab42dff64e60cfcab
+RMD160 (avrdude-6.3.tar.gz) = 245c20fa6f6be274093f43fa4932295ea47dafaa
+SHA512 (avrdude-6.3.tar.gz) = b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
+Size (avrdude-6.3.tar.gz) = 909744 bytes
 SHA1 (patch-aa) = 619f682af2e8eff36684993b331ba37cd1b446b6
 SHA1 (patch-ab) = a9105ae562c078eec5c87df6e7f27a80184bb6d4
 SHA1 (patch-ac) = df871808200e5732f77d50ef2d7fb51234173445
 SHA1 (patch-ad) = f9e7465b355f5b3feda8868287d6aaa5cd1dcd28
-SHA1 (patch-ae) = 4ad74b5abe90ddf29dd419043a2e6026f704d1c9
+SHA1 (patch-ae) = 8268734c36c02dfded64addba99e542747e746c7
 SHA1 (patch-af) = 4ae54ce739ff41964fe56bc1b3e85611288a6e0c
 SHA1 (patch-fileio_c) = d0c01ae237bc5df0fd76d2362160d6946ef04846
diff --git a/avrdude/options.mk b/avrdude/options.mk
new file mode 100644
index 0000000000..67dcdcd9e0
--- /dev/null
+++ b/avrdude/options.mk
@@ -0,0 +1,27 @@
+# $NetBSD: options.mk,v 1.3 2015/07/20 23:03:24 dholland Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.avrdude
+PKG_SUPPORTED_OPTIONS+=		doc
+PKG_SUGGESTED_OPTIONS=		
+PLIST_VARS+=			doc
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdoc)
+CONFIGURE_ARGS+=	--enable-doc
+
+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
+TEXINFO_REQD=           4.9
+USE_TOOLS+=             makeinfo texi2html yacc lex
+
+# DragonFly has stripped makeinfo in the base - without texi2dvi.
+.if ${OPSYS} == "DragonFly"
+BUILD_DEPENDS+=         gtexinfo-[0-9]*:../../devel/gtexinfo
+.endif
+PLIST.doc=		yes
+
+.else
+CONFIGURE_ARGS+=	--disable-doc
+.endif
diff --git a/avrdude/patches/patch-ae b/avrdude/patches/patch-ae
index 757959d02b..8046147514 100644
--- a/avrdude/patches/patch-ae
+++ b/avrdude/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2013/10/06 10:59:20 makoto Exp $
+$NetBSD: patch-ae,v 1.9 2017/01/29 02:24:54 mef Exp $
 
 - ERROR: [check-portability.awk] => Found test ... == ...:
 
@@ -12,9 +12,9 @@ $NetBSD: patch-ae,v 1.2 2013/10/06 10:59:20 makoto Exp $
   platforms available and they're not the same for different
   MACHINE_ARCH's in NetBSD).
 
---- configure.ac.orig	2013-09-18 15:19:42.000000000 +0900
-+++ configure.ac	2013-10-06 19:44:09.000000000 +0900
-@@ -50,7 +50,7 @@ AC_PROG_AR
+--- configure.ac.orig	2016-02-17 06:29:19.000000000 +0900
++++ configure.ac	2017-01-29 11:15:27.000000000 +0900
+@@ -49,7 +49,7 @@ AC_PROG_AR
  AH_TEMPLATE([HAVE_YYLEX_DESTROY],
              [Define if lex/flex has yylex_destroy])
  # flex should have this
@@ -23,15 +23,15 @@ $NetBSD: patch-ae,v 1.2 2013/10/06 10:59:20 makoto Exp $
     AC_MSG_CHECKING([whether yylex_destroy is generated by flex])
     flex_version=`$LEX -V -v --version 2>/dev/null | $SED -e 's/^.* //'`
     case $flex_version in
-@@ -190,6 +190,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
+@@ -189,6 +189,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
  
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
 +AM_PROG_CC_C_O
  AC_HEADER_TIME
  
- # Checks for library functions.
-@@ -317,32 +318,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
+ # WinSock2
+@@ -318,32 +319,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
  # If a system doesn't have a PC style parallel, mark it as unknown.
  case $target in
  	i[[3456]]86-*-linux*|x86_64-*-linux*)
Prev by Date: Re-work paths, using INSTALLATION_DIRS
Next by Date: Update py-napalm-base to version 1.0.0.
Previous by Thread: Re-work paths, using INSTALLATION_DIRS
Next by Thread: Update py-napalm-base to version 1.0.0.
Indexes:
Home | Main Index | Thread Index | Old Index