diff options
| -rw-r--r-- | cross/avrdude/Makefile | 3 | ||||
| -rw-r--r-- | cross/avrdude/distinfo | 4 | ||||
| -rw-r--r-- | cross/avrdude/patches/patch-ae | 19 | ||||
| -rw-r--r-- | sysutils/conky/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/conky/patches/patch-configure.ac | 12 |
5 files changed, 32 insertions, 10 deletions
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile index f6ce6153e6c..0348700eb15 100644 --- a/cross/avrdude/Makefile +++ b/cross/avrdude/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2012/10/03 00:10:29 asau Exp $ +# $NetBSD: Makefile,v 1.35 2013/01/26 22:10:13 wiz Exp $ DISTNAME= avrdude-5.11 PKGREVISION= 1 @@ -21,6 +21,7 @@ USE_GNU_READLINE= yes .include "../../mk/bsd.prefs.mk" GNU_CONFIGURE= yes +TEXINFO_REQD= 4.9 USE_TOOLS+= autoconf automake autoreconf makeinfo texi2html yacc lex INFO_FILES= yes EGDIR= ${PREFIX}/share/examples/avrdude diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo index 06922801c8d..f57f3fd4820 100644 --- a/cross/avrdude/distinfo +++ b/cross/avrdude/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2012/02/07 00:21:48 mef Exp $ +$NetBSD: distinfo,v 1.10 2013/01/26 22:10:13 wiz Exp $ SHA1 (avrdude-5.11.tar.gz) = 3427bf7df61e2b09c0fa33085da796ed5e9698e3 RMD160 (avrdude-5.11.tar.gz) = a91777fd81c0ab8275c96db2b390d62607bd5383 @@ -7,6 +7,6 @@ SHA1 (patch-aa) = 619f682af2e8eff36684993b331ba37cd1b446b6 SHA1 (patch-ab) = d49e5988a83385471f863dd0ccb50db96f1c1783 SHA1 (patch-ac) = f5281a525f0e61517c507db91f9abe71d2f02ae4 SHA1 (patch-ad) = a91b4576d49953148054a7a1522690d1e4a2d9da -SHA1 (patch-ae) = 2476a0d1ff93a4372ff64dc07e39b1c93f8a557f +SHA1 (patch-ae) = 3d49b2cb871c876d646b1d37864f860f7965b6b1 SHA1 (patch-af) = 4ae54ce739ff41964fe56bc1b3e85611288a6e0c SHA1 (patch-ag) = 7a1652db68769ade576dd8825a562ab8e75167f5 diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae index 5531be6dae4..4e35130d790 100644 --- a/cross/avrdude/patches/patch-ae +++ b/cross/avrdude/patches/patch-ae @@ -1,4 +1,6 @@ -$NetBSD: patch-ae,v 1.6 2010/02/08 01:47:14 jakllsch Exp $ +$NetBSD: patch-ae,v 1.7 2013/01/26 22:10:14 wiz Exp $ + +- automake-1.13 compat. - add missing AM_PROG_CC_C_O that automake wants for the yacc sources. @@ -8,9 +10,18 @@ $NetBSD: patch-ae,v 1.6 2010/02/08 01:47:14 jakllsch Exp $ platforms available and they're not the same for different MACHINE_ARCH's in NetBSD). ---- configure.ac.orig 2010-01-19 10:39:11.000000000 +0000 +--- configure.ac.orig 2011-08-27 19:49:40.000000000 +0000 +++ configure.ac -@@ -74,6 +74,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl +@@ -32,7 +32,7 @@ AC_CANONICAL_TARGET + + AC_CONFIG_SRCDIR([main.c]) + AM_INIT_AUTOMAKE +-AM_CONFIG_HEADER(ac_cfg.h) ++AC_CONFIG_HEADERS(ac_cfg.h) + + # Checks for programs. + AC_PROG_CC +@@ -120,6 +120,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -18,7 +29,7 @@ $NetBSD: patch-ae,v 1.6 2010/02/08 01:47:14 jakllsch Exp $ AC_HEADER_TIME # Checks for library functions. -@@ -187,34 +188,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_ +@@ -233,34 +234,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_ # Find the parallel serial device files based on target system # If a system doesn't have a PC style parallel, mark it as unknown. diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 39b02c9cb0b..4039c2d35c4 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2012/11/23 12:30:38 joerg Exp $ +$NetBSD: distinfo,v 1.3 2013/01/26 22:07:42 wiz Exp $ SHA1 (conky-1.9.0.tar.bz2) = 2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc RMD160 (conky-1.9.0.tar.bz2) = 2df0e60d4236ed667bdae876e11ba28d05914e25 Size (conky-1.9.0.tar.bz2) = 626555 bytes -SHA1 (patch-configure.ac) = 3ccad4907e84145ea7c4cc8c7eba81ed5ac48185 +SHA1 (patch-configure.ac) = fab28e82ad01b2c346552af7537865e049098f2c SHA1 (patch-data_Makefile.am) = af8df32076b8a389ee98e2550342dbb343f7bff3 SHA1 (patch-src_Makefile.am) = f4e79c0f08a0886a061449b9a8a578173cda90db SHA1 (patch-src_config.h.in) = 31aa9cd4bd4ab775e6da633f86415ee8f5383538 diff --git a/sysutils/conky/patches/patch-configure.ac b/sysutils/conky/patches/patch-configure.ac index 109eeb00029..76ad52145b8 100644 --- a/sysutils/conky/patches/patch-configure.ac +++ b/sysutils/conky/patches/patch-configure.ac @@ -1,9 +1,19 @@ -$NetBSD: patch-configure.ac,v 1.1.1.1 2012/05/13 08:42:20 imil Exp $ +$NetBSD: patch-configure.ac,v 1.2 2013/01/26 22:07:42 wiz Exp $ +automake-1.13 compat. Enable NetBSD as a suitable platform. --- configure.ac.orig 2012-05-03 21:47:32.000000000 +0000 +++ configure.ac +@@ -15,7 +15,7 @@ m4_define([conky_version], + AC_INIT([Conky], [conky_version()], [brenden1@users.sourceforge.net]) + + AM_INIT_AUTOMAKE(conky, conky_version()) +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADERS(src/config.h) + AC_CONFIG_MACRO_DIR([m4]) + + dnl prevent libtool setting LTCFLAGS to default of -g -O2 when CFLAGS unset. @@ -62,10 +62,11 @@ case $uname in WANT_DEVSTAT=yes WANT_OPTRESET=yes |