From 0d8ca3c3478251c1a4a5a208a0a5272717fcc3a3 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Fri, 28 Sep 2007 21:11:49 +0000 Subject: Repair compilation on sunos and maybe others. Added some missing autoconf tests, fixed a non portable call to the shell builtin test, and use the pkgsrc DEFAULT_SERIAL_DEVICE variable for setting the serial device. --- cross/avrdude/Makefile | 15 ++++-- cross/avrdude/distinfo | 8 ++-- cross/avrdude/patches/patch-aa | 68 +++++++++++++-------------- cross/avrdude/patches/patch-ac | 13 ++++++ cross/avrdude/patches/patch-ad | 13 ++++++ cross/avrdude/patches/patch-ae | 102 +++++++++++++++++++++++++++++++++++++++++ cross/avrdude/patches/patch-ai | 80 -------------------------------- 7 files changed, 176 insertions(+), 123 deletions(-) create mode 100644 cross/avrdude/patches/patch-ac create mode 100644 cross/avrdude/patches/patch-ad create mode 100644 cross/avrdude/patches/patch-ae delete mode 100644 cross/avrdude/patches/patch-ai (limited to 'cross/avrdude') diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile index 9c020475d67..1f657d87936 100644 --- a/cross/avrdude/Makefile +++ b/cross/avrdude/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2006/12/11 16:26:39 wennmach Exp $ +# $NetBSD: Makefile,v 1.19 2007/09/28 21:11:49 dmcmahill Exp $ DISTNAME= avrdude-5.2 -#PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= cross MASTER_SITES= http://download.savannah.gnu.org/releases/avrdude/ @@ -16,7 +16,7 @@ TEX_ACCEPTED= teTeX3 .include "../../mk/bsd.prefs.mk" GNU_CONFIGURE= yes -USE_TOOLS+= makeinfo texi2html +USE_TOOLS+= autoconf automake makeinfo texi2html INFO_FILES= yes EGDIR= ${PREFIX}/share/examples/avrdude CONF_FILES= ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf @@ -25,9 +25,16 @@ CONF_FILES_PERMS= ${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \ CONFIGURE_ARGS+= --enable-doc CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --egconfdir=${EGDIR:Q} +CONFIGURE_ENV+= DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE:Q} PLIST_SUBST+= DISTNAME=${DISTNAME:Q} +# The autotools used by this pkg are older than what's in pkgsrc +# currently. This makes the diffs huge. +pre-configure: + cd ${WRKSRC} && aclocal + cd ${WRKSRC} && automake --add-missing + cd ${WRKSRC} && autoconf + .include "../../devel/readline/buildlink3.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo index 58e71120a84..24ee594d358 100644 --- a/cross/avrdude/distinfo +++ b/cross/avrdude/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.4 2006/12/11 16:26:39 wennmach Exp $ +$NetBSD: distinfo,v 1.5 2007/09/28 21:11:49 dmcmahill Exp $ SHA1 (avrdude-5.2.tar.gz) = 113689a10fb504e9e760e8bbf984d487ec3eff01 RMD160 (avrdude-5.2.tar.gz) = 39e23f1cad78c8072062727838ff6de753e7ccba Size (avrdude-5.2.tar.gz) = 426800 bytes -SHA1 (patch-aa) = 0d0b4de4d5ec3321afebbac8f14ece3241684534 -SHA1 (patch-ai) = ff10249ae4d6cb80667d622528a5e48a9bd2aaea +SHA1 (patch-aa) = 2cad04c6e27c5c00df2364dbadd61cc0996ac07f +SHA1 (patch-ac) = 035322d7ace5d0a0b1026afe2291ee9c000efe97 +SHA1 (patch-ad) = da95addf23d2675d05ab374216c8426185797a69 +SHA1 (patch-ae) = bfff132d3275e4016d5ac423609f39d8a5ff63a9 diff --git a/cross/avrdude/patches/patch-aa b/cross/avrdude/patches/patch-aa index 977401d81a6..1828b082ec7 100644 --- a/cross/avrdude/patches/patch-aa +++ b/cross/avrdude/patches/patch-aa @@ -1,33 +1,35 @@ -$NetBSD: patch-aa,v 1.2 2006/12/11 16:26:39 wennmach Exp $ +$NetBSD: patch-aa,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $ ---- Makefile.in.orig 2006-10-09 16:48:14.000000000 +0200 -+++ Makefile.in 2006-12-11 17:05:32.000000000 +0100 -@@ -233,6 +233,7 @@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ -+egconfdir = @egconfdir@ - target = @target@ - target_alias = @target_alias@ - target_cpu = @target_cpu@ -@@ -962,12 +963,12 @@ - done - install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)" -+ test -z "$(egconfdir)" || $(mkdir_p) "$(DESTDIR)$(egconfdir)" - @list='$(sysconf_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ -- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ -+ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egconfdir)/$$f'"; \ -+ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egconfdir)/$$f"; \ - done +- Fix the SUBDIRS stuff so it actually works right with multiple automake + versions. + +- Use supported automake methods to install the example config file to + egconfdir instead of hacking the configure script and Makefile.in directly. + + +--- Makefile.am.orig 2006-09-21 03:18:44.000000000 -0400 ++++ Makefile.am 2007-09-28 12:54:35.406518000 -0400 +@@ -36,9 +36,6 @@ + lexer.c + +-#SUBDIRS = doc @WINDOWS_DIRS@ +-#DIST_SUBDIRS = doc windows +- +-SUBDIRS = @SUBDIRS_AC@ +-DIST_SUBDIRS = @DIST_SUBDIRS_AC@ ++SUBDIRS = @DOC_DIR@ @WINDOWS_DIRS@ ++DIST_SUBDIRS = doc windows + + AM_YFLAGS = -d +@@ -133,5 +130,6 @@ + man_MANS = avrdude.1 - uninstall-sysconfDATA: -@@ -1378,11 +1379,12 @@ +-sysconf_DATA = avrdude.conf ++egconfdir= ${datadir}/examples/avrdude ++egconf_DATA = avrdude.conf + install-exec-local: backup-avrdude-conf +@@ -142,7 +140,5 @@ # This will get run before the config file is installed. backup-avrdude-conf: - @echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}" @@ -35,12 +37,6 @@ $NetBSD: patch-aa,v 1.2 2006/12/11 16:26:39 wennmach Exp $ - cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \ - ${DESTDIR}${sysconfdir}/avrdude.conf.bak; \ - fi -+ @echo "No backup of avrdude.conf in ${DESTDIR}${sysconfdir} required" -+# @echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}" -+# @if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \ -+# cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \ -+# ${DESTDIR}${sysconfdir}/avrdude.conf.bak; \ -+# fi - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: ++ @echo "No back up of avrdude.conf in ${DESTDIR}${sysconfdir} is required" ++ @echo "because we simply install an example into ${DESTDIR}${egconfdir}" ++ @echo "and leave it to the user to install/update the actual working copy" diff --git a/cross/avrdude/patches/patch-ac b/cross/avrdude/patches/patch-ac new file mode 100644 index 00000000000..ce82071353e --- /dev/null +++ b/cross/avrdude/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.3 2007/09/28 21:11:49 dmcmahill Exp $ + +the builtin [ on at least solaris doesn't understand -e + +--- doc/Makefile.am.orig 2005-09-26 07:38:24.000000000 -0400 ++++ doc/Makefile.am 2007-09-28 07:13:20.202430000 -0400 +@@ -34,5 +34,5 @@ + avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) + texi2html -split_node $(srcdir)/$(info_TEXINFOS) +- if [ -e ./avrdude.html -o -e ./avrdude_1.html ]; then \ ++ if [ -f ./avrdude.html -o -f ./avrdude_1.html ]; then \ + mkdir -p avrdude-html ; \ + mv -f *.html avrdude-html ; \ diff --git a/cross/avrdude/patches/patch-ad b/cross/avrdude/patches/patch-ad new file mode 100644 index 00000000000..cd3f3d48ced --- /dev/null +++ b/cross/avrdude/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $ + +regen + +--- doc/Makefile.in.orig 2006-10-09 10:48:11.000000000 -0400 ++++ doc/Makefile.in 2007-09-28 07:13:38.829348000 -0400 +@@ -504,5 +504,5 @@ + avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) + texi2html -split_node $(srcdir)/$(info_TEXINFOS) +- if [ -e ./avrdude.html -o -e ./avrdude_1.html ]; then \ ++ if [ -f ./avrdude.html -o -f ./avrdude_1.html ]; then \ + mkdir -p avrdude-html ; \ + mv -f *.html avrdude-html ; \ diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae new file mode 100644 index 00000000000..b217719af52 --- /dev/null +++ b/cross/avrdude/patches/patch-ae @@ -0,0 +1,102 @@ +$NetBSD: patch-ae,v 1.3 2007/09/28 21:11:50 dmcmahill Exp $ + +- add missing checks for -lnsl and -lsocket needed by at least + SunOS-5.9 and possibly others. + +- Fix the SUBDIRS stuff to work correctly. + +- add missing AM_PROG_CC_C_O that automake wants for the yacc + sources. + +- allow a different default serial/parallel port to be specified + which is useful for pkgsrc (since we have defaults for various + platforms available and they're not the same for different + MACHINE_ARCH's in NetBSD). + +--- configure.ac.orig 2006-10-09 10:47:29.000000000 -0400 ++++ configure.ac 2007-09-28 12:55:21.429495000 -0400 +@@ -45,4 +45,6 @@ + AC_CHECK_LIB([ncurses], [tputs]) + AC_CHECK_LIB([readline], [readline]) ++AC_CHECK_LIB([nsl], [gethostbyname]) ++AC_CHECK_LIB([socket], [socket]) + AH_TEMPLATE([HAVE_LIBUSB], + [Define if USB support is enabled via libusb]) +@@ -67,4 +69,5 @@ + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST ++AM_PROG_CC_C_O + AC_HEADER_TIME + +@@ -119,48 +122,48 @@ + + if test "$enabled_doc" = "yes"; then +- +-SUBDIRS_AC='doc @WINDOWS_DIRS@' +-DIST_SUBDIRS_AC='doc windows' ++ DOC_DIR="doc" + else +- +-SUBDIRS_AC='@WINDOWS_DIRS@' +-DIST_SUBDIRS_AC='windows' ++ DOC_DIR="" + fi + + AC_SUBST(DOC_INST_DIR, $DOC_INST_DIR) +-AC_SUBST(SUBDIRS_AC, $SUBDIRS_AC) +-AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_AC) +- ++AC_SUBST(DOC_DIR, $DOC_DIR) + + # Find the parallel serial device files based on target system + # If a system doesn't have a PC style parallel, mark it as unknown. ++# ++# Allow the user to set the value of both + case $target in + i[[3456]]86-*-linux*|x86_64-*-linux*) +- DEFAULT_PAR_PORT="/dev/parport0" +- DEFAULT_SER_PORT="/dev/ttyS0" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/parport0"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"} + ;; + *-*-linux*) +- DEFAULT_PAR_PORT="unknown" +- DEFAULT_SER_PORT="/dev/ttyS0" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"} + ;; + i[[3456]]86-*-freebsd*|amd64-*-freebsd*) +- DEFAULT_PAR_PORT="/dev/ppi0" +- DEFAULT_SER_PORT="/dev/cuaa0" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"} + ;; + *-*-freebsd*) +- DEFAULT_PAR_PORT="unknown" +- DEFAULT_SER_PORT="/dev/cuaa0" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuaa0"} ++ ;; ++ *-*-netbsd*) ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/tty00"} + ;; + *-*-solaris*) +- DEFAULT_PAR_PORT="/dev/printers/0" +- DEFAULT_SER_PORT="/dev/term/a" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/printers/0"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/term/a"} + ;; + *-*-msdos* | *-*-mingw32* | *-*-cygwin* | *-*-windows*) +- DEFAULT_PAR_PORT="lpt1" +- DEFAULT_SER_PORT="com1" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"lpt1"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"com1"} + ;; + *) +- DEFAULT_PAR_PORT="unknown" +- DEFAULT_SER_PORT="unknown" ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"unknown"} + ;; + esac diff --git a/cross/avrdude/patches/patch-ai b/cross/avrdude/patches/patch-ai deleted file mode 100644 index e27f29b1b75..00000000000 --- a/cross/avrdude/patches/patch-ai +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/12/11 16:26:39 wennmach Exp $ - ---- configure.orig 2006-10-09 16:48:03.000000000 +0200 -+++ configure 2006-12-11 14:04:49.000000000 +0100 -@@ -311,7 +311,7 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBUSB CPP EGREP LIBOBJS DOC_INST_DIR SUBDIRS_AC DIST_SUBDIRS_AC DEFAULT_PAR_PORT DEFAULT_SER_PORT WINDOWS_DIRS ENABLE_WARNINGS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir egconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBUSB CPP EGREP LIBOBJS DOC_INST_DIR SUBDIRS_AC DIST_SUBDIRS_AC DEFAULT_PAR_PORT DEFAULT_SER_PORT WINDOWS_DIRS ENABLE_WARNINGS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -344,6 +344,7 @@ - libexecdir='${exec_prefix}/libexec' - datadir='${prefix}/share' - sysconfdir='${prefix}/etc' -+egconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' - libdir='${exec_prefix}/lib' -@@ -574,6 +575,13 @@ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - -+ -egconfdir | --egconfdir | --egconfdi | --egconfd | --egconf \ -+ | --egcon | --egco | --egc | --eg) -+ ac_prev=egconfdir ;; -+ -egconfdir=* | --egconfdir=* | --egconfdi=* | --egconfd=* | --egconf=* \ -+ | --egcon=* | --egco=* | --egc=* | --eg=*) -+ egconfdir=$ac_optarg ;; -+ - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -@@ -669,7 +677,7 @@ - done - - # Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -+for ac_var in bindir sbindir libexecdir datadir sysconfdir egconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir - do - eval ac_val=$`echo $ac_var` -@@ -822,6 +830,7 @@ - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --egconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] -@@ -4959,6 +4968,10 @@ - DEFAULT_PAR_PORT="unknown" - DEFAULT_SER_PORT="/dev/cuaa0" - ;; -+ *-*-netbsd*) -+ DEFAULT_PAR_PORT="unknown" -+ DEFAULT_SER_PORT="/dev/tty00" -+ ;; - *-*-solaris*) - DEFAULT_PAR_PORT="/dev/printers/0" - DEFAULT_SER_PORT="/dev/term/a" -@@ -5521,6 +5534,8 @@ - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; -@@ -5669,6 +5684,7 @@ - s,@libexecdir@,$libexecdir,;t t - s,@datadir@,$datadir,;t t - s,@sysconfdir@,$sysconfdir,;t t -+s,@egconfdir@,$egconfdir,;t t - s,@sharedstatedir@,$sharedstatedir,;t t - s,@localstatedir@,$localstatedir,;t t - s,@libdir@,$libdir,;t t -- cgit v1.2.3