>Number:         26465
>Category:       pkg
>Synopsis:       Please update audio/xsidplay; the current version doesn't build.
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 28 17:10:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 2.0_BETA
>Organization:
	
>Environment:
	
	
System: NetBSD lucifer.ipv6.stack.nl 2.0_BETA NetBSD 2.0_BETA (LUCIFER) #1: Tue Jul 20 16:03:42 CEST 2004 martijnb@lucifer.inet:/usr/src/sys/arch/i386/compile/LUCIFER i386
Architecture: i386
Machine: i386
>Description:
	audio/xsidplay is outdated, and no longer builds. Please see applied
	fix.

>How-To-Repeat:
	Try to build audio/xsidplay
>Fix:
	Remove audio/xsidplay/patches/patch-aa and patch-ac
	Apply the following patch in audio/xsidplay
Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/audio/xsidplay/Makefile,v
retrieving revision 1.27
diff -r1.27 Makefile
4,6c4
< DISTNAME=	xsidplay-1_5_4
< PKGNAME=	xsidplay-1.5.4
< PKGREVISION=	1
---
> DISTNAME=	xsidplay-1.6.5.1a
15c13
< WRKSRC=			${WRKDIR}/xsidplay-1.5.4
---
> WRKSRC=			${WRKDIR}/xsidplay-1.6.5.1a
31c29,30
< .include "../../x11/qt2-libs/buildlink3.mk"
---
> .include "../../audio/arts/buildlink3.mk"
> .include "../../x11/qt3-libs/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/audio/xsidplay/distinfo,v
retrieving revision 1.4
diff -r1.4 distinfo
1c1
< $NetBSD: distinfo,v 1.4 2003/03/15 02:15:11 dmcmahill Exp $
---
> $NetBSD$
3,7c3,5
< SHA1 (xsidplay-1_5_4.tgz) = 998c8a327884a2519a61198cf116928abfd3fe86
< Size (xsidplay-1_5_4.tgz) = 362710 bytes
< SHA1 (patch-aa) = f842f79d01bf4bdc1c5ae5d4b05922b143828088
< SHA1 (patch-ab) = d7f307b76a7221d28c2a8c45698cba1fca1d0e25
< SHA1 (patch-ac) = 94187025d2f61e5cd6915d46958f087ed9fd4179
---
> SHA1 (xsidplay-1.6.5.1a.tgz) = 60f2262a8dd79b276272d49eff9a07277dc6c9aa
> Size (xsidplay-1.6.5.1a.tgz) = 355698 bytes
> SHA1 (patch-ab) = 39b1f299215558059401079a2077fdd281f643a8
Index: patches/patch-ab
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/audio/xsidplay/patches/patch-ab,v
retrieving revision 1.6
diff -r1.6 patch-ab
1c1
< $NetBSD: patch-ab,v 1.6 2000/10/29 08:54:54 pooka Exp $
---
> $NetBSD$
3,6c3,10
< --- configure.orig	Thu Oct 26 18:40:22 2000
< +++ configure	Sat Oct 28 15:19:05 2000
< @@ -1876,10 +1876,47 @@
<  done
---
> --- configure.orig	2004-07-28 18:05:00.000000000 +0200
> +++ configure
> @@ -7886,7 +7886,7 @@ echo "configure:7879: checking for Qt ve
>      CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
>      CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
>      LDFLAGS="$LDFLAGS $QT_LDFLAGS"
> -    LIBS="$LIBS -lqt"
> +    LIBS="$LIBS -lqt-mt"
8,255c12,13
<  
< +echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
< +echo "configure:1881: checking for main in -lossaudio" >&5
< +ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
< +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
< +  echo $ac_n "(cached) $ac_c" 1>&6
< +else
< +  ac_save_LIBS="$LIBS"
< +LIBS="-lossaudio  $LIBS"
< +cat > conftest.$ac_ext <<EOF
< +#line 1889 "configure"
< +#include "confdefs.h"
< +
< +int main() {
< +main()
< +; return 0; }
< +EOF
< +if { (eval echo configure:1896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
< +  rm -rf conftest*
< +  eval "ac_cv_lib_$ac_lib_var=yes"
< +else
< +  echo "configure: failed program was:" >&5
< +  cat conftest.$ac_ext >&5
< +  rm -rf conftest*
< +  eval "ac_cv_lib_$ac_lib_var=no"
< +fi
< +rm -f conftest*
< +LIBS="$ac_save_LIBS"
< +
< +fi
< +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
< +  echo "$ac_t""yes" 1>&6
< +  LIBAUDIO=-lossaudio 
< +else
< +  echo "$ac_t""no" 1>&6
< +fi
< + 
< +
<  # Extract the first word of "cp", so it can be a program name with args.
<  set dummy cp; ac_word=$2
<  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
< -echo "configure:1883: checking for $ac_word" >&5
< +echo "configure:1920: checking for $ac_word" >&5
<  if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -1914,7 +1951,7 @@
<  
<  
<  echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
< -echo "configure:1918: checking which audio driver to install" >&5
< +echo "configure:1955: checking which audio driver to install" >&5
<  my_have_audio_driver=no
<  case "$host" in 
<    *linux*) my_have_audio_driver=yes
< @@ -2032,7 +2069,7 @@
<  fi
<  
<  echo $ac_n "checking build system type""... $ac_c" 1>&6
< -echo "configure:2036: checking build system type" >&5
< +echo "configure:2073: checking build system type" >&5
<  
<  build_alias=$build
<  case "$build_alias" in
< @@ -2052,7 +2089,7 @@
<  # Extract the first word of "ranlib", so it can be a program name with args.
<  set dummy ranlib; ac_word=$2
<  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
< -echo "configure:2056: checking for $ac_word" >&5
< +echo "configure:2093: checking for $ac_word" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2082,7 +2119,7 @@
<  # Extract the first word of "gcc", so it can be a program name with args.
<  set dummy gcc; ac_word=$2
<  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
< -echo "configure:2086: checking for $ac_word" >&5
< +echo "configure:2123: checking for $ac_word" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2112,7 +2149,7 @@
<    # Extract the first word of "cc", so it can be a program name with args.
<  set dummy cc; ac_word=$2
<  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
< -echo "configure:2116: checking for $ac_word" >&5
< +echo "configure:2153: checking for $ac_word" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2163,7 +2200,7 @@
<        # Extract the first word of "cl", so it can be a program name with args.
<  set dummy cl; ac_word=$2
<  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
< -echo "configure:2167: checking for $ac_word" >&5
< +echo "configure:2204: checking for $ac_word" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2195,7 +2232,7 @@
<  fi
<  
<  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
< -echo "configure:2199: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
< +echo "configure:2236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
<  
<  ac_ext=c
<  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
< @@ -2206,12 +2243,12 @@
<  
<  cat > conftest.$ac_ext << EOF
<  
< -#line 2210 "configure"
< +#line 2247 "configure"
<  #include "confdefs.h"
<  
<  main(){return(0);}
<  EOF
< -if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
< +if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
<    ac_cv_prog_cc_works=yes
<    # If we can't run a trivial program, we are probably using a cross compiler.
<    if (./conftest; exit) 2>/dev/null; then
< @@ -2237,12 +2274,12 @@
<    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
<  fi
<  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
< -echo "configure:2241: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
< +echo "configure:2278: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
<  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
<  cross_compiling=$ac_cv_prog_cc_cross
<  
<  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
< -echo "configure:2246: checking whether we are using GNU C" >&5
< +echo "configure:2283: checking whether we are using GNU C" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2251,7 +2288,7 @@
<    yes;
<  #endif
<  EOF
< -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
< +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
<    ac_cv_prog_gcc=yes
<  else
<    ac_cv_prog_gcc=no
< @@ -2270,7 +2307,7 @@
<  ac_save_CFLAGS="$CFLAGS"
<  CFLAGS=
<  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
< -echo "configure:2274: checking whether ${CC-cc} accepts -g" >&5
< +echo "configure:2311: checking whether ${CC-cc} accepts -g" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2313,7 +2350,7 @@
<  if test "$ac_cv_prog_gcc" = yes; then
<    # Check if gcc -print-prog-name=ld gives a path.
<    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
< -echo "configure:2317: checking for ld used by GCC" >&5
< +echo "configure:2354: checking for ld used by GCC" >&5
<    ac_prog=`($CC -print-prog-name=ld) 2>&5`
<    case "$ac_prog" in
<      # Accept absolute paths.
< @@ -2337,10 +2374,10 @@
<    esac
<  elif test "$with_gnu_ld" = yes; then
<    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
< -echo "configure:2341: checking for GNU ld" >&5
< +echo "configure:2378: checking for GNU ld" >&5
<  else
<    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
< -echo "configure:2344: checking for non-GNU ld" >&5
< +echo "configure:2381: checking for non-GNU ld" >&5
<  fi
<  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
< @@ -2375,7 +2412,7 @@
<  fi
<  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
<  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
< -echo "configure:2379: checking if the linker ($LD) is GNU ld" >&5
< +echo "configure:2416: checking if the linker ($LD) is GNU ld" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2391,7 +2428,7 @@
<  
<  
<  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
< -echo "configure:2395: checking for BSD-compatible nm" >&5
< +echo "configure:2432: checking for BSD-compatible nm" >&5
<  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2427,7 +2464,7 @@
<  echo "$ac_t""$NM" 1>&6
<  
<  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
< -echo "configure:2431: checking whether ln -s works" >&5
< +echo "configure:2468: checking whether ln -s works" >&5
<  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
< @@ -2481,8 +2518,8 @@
<  case "$lt_target" in
<  *-*-irix6*)
<    # Find out which ABI we are using.
< -  echo '#line 2485 "configure"' > conftest.$ac_ext
< -  if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
< +  echo '#line 2522 "configure"' > conftest.$ac_ext
< +  if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
<      case "`/usr/bin/file conftest.o`" in
<      *32-bit*)
<        LD="${LD-ld} -32"
< @@ -2503,19 +2540,19 @@
<    SAVE_CFLAGS="$CFLAGS"
<    CFLAGS="$CFLAGS -belf"
<    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
< -echo "configure:2507: checking whether the C compiler needs -belf" >&5
< +echo "configure:2544: checking whether the C compiler needs -belf" >&5
<  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
<    echo $ac_n "(cached) $ac_c" 1>&6
<  else
<    cat > conftest.$ac_ext <<EOF
< -#line 2512 "configure"
< +#line 2549 "configure"
<  #include "confdefs.h"
<  
<  int main() {
<  
<  ; return 0; }
<  EOF
< -if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
< +if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
<    rm -rf conftest*
<    lt_cv_cc_needs_belf=yes
<  else
< @@ -2809,6 +2846,7 @@
<  s%@QT_INCLUDES@%$QT_INCLUDES%g
<  s%@QT_LDFLAGS@%$QT_LDFLAGS%g
<  s%@MOC@%$MOC%g
< +s%@LIBAUDIO@%$LIBAUDIO%g
<  s%@CP@%$CP%g
<  s%@build@%$build%g
<  s%@build_alias@%$build_alias%g
---
>      cat > conftest.$ac_ext <<EOF
>  #line 7893 "configure"
>Release-Note:
>Audit-Trail:
>Unformatted: