[Midnightbsd-cvs] mports: mports/sysutils: This one has been holding back the gnome port.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 26 23:49:53 EDT 2007
Log Message:
-----------
This one has been holding back the gnome port. Nautilus cdburner needs it for one. This is an older version I had started porting last year.
Modified Files:
--------------
mports/sysutils:
Makefile (r1.54 -> r1.55)
Added Files:
-----------
mports/sysutils/cdrdao:
Makefile (r1.1)
distinfo (r1.1)
pkg-descr (r1.1)
pkg-plist (r1.1)
mports/sysutils/cdrdao/files:
patch-configure (r1.1)
patch-dao::cdrdao.man (r1.1)
patch-dao::main.cc (r1.1)
patch-defaults (r1.1)
patch-mbsd (r1.1)
patch-scsilib::RULES::i386-freebsd-cc.rul (r1.1)
patch-scsilib::inc::avoffset.mk (r1.1)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -Lsysutils/Makefile -Lsysutils/Makefile -u -r1.54 -r1.55
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -6,6 +6,7 @@
SUBDIR += 915resolution
SUBDIR += bsd-splash-changer
SUBDIR += bsdstats
+ SUBDIR += cdrdao
SUBDIR += cdrtools
SUBDIR += consolekit
SUBDIR += coreutils
--- /dev/null
+++ sysutils/cdrdao/pkg-descr
@@ -0,0 +1,7 @@
+Cdrdao records audio or data CD-R[W]s in disc-at-once (DAO) mode based on
+textual description of the CD contents (toc-file).
+
+Among others, cdrdao can handle the bin/cue format commonly used for VCDs
+or disks with subchannel data.
+
+WWW: http://cdrdao.sourceforge.net/
--- /dev/null
+++ sysutils/cdrdao/pkg-plist
@@ -0,0 +1,13 @@
+bin/cdrdao
+bin/cue2toc
+bin/toc2cddb
+bin/toc2cue
+%%TOC2MP3%%bin/toc2mp3
+ at unexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi
+%%DATADIR%%/drivers
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.PlexDAE
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- /dev/null
+++ sysutils/cdrdao/Makefile
@@ -0,0 +1,159 @@
+# New ports collection makefile for: cdrdao
+# Date created: 7 April 1999
+# Whom: futatuki
+#
+# $FreeBSD: ports/sysutils/cdrdao/Makefile,v 1.49 2006/10/14 08:53:21 marcus Exp $
+#
+
+PORTNAME?= cdrdao
+PORTVERSION= 1.2.1
+PORTREVISION?= 0
+CATEGORIES= sysutils audio
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITE_SUBDIR= cdrdao
+DISTNAME= cdrdao-${PORTVERSION}
+
+MAINTAINER= marius at FreeBSD.org
+COMMENT?= Record CD-R[W]s in disk-at-once mode
+
+BUILD_DEPENDS= ${LOCALBASE}/bin/antlr:${PORTSDIR}/devel/pccts \
+ ${LOCALBASE}/bin/dlg:${PORTSDIR}/devel/pccts
+
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+
+MP3OGG_LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
+ mad.2:${PORTSDIR}/audio/libmad \
+ vorbis.4:${PORTSDIR}/audio/libvorbis
+
+.if ${PORTNAME} == "gcdmaster"
+USE_GCC= 3.4
+USE_GNOME= gnomehier pkgconfig
+LIB_DEPENDS= ${MP3OGG_LIB_DEPENDS} \
+ gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
+RUN_DEPENDS= ${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \
+ ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info
+MAN1= gcdmaster.1
+CONFIGURE_ARGS= --without-lame
+.else
+MAN1= cdrdao.1 cue2toc.1
+CONFIGURE_ARGS= --without-xdao
+.if defined(WITH_TOC2MP3)
+LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame
+CONFIGURE_ARGS+= --with-lame-include=${LOCALBASE}/include \
+ --with-lame-lib=${LOCALBASE}/lib
+PLIST_SUB+= TOC2MP3=""
+.else
+CONFIGURE_ARGS+= --without-lame
+PLIST_SUB+= TOC2MP3="@comment "
+.endif
+.if !defined(WITHOUT_MP3OGG)
+USE_GNOME= pkgconfig
+LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS}
+.else
+CONFIGURE_ARGS+= --without-mp3-support --without-ogg-support
+.endif
+.endif
+
+CONFIGURE_ARGS+= --with-pcctsbin=${LOCALBASE}/bin \
+ --with-pcctsinc=${LOCALBASE}/include/pccts \
+ --without-posix-threads --with-scglib=pkg \
+ --build=${ARCH}-portbld-freebsd6.0 \
+ --target=${ARCH}-portbld-freebsd6.0
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd6.0
+
+.include <bsd.port.pre.mk>
+
+CCOM!= ${BASENAME} ${CC}
+MAKE_ENV= CCOM=${CCOM} LANG=C
+SCSILIBTARGET= ${ARCH}-freebsd-${CCOM}
+
+pre-everything::
+.if ${PORTNAME} != "gcdmaster" && \
+ (!defined(WITH_TOC2MP3) || !defined(WITHOUT_MP3OGG))
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "You may use the following build option(s):"
+ @${ECHO_MSG} ""
+.if !defined(WITH_TOC2MP3)
+ @${ECHO_MSG} "WITH_TOC2MP3=yes builds with toc2mp3 (requires audio/lame)"
+.endif
+.if !defined(WITHOUT_MP3OGG)
+ @${ECHO_MSG} "WITHOUT_MP3OGG=yes builds without support for decoding MP3 and Ogg Vorbis"
+ @${ECHO_MSG} " files (not required unless using sysutils/gcdmaster;"
+ @${ECHO_MSG} " disabling saves a couple of dependencies)"
+.endif
+ @${ECHO_MSG} ""
+.endif
+
+post-extract:
+.if ${SCSILIBTARGET} != "i386-freebsd-cc"
+ @${LN} -sf ${WRKSRC}/scsilib/RULES/i386-freebsd-cc.rul \
+ ${WRKSRC}/scsilib/RULES/${SCSILIBTARGET}.rul
+.endif
+
+post-patch:
+.for i in 45libdeflt 45libedc 45libfile 45libhfs_iso 45libparanoia 45libunls \
+ 45librscg 55cdda2wav 55cdrecord 55cmd 55mkisofs 55mkisofs!@!diag \
+ 55readcd 55scgcheck 55scgskeleton 55rscsi 85man
+ @${RM} ${WRKSRC}/scsilib/TARGETS/${i}
+.endfor
+.if ${PORTNAME} == "gcdmaster"
+ @${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -E -e 's|(^gladedir.+=).+|\1 ${DATADIR}|' \
+ ${WRKSRC}/xdao/Makefile.in
+ @${REINPLACE_CMD} -E -e \
+ 's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \
+ ${WRKSRC}/xdao/Settings.cc
+ @${REINPLACE_CMD} -E -e \
+ 's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/gnome\/pixmaps\/document-icons\/\2|g' \
+ ${WRKSRC}/xdao/gcdmaster.keys
+.else
+.for i in cdrdao.man main.cc
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
+.endfor
+ @${REINPLACE_CMD} -E -e 's|(^CDRDAO_DATA_DIR.+=).+|\1 ${DATADIR}|' \
+ ${WRKSRC}/dao/Makefile.in
+.endif
+
+do-install:
+.if ${PORTNAME} == "gcdmaster"
+ @${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \
+ ${PREFIX}/man/man1/gcdmaster.1
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \
+ ${LOCALBASE}/share/gnome/pixmaps/document-icons
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \
+ ${LOCALBASE}/share/gnome/application-registry
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \
+ ${LOCALBASE}/share/gnome/applications
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \
+ ${LOCALBASE}/share/gnome/mime-info
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \
+ ${LOCALBASE}/share/gnome/mime-info
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
+ ${LOCALBASE}/share/gnome/pixmaps
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \
+ ${LOCALBASE}/share/mime/packages
+ @${MKDIR} ${DATADIR}
+ @${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${DATADIR}
+.else
+ @${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${PREFIX}/man/man1/cdrdao.1
+ @${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${PREFIX}/man/man1
+ @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${PREFIX}/bin
+ @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
+ @${MKDIR} ${DATADIR}
+ @${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${DATADIR}/drivers
+.if defined(WITH_TOC2MP3)
+ @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${PREFIX}/bin
+.endif
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for i in CREDITS ChangeLog README README.PlexDAE
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+.endif
+
+.include <bsd.port.post.mk>
--- /dev/null
+++ sysutils/cdrdao/distinfo
@@ -0,0 +1,3 @@
+MD5 (cdrdao-1.2.1.tar.gz) = d959c98e08105b5b8380de275bac1413
+SHA256 (cdrdao-1.2.1.tar.gz) = 740dda4c4e88754d4a5997cd5130b4569dfcb0c9123ba6acaed3c266ac998162
+SIZE (cdrdao-1.2.1.tar.gz) = 1728003
--- /dev/null
+++ sysutils/cdrdao/files/patch-defaults
@@ -0,0 +1,41 @@
+--- scsilib/DEFAULTS/Defaults.midnightbsd.orig Fri Oct 26 23:42:25 2007
++++ scsilib/DEFAULTS/Defaults.midnightbsd Fri Oct 26 23:42:05 2007
+@@ -0,0 +1,38 @@
++#ident "%W% %E% %Q%"
++###########################################################################
++#
++# global definitions for FreeBSD Systems
++#
++###########################################################################
++#
++# Compiler stuff
++#
++###########################################################################
++DEFCCOM= cc
++#DEFCCOM= gcc
++###########################################################################
++#
++# If the next line is commented out, compilation is done with max warn level
++# If the next line is uncommented, compilation is done with minimal warnings
++#
++###########################################################################
++CWARNOPTS=
++
++DEFINCDIRS= $(SRCROOT)/include
++LDPATH= -L/opt/schily/lib
++#RUNPATH= -R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR) Will probably not work
++
++###########################################################################
++#
++# Installation config stuff
++#
++###########################################################################
++INS_BASE= /opt/schily
++INS_KBASE= /
++#
++DEFUMASK= 002
++#
++DEFINSMODEF= 444
++DEFINSMODEX= 755
++DEFINSUSR= bin
++DEFINSGRP= bin
--- /dev/null
+++ sysutils/cdrdao/files/patch-configure
@@ -0,0 +1,1074 @@
+--- configure.orig Mon Oct 7 03:53:55 2002
++++ configure Sat Oct 12 18:06:18 2002
+@@ -310,7 +310,7 @@
+ # include <unistd.h>
+ #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 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB AR EGREP antlr_path dlg_path LAME_CFLAGS LAME_LIBS PKG_CONFIG ac_pt_PKG_CONFIG SIGCPP2_CFLAGS SIGCPP2_LIBS GTKMM2_CFLAGS GTKMM2_LIBS LIBGUIMM2_CFLAGS LIBGUIMM2_LIBS VORBISFILE_CFLAGS VORBISFILE_LIBS MAD_CFLAGS MAD_LIBS AO_CFLAGS AO_LIBS en_xdao en_toc2mp3 en_toc2cue en_cue2toc en_cdrdao scsilib_dir scsilib_incl scsilib_libs scsilib_objs pcctsinc dao_src sound_if_obj thread_libs mydefs COND_XDAO_TRUE COND_XDAO_FALSE COND_TOC2MP3_TRUE COND_TOC2MP3_FALSE COND_SCSILIB_TRUE COND_SCSILIB_FALSE COND_PCCTS_TRUE COND_PCCTS_FALSE COND_MP3_TRUE COND_MP3_FALSE COND_OGG_TRUE COND_OGG_FALSE LIBOBJS 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 sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP RANLIB ac_ct_RANLIB AR EGREP antlr_path dlg_path LAME_CFLAGS LAME_LIBS PKG_CONFIG SIGCPP2_CFLAGS SIGCPP2_LIBS GTKMM2_CFLAGS GTKMM2_LIBS LIBGUIMM2_CFLAGS LIBGUIMM2_LIBS VORBISFILE_CFLAGS VORBISFILE_LIBS MAD_CFLAGS MAD_LIBS AO_CFLAGS AO_LIBS en_xdao en_toc2mp3 en_toc2cue en_cue2toc en_cdrdao scsilib_dir scsilib_incl scsilib_libs scsilib_objs pcctsinc dao_src sound_if_obj thread_libs mydefs COND_XDAO_TRUE COND_XDAO_FALSE COND_TOC2MP3_TRUE COND_TOC2MP3_FALSE COND_SCSILIB_TRUE COND_SCSILIB_FALSE COND_PCCTS_TRUE COND_PCCTS_FALSE COND_MP3_TRUE COND_MP3_FALSE COND_OGG_TRUE COND_OGG_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -779,58 +779,14 @@
+ ac_env_CPP_value=$CPP
+ ac_cv_env_CPP_set=${CPP+set}
+ ac_cv_env_CPP_value=$CPP
+-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+-ac_env_PKG_CONFIG_value=$PKG_CONFIG
+-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+-ac_env_SIGCPP2_CFLAGS_set=${SIGCPP2_CFLAGS+set}
+-ac_env_SIGCPP2_CFLAGS_value=$SIGCPP2_CFLAGS
+-ac_cv_env_SIGCPP2_CFLAGS_set=${SIGCPP2_CFLAGS+set}
+-ac_cv_env_SIGCPP2_CFLAGS_value=$SIGCPP2_CFLAGS
+-ac_env_SIGCPP2_LIBS_set=${SIGCPP2_LIBS+set}
+-ac_env_SIGCPP2_LIBS_value=$SIGCPP2_LIBS
+-ac_cv_env_SIGCPP2_LIBS_set=${SIGCPP2_LIBS+set}
+-ac_cv_env_SIGCPP2_LIBS_value=$SIGCPP2_LIBS
+-ac_env_GTKMM2_CFLAGS_set=${GTKMM2_CFLAGS+set}
+-ac_env_GTKMM2_CFLAGS_value=$GTKMM2_CFLAGS
+-ac_cv_env_GTKMM2_CFLAGS_set=${GTKMM2_CFLAGS+set}
+-ac_cv_env_GTKMM2_CFLAGS_value=$GTKMM2_CFLAGS
+-ac_env_GTKMM2_LIBS_set=${GTKMM2_LIBS+set}
+-ac_env_GTKMM2_LIBS_value=$GTKMM2_LIBS
+-ac_cv_env_GTKMM2_LIBS_set=${GTKMM2_LIBS+set}
+-ac_cv_env_GTKMM2_LIBS_value=$GTKMM2_LIBS
+-ac_env_LIBGUIMM2_CFLAGS_set=${LIBGUIMM2_CFLAGS+set}
+-ac_env_LIBGUIMM2_CFLAGS_value=$LIBGUIMM2_CFLAGS
+-ac_cv_env_LIBGUIMM2_CFLAGS_set=${LIBGUIMM2_CFLAGS+set}
+-ac_cv_env_LIBGUIMM2_CFLAGS_value=$LIBGUIMM2_CFLAGS
+-ac_env_LIBGUIMM2_LIBS_set=${LIBGUIMM2_LIBS+set}
+-ac_env_LIBGUIMM2_LIBS_value=$LIBGUIMM2_LIBS
+-ac_cv_env_LIBGUIMM2_LIBS_set=${LIBGUIMM2_LIBS+set}
+-ac_cv_env_LIBGUIMM2_LIBS_value=$LIBGUIMM2_LIBS
+-ac_env_VORBISFILE_CFLAGS_set=${VORBISFILE_CFLAGS+set}
+-ac_env_VORBISFILE_CFLAGS_value=$VORBISFILE_CFLAGS
+-ac_cv_env_VORBISFILE_CFLAGS_set=${VORBISFILE_CFLAGS+set}
+-ac_cv_env_VORBISFILE_CFLAGS_value=$VORBISFILE_CFLAGS
+-ac_env_VORBISFILE_LIBS_set=${VORBISFILE_LIBS+set}
+-ac_env_VORBISFILE_LIBS_value=$VORBISFILE_LIBS
+-ac_cv_env_VORBISFILE_LIBS_set=${VORBISFILE_LIBS+set}
+-ac_cv_env_VORBISFILE_LIBS_value=$VORBISFILE_LIBS
+-ac_env_MAD_CFLAGS_set=${MAD_CFLAGS+set}
+-ac_env_MAD_CFLAGS_value=$MAD_CFLAGS
+-ac_cv_env_MAD_CFLAGS_set=${MAD_CFLAGS+set}
+-ac_cv_env_MAD_CFLAGS_value=$MAD_CFLAGS
+ ac_env_MAD_LIBS_set=${MAD_LIBS+set}
+ ac_env_MAD_LIBS_value=$MAD_LIBS
+ ac_cv_env_MAD_LIBS_set=${MAD_LIBS+set}
+ ac_cv_env_MAD_LIBS_value=$MAD_LIBS
+-ac_env_AO_CFLAGS_set=${AO_CFLAGS+set}
+-ac_env_AO_CFLAGS_value=$AO_CFLAGS
+-ac_cv_env_AO_CFLAGS_set=${AO_CFLAGS+set}
+-ac_cv_env_AO_CFLAGS_value=$AO_CFLAGS
+-ac_env_AO_LIBS_set=${AO_LIBS+set}
+-ac_env_AO_LIBS_value=$AO_LIBS
+-ac_cv_env_AO_LIBS_set=${AO_LIBS+set}
+-ac_cv_env_AO_LIBS_value=$AO_LIBS
++ac_env_MAD_CFLAGS_set=${MAD_CFLAGS+set}
++ac_env_MAD_CFLAGS_value=$MAD_CFLAGS
++ac_cv_env_MAD_CFLAGS_set=${MAD_CFLAGS+set}
++ac_cv_env_MAD_CFLAGS_value=$MAD_CFLAGS
+
+ #
+ # Report the --help message.
+@@ -945,26 +901,8 @@
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+ CPP C preprocessor
+- PKG_CONFIG path to pkg-config utility
+- SIGCPP2_CFLAGS
+- C compiler flags for SIGCPP2, overriding pkg-config
+- SIGCPP2_LIBS
+- linker flags for SIGCPP2, overriding pkg-config
+- GTKMM2_CFLAGS
+- C compiler flags for GTKMM2, overriding pkg-config
+- GTKMM2_LIBS linker flags for GTKMM2, overriding pkg-config
+- LIBGUIMM2_CFLAGS
+- C compiler flags for LIBGUIMM2, overriding pkg-config
+- LIBGUIMM2_LIBS
+- linker flags for LIBGUIMM2, overriding pkg-config
+- VORBISFILE_CFLAGS
+- C compiler flags for VORBISFILE, overriding pkg-config
+- VORBISFILE_LIBS
+- linker flags for VORBISFILE, overriding pkg-config
+- MAD_CFLAGS C compiler flags for MAD, overriding pkg-config
+- MAD_LIBS linker flags for MAD, overriding pkg-config
+- AO_CFLAGS C compiler flags for AO, overriding pkg-config
+- AO_LIBS linker flags for AO, overriding pkg-config
++ MAD_LIBS ""
++ MAD_CFLAGS ""
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -9831,11 +9769,11 @@
+ if test "$xdao" = yes; then
+ en_xdao=yes
+
++ succeeded=no
+
+-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+@@ -9860,6 +9798,7 @@
+ done
+ done
+
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+@@ -9873,19 +9812,72 @@
+ echo "${ECHO_T}no" >&6
+ fi
+
+-fi
+-if test -z "$ac_cv_path_PKG_CONFIG"; then
+- ac_pt_PKG_CONFIG=$PKG_CONFIG
+- # Extract the first word of "pkg-config", so it can be a program name with args.
++ fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for sigc++-2.0 >= 2.0.0" >&5
++echo $ECHO_N "checking for sigc++-2.0 >= 2.0.0... $ECHO_C" >&6
++
++ if $PKG_CONFIG --exists "sigc++-2.0 >= 2.0.0" ; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ succeeded=yes
++
++ echo "$as_me:$LINENO: checking SIGCPP2_CFLAGS" >&5
++echo $ECHO_N "checking SIGCPP2_CFLAGS... $ECHO_C" >&6
++ SIGCPP2_CFLAGS=`$PKG_CONFIG --cflags "sigc++-2.0 >= 2.0.0"`
++ echo "$as_me:$LINENO: result: $SIGCPP2_CFLAGS" >&5
++echo "${ECHO_T}$SIGCPP2_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking SIGCPP2_LIBS" >&5
++echo $ECHO_N "checking SIGCPP2_LIBS... $ECHO_C" >&6
++ SIGCPP2_LIBS=`$PKG_CONFIG --libs "sigc++-2.0 >= 2.0.0"`
++ echo "$as_me:$LINENO: result: $SIGCPP2_LIBS" >&5
++echo "${ECHO_T}$SIGCPP2_LIBS" >&6
++ else
++ SIGCPP2_CFLAGS=""
++ SIGCPP2_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ SIGCPP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sigc++-2.0 >= 2.0.0"`
++
++ fi
++
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ echo "Building of gcdmaster disabled"; en_xdao=no
++ fi
++
++
++ succeeded=no
++
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $ac_pt_PKG_CONFIG in
++ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -9895,253 +9887,175 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+-if test -n "$ac_pt_PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
++if test -n "$PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+- PKG_CONFIG=$ac_pt_PKG_CONFIG
+-else
+- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+-fi
++ fi
+
+-fi
+-if test -n "$PKG_CONFIG"; then
+- _pkg_min_version=0.9.0
+- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- PKG_CONFIG=""
+- fi
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for gtkmm-2.4 >= 2.4.0" >&5
++echo $ECHO_N "checking for gtkmm-2.4 >= 2.4.0... $ECHO_C" >&6
+
+-fi
++ if $PKG_CONFIG --exists "gtkmm-2.4 >= 2.4.0" ; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ succeeded=yes
+
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for SIGCPP2" >&5
+-echo $ECHO_N "checking for SIGCPP2... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking GTKMM2_CFLAGS" >&5
++echo $ECHO_N "checking GTKMM2_CFLAGS... $ECHO_C" >&6
++ GTKMM2_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4 >= 2.4.0"`
++ echo "$as_me:$LINENO: result: $GTKMM2_CFLAGS" >&5
++echo "${ECHO_T}$GTKMM2_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking GTKMM2_LIBS" >&5
++echo $ECHO_N "checking GTKMM2_LIBS... $ECHO_C" >&6
++ GTKMM2_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4 >= 2.4.0"`
++ echo "$as_me:$LINENO: result: $GTKMM2_LIBS" >&5
++echo "${ECHO_T}$GTKMM2_LIBS" >&6
++ else
++ GTKMM2_CFLAGS=""
++ GTKMM2_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ GTKMM2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.4.0"`
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$SIGCPP2_CFLAGS"; then
+- pkg_cv_SIGCPP2_CFLAGS="$SIGCPP2_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sigc++-2.0 >= 2.0.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "sigc++-2.0 >= 2.0.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_SIGCPP2_CFLAGS=`$PKG_CONFIG --cflags "sigc++-2.0 >= 2.0.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$SIGCPP2_LIBS"; then
+- pkg_cv_SIGCPP2_LIBS="$SIGCPP2_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sigc++-2.0 >= 2.0.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "sigc++-2.0 >= 2.0.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_SIGCPP2_LIBS=`$PKG_CONFIG --libs "sigc++-2.0 >= 2.0.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
++ fi
+
+
+
+-if test $pkg_failed = yes; then
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- SIGCPP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sigc++-2.0 >= 2.0.0"`
+- else
+- SIGCPP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sigc++-2.0 >= 2.0.0"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$SIGCPP2_PKG_ERRORS" >&5
++ if test $succeeded = yes; then
++ :
++ else
++ echo "Building of gcdmaster disabled"; en_xdao=no
++ fi
+
+- echo "Building of gcdmaster disabled"; en_xdao=no
+-elif test $pkg_failed = untried; then
+- echo "Building of gcdmaster disabled"; en_xdao=no
+-else
+- SIGCPP2_CFLAGS=$pkg_cv_SIGCPP2_CFLAGS
+- SIGCPP2_LIBS=$pkg_cv_SIGCPP2_LIBS
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-fi
+
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for GTKMM2" >&5
+-echo $ECHO_N "checking for GTKMM2... $ECHO_C" >&6
++ succeeded=no
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$GTKMM2_CFLAGS"; then
+- pkg_cv_GTKMM2_CFLAGS="$GTKMM2_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.4.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.4.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GTKMM2_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4 >= 2.4.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- pkg_failed=untried
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
+ fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$GTKMM2_LIBS"; then
+- pkg_cv_GTKMM2_LIBS="$GTKMM2_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4 >= 2.4.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gtkmm-2.4 >= 2.4.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GTKMM2_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4 >= 2.4.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- pkg_failed=untried
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+
++ fi
+
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for libgnomeuimm-2.6 >= 2.6.0" >&5
++echo $ECHO_N "checking for libgnomeuimm-2.6 >= 2.6.0... $ECHO_C" >&6
+
+-if test $pkg_failed = yes; then
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GTKMM2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.4.0"`
+- else
+- GTKMM2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtkmm-2.4 >= 2.4.0"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GTKMM2_PKG_ERRORS" >&5
+-
+- echo "Building of gcdmaster disabled"; en_xdao=no
+-elif test $pkg_failed = untried; then
+- echo "Building of gcdmaster disabled"; en_xdao=no
+-else
+- GTKMM2_CFLAGS=$pkg_cv_GTKMM2_CFLAGS
+- GTKMM2_LIBS=$pkg_cv_GTKMM2_LIBS
+- echo "$as_me:$LINENO: result: yes" >&5
++ if $PKG_CONFIG --exists "libgnomeuimm-2.6 >= 2.6.0" ; then
++ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+- :
+-fi
++ succeeded=yes
+
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for LIBGUIMM2" >&5
+-echo $ECHO_N "checking for LIBGUIMM2... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking LIBGUIMM2_CFLAGS" >&5
++echo $ECHO_N "checking LIBGUIMM2_CFLAGS... $ECHO_C" >&6
++ LIBGUIMM2_CFLAGS=`$PKG_CONFIG --cflags "libgnomeuimm-2.6 >= 2.6.0"`
++ echo "$as_me:$LINENO: result: $LIBGUIMM2_CFLAGS" >&5
++echo "${ECHO_T}$LIBGUIMM2_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking LIBGUIMM2_LIBS" >&5
++echo $ECHO_N "checking LIBGUIMM2_LIBS... $ECHO_C" >&6
++ LIBGUIMM2_LIBS=`$PKG_CONFIG --libs "libgnomeuimm-2.6 >= 2.6.0"`
++ echo "$as_me:$LINENO: result: $LIBGUIMM2_LIBS" >&5
++echo "${ECHO_T}$LIBGUIMM2_LIBS" >&6
++ else
++ LIBGUIMM2_CFLAGS=""
++ LIBGUIMM2_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ LIBGUIMM2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeuimm-2.6 >= 2.6.0"`
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBGUIMM2_CFLAGS"; then
+- pkg_cv_LIBGUIMM2_CFLAGS="$LIBGUIMM2_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeuimm-2.6 >= 2.6.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libgnomeuimm-2.6 >= 2.6.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBGUIMM2_CFLAGS=`$PKG_CONFIG --cflags "libgnomeuimm-2.6 >= 2.6.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$LIBGUIMM2_LIBS"; then
+- pkg_cv_LIBGUIMM2_LIBS="$LIBGUIMM2_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeuimm-2.6 >= 2.6.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libgnomeuimm-2.6 >= 2.6.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBGUIMM2_LIBS=`$PKG_CONFIG --libs "libgnomeuimm-2.6 >= 2.6.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+-else
+- pkg_failed=untried
+-fi
++ fi
+
+
+
+-if test $pkg_failed = yes; then
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- LIBGUIMM2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeuimm-2.6 >= 2.6.0"`
+- else
+- LIBGUIMM2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeuimm-2.6 >= 2.6.0"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$LIBGUIMM2_PKG_ERRORS" >&5
++ if test $succeeded = yes; then
++ :
++ else
++ echo "Building of gcdmaster disabled"; en_xdao=no
++ fi
+
+- echo "Building of gcdmaster disabled"; en_xdao=no
+-elif test $pkg_failed = untried; then
+- echo "Building of gcdmaster disabled"; en_xdao=no
+-else
+- LIBGUIMM2_CFLAGS=$pkg_cv_LIBGUIMM2_CFLAGS
+- LIBGUIMM2_LIBS=$pkg_cv_LIBGUIMM2_LIBS
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-fi
+ fi
+
+
+@@ -10612,146 +10526,200 @@
+
+ if test "$with_ogg_support" = yes; then
+
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for VORBISFILE" >&5
+-echo $ECHO_N "checking for VORBISFILE... $ECHO_C" >&6
++ succeeded=no
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$VORBISFILE_CFLAGS"; then
+- pkg_cv_VORBISFILE_CFLAGS="$VORBISFILE_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbisfile >= 1.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "vorbisfile >= 1.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_VORBISFILE_CFLAGS=`$PKG_CONFIG --cflags "vorbisfile >= 1.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- pkg_failed=untried
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
+ fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$VORBISFILE_LIBS"; then
+- pkg_cv_VORBISFILE_LIBS="$VORBISFILE_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vorbisfile >= 1.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "vorbisfile >= 1.0") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_VORBISFILE_LIBS=`$PKG_CONFIG --libs "vorbisfile >= 1.0" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- pkg_failed=untried
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+
++ fi
+
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for vorbisfile >= 1.0" >&5
++echo $ECHO_N "checking for vorbisfile >= 1.0... $ECHO_C" >&6
+
+-if test $pkg_failed = yes; then
++ if $PKG_CONFIG --exists "vorbisfile >= 1.0" ; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ succeeded=yes
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vorbisfile >= 1.0"`
++ echo "$as_me:$LINENO: checking VORBISFILE_CFLAGS" >&5
++echo $ECHO_N "checking VORBISFILE_CFLAGS... $ECHO_C" >&6
++ VORBISFILE_CFLAGS=`$PKG_CONFIG --cflags "vorbisfile >= 1.0"`
++ echo "$as_me:$LINENO: result: $VORBISFILE_CFLAGS" >&5
++echo "${ECHO_T}$VORBISFILE_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking VORBISFILE_LIBS" >&5
++echo $ECHO_N "checking VORBISFILE_LIBS... $ECHO_C" >&6
++ VORBISFILE_LIBS=`$PKG_CONFIG --libs "vorbisfile >= 1.0"`
++ echo "$as_me:$LINENO: result: $VORBISFILE_LIBS" >&5
++echo "${ECHO_T}$VORBISFILE_LIBS" >&6
+ else
+- VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbisfile >= 1.0"`
++ VORBISFILE_CFLAGS=""
++ VORBISFILE_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbisfile >= 1.0"`
++
+ fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$VORBISFILE_PKG_ERRORS" >&5
+
+- echo "OGG support disabled"; with_ogg_support=no
+-elif test $pkg_failed = untried; then
+- echo "OGG support disabled"; with_ogg_support=no
+-else
+- VORBISFILE_CFLAGS=$pkg_cv_VORBISFILE_CFLAGS
+- VORBISFILE_LIBS=$pkg_cv_VORBISFILE_LIBS
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-fi
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ echo "OGG support disabled"; with_ogg_support=no
++ fi
++
+ fi
+
+ if test "$with_mp3_support" = yes; then
+
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for MAD" >&5
+-echo $ECHO_N "checking for MAD... $ECHO_C" >&6
++ succeeded=no
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$MAD_CFLAGS"; then
+- pkg_cv_MAD_CFLAGS="$MAD_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.10\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mad >= 0.10") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.10" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- pkg_failed=untried
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
+ fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$MAD_LIBS"; then
+- pkg_cv_MAD_LIBS="$MAD_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mad >= 0.10\"") >&5
+- ($PKG_CONFIG --exists --print-errors "mad >= 0.10") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_MAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.10" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- pkg_failed=untried
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+
++ fi
+
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for mad >= 0.10" >&5
++echo $ECHO_N "checking for mad >= 0.10... $ECHO_C" >&6
+
+-if test $pkg_failed = yes; then
++ if $PKG_CONFIG --exists "mad >= 0.10" ; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ succeeded=yes
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mad >= 0.10"`
++ echo "$as_me:$LINENO: checking MAD_CFLAGS" >&5
++echo $ECHO_N "checking MAD_CFLAGS... $ECHO_C" >&6
++ MAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.10"`
++ echo "$as_me:$LINENO: result: $MAD_CFLAGS" >&5
++echo "${ECHO_T}$MAD_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking MAD_LIBS" >&5
++echo $ECHO_N "checking MAD_LIBS... $ECHO_C" >&6
++ MAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.10"`
++ echo "$as_me:$LINENO: result: $MAD_LIBS" >&5
++echo "${ECHO_T}$MAD_LIBS" >&6
+ else
+- MAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mad >= 0.10"`
++ MAD_CFLAGS=""
++ MAD_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ MAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mad >= 0.10"`
++
+ fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MAD_PKG_ERRORS" >&5
+
+- echo "libMAD detection via pkg-config failed"; with_mp3_support=no
+-elif test $pkg_failed = untried; then
+- echo "libMAD detection via pkg-config failed"; with_mp3_support=no
+-else
+- MAD_CFLAGS=$pkg_cv_MAD_CFLAGS
+- MAD_LIBS=$pkg_cv_MAD_LIBS
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+-fi
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ echo "libMAD detection via pkg-config failed"; with_mp3_support=no
++ fi
++
+ if test "$with_mp3_support" = no; then
+ echo "$as_me:$LINENO: checking for mad_stream_init in -lmad" >&5
+ echo $ECHO_N "checking for mad_stream_init in -lmad... $ECHO_C" >&6
+@@ -10971,82 +10939,109 @@
+ fi
+ fi
+
+-if test "$with_mp3_support" = yes || test "$with_ogg_support" = yes || test "$en_xdao" = yes; then
+
+-pkg_failed=no
+-echo "$as_me:$LINENO: checking for AO" >&5
+-echo $ECHO_N "checking for AO... $ECHO_C" >&6
++ succeeded=no
+
+-if test -n "$PKG_CONFIG"; then
+- if test -n "$AO_CFLAGS"; then
+- pkg_cv_AO_CFLAGS="$AO_CFLAGS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ao >= 0.8\"") >&5
+- ($PKG_CONFIG --exists --print-errors "ao >= 0.8") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_AO_CFLAGS=`$PKG_CONFIG --cflags "ao >= 0.8" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- pkg_failed=untried
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
+ fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$AO_LIBS"; then
+- pkg_cv_AO_LIBS="$AO_LIBS"
+- else
+- if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ao >= 0.8\"") >&5
+- ($PKG_CONFIG --exists --print-errors "ao >= 0.8") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_AO_LIBS=`$PKG_CONFIG --libs "ao >= 0.8" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- pkg_failed=untried
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+
++ fi
+
++if test "$with_mp3_support" = yes || test "$with_ogg_support" = yes || test "$en_xdao" = yes; then
+
+-if test $pkg_failed = yes; then
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for ao >= 0.8" >&5
++echo $ECHO_N "checking for ao >= 0.8... $ECHO_C" >&6
+
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- AO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ao >= 0.8"`
++ if $PKG_CONFIG --exists "ao >= 0.8" ; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ succeeded=yes
++
++ echo "$as_me:$LINENO: checking AO_CFLAGS" >&5
++echo $ECHO_N "checking AO_CFLAGS... $ECHO_C" >&6
++ AO_CFLAGS=`$PKG_CONFIG --cflags "ao >= 0.8"`
++ echo "$as_me:$LINENO: result: $AO_CFLAGS" >&5
++echo "${ECHO_T}$AO_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking AO_LIBS" >&5
++echo $ECHO_N "checking AO_LIBS... $ECHO_C" >&6
++ AO_LIBS=`$PKG_CONFIG --libs "ao >= 0.8"`
++ echo "$as_me:$LINENO: result: $AO_LIBS" >&5
++echo "${ECHO_T}$AO_LIBS" >&6
+ else
+- AO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ao >= 0.8"`
++ AO_CFLAGS=""
++ AO_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ AO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ao >= 0.8"`
++
+ fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$AO_PKG_ERRORS" >&5
+
+- echo "Building of gcdmaster disabled"; with_ogg_support=no;
+- with_mp3_support=no; en_xdao=no
+-elif test $pkg_failed = untried; then
+- echo "Building of gcdmaster disabled"; with_ogg_support=no;
+- with_mp3_support=no; en_xdao=no
+-else
+- AO_CFLAGS=$pkg_cv_AO_CFLAGS
+- AO_LIBS=$pkg_cv_AO_LIBS
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_AO 1
+ _ACEOF
+
+-fi
++ else
++ echo "Building of gcdmaster disabled"; with_ogg_support=no;
++ with_mp3_support=no; en_xdao=no
++ fi
++
+ fi
+
+ if test "$with_ogg_support" = yes; then
+@@ -11922,7 +11917,6 @@
+ s, at LAME_CFLAGS@,$LAME_CFLAGS,;t t
+ s, at LAME_LIBS@,$LAME_LIBS,;t t
+ s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+ s, at SIGCPP2_CFLAGS@,$SIGCPP2_CFLAGS,;t t
+ s, at SIGCPP2_LIBS@,$SIGCPP2_LIBS,;t t
+ s, at GTKMM2_CFLAGS@,$GTKMM2_CFLAGS,;t t
--- /dev/null
+++ sysutils/cdrdao/files/patch-dao::main.cc
@@ -0,0 +1,15 @@
+--- dao/main.cc.orig Sat Dec 28 03:01:20 2002
++++ dao/main.cc Sat Dec 28 03:04:38 2002
+@@ -1890,11 +1890,7 @@
+
+ SETTINGS = new Settings;
+
+- settingsPath = "/etc/cdrdao.conf";
+- if (SETTINGS->read(settingsPath) == 0)
+- message(3, "Read settings from \"%s\".", settingsPath);
+-
+- settingsPath = "/etc/defaults/cdrdao";
++ settingsPath = "%%PREFIX%%/etc/cdrdao.conf";
+ if (SETTINGS->read(settingsPath) == 0)
+ message(3, "Read settings from \"%s\".", settingsPath);
+
--- /dev/null
+++ sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk
@@ -0,0 +1,8 @@
+--- scsilib/inc/avoffset.mk.orig Sun Jul 13 00:55:06 2003
++++ scsilib/inc/avoffset.mk Fri Aug 25 13:34:32 2006
+@@ -15,3 +15,5 @@
+ ###########################################################################
+ include $(SRCROOT)/$(RULESDIR)/rules.inc
+ ###########################################################################
++
++.IGNORE: $(PTARGET)
--- /dev/null
+++ sysutils/cdrdao/files/patch-scsilib::RULES::i386-freebsd-cc.rul
@@ -0,0 +1,32 @@
+--- scsilib/RULES/i386-freebsd-cc.rul.orig Tue Oct 15 22:43:39 2002
++++ scsilib/RULES/i386-freebsd-cc.rul Sun Oct 27 19:59:00 2002
+@@ -24,7 +24,8 @@
+ ###########################################################################
+
+ CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
+-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
++XCFLAGS:= $(CFLAGS)
++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
+
+ CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+ COPTS=
+@@ -57,14 +58,14 @@
+
+ FLOAT_OPTIONS=
+
+-CC= @echo " ==> COMPILING \"$@\""; gcc
+-LDCC= @echo " ==> LINKING \"$@\""; gcc
+-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
+-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
++CCCOM= $(CC)
++LDCC= $(CCCOM)
++DYNLD= $(CCCOM)
++RANLIB= ranlib
+ ARFLAGS= cr
+ LORDER= lorder
+ TSORT= tsort
+
+ RMDEP= :
+-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP= $(CCCOM) -M
+ MKDEP_OUT=
--- /dev/null
+++ sysutils/cdrdao/files/patch-mbsd
@@ -0,0 +1,353 @@
+diff -urN scsilib.orig/RULES/amd64-midnightbsd-cc.rul scsilib/RULES/amd64-midnightbsd-cc.rul
+--- scsilib.orig/RULES/amd64-midnightbsd-cc.rul Wed Dec 31 19:00:00 1969
++++ scsilib/RULES/amd64-midnightbsd-cc.rul Sat Apr 7 19:34:11 2007
+@@ -0,0 +1,71 @@
++#ident "@(#)amd64-midnightbsd-cc.rul 1.4 02/10/15 "
++###########################################################################
++# Written 1997 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for MidnightBSD
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING. If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++
++CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
++XCFLAGS:= $(CFLAGS)
++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
++
++CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
++COPTS=
++CWOPTS= -Wall -Wtraditional \
++ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
++COPTOPT= -O
++KDEFINES= -DKERNEL -D_KERNEL
++COPTDYN= -fpic
++COPTGPROF= -pg
++
++LIB_PREFIX= lib
++LIB_SUFFIX= .a
++SHL_SUFFIX= .so.1.0
++
++#LIB_SOCKET= -lsocket -lnsl -ldl
++LIB_SOCKET=
++LIB_MATH= -lm
++#LIB_KVM= -lkvm
++LIB_KVM=
++
++LIBS_PATH= -L$(OLIBSDIR)
++
++LDFLAGS= $(LDOPTS) $(LDOPTX)
++LDLIBS= $(LIBS) $(LIBX)
++
++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
++LDOPTS= $(LIBS_PATH) $(LDPATH)
++LDOPTDYN= -shared -Wl,-soname,$(TARGET)
++LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
++
++FLOAT_OPTIONS=
++
++CCCOM= $(CC)
++LDCC= $(CCCOM)
++DYNLD= $(CCCOM)
++RANLIB= ranlib
++ARFLAGS= cr
++LORDER= lorder
++TSORT= tsort
++
++RMDEP= :
++MKDEP= $(CCCOM) -M
++MKDEP_OUT=
+diff -urN scsilib.orig/RULES/i386-midnightbsd-cc.rul scsilib/RULES/i386-midnightbsd-cc.rul
+--- scsilib.orig/RULES/i386-midnightbsd-cc.rul Wed Dec 31 19:00:00 1969
++++ scsilib/RULES/i386-midnightbsd-cc.rul Sat Apr 7 19:34:11 2007
+@@ -0,0 +1,71 @@
++#ident "@(#)i386-freebsd-cc.rul 1.4 02/10/15 "
++###########################################################################
++# Written 1997 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for MidnightBSD
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING. If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++
++CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
++XCFLAGS:= $(CFLAGS)
++CFLAGS= $(COPTS) $(CWARNOPTS) $(XCFLAGS) $(GCCOPTOPT) $(COPTX)
++
++CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
++COPTS=
++CWOPTS= -Wall -Wtraditional \
++ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
++COPTOPT= -O
++KDEFINES= -DKERNEL -D_KERNEL
++COPTDYN= -fpic
++COPTGPROF= -pg
++
++LIB_PREFIX= lib
++LIB_SUFFIX= .a
++SHL_SUFFIX= .so.1.0
++
++#LIB_SOCKET= -lsocket -lnsl -ldl
++LIB_SOCKET=
++LIB_MATH= -lm
++#LIB_KVM= -lkvm
++LIB_KVM=
++
++LIBS_PATH= -L$(OLIBSDIR)
++
++LDFLAGS= $(LDOPTS) $(LDOPTX)
++LDLIBS= $(LIBS) $(LIBX)
++
++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
++LDOPTS= $(LIBS_PATH) $(LDPATH)
++LDOPTDYN= -shared -Wl,-soname,$(TARGET)
++LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
++
++FLOAT_OPTIONS=
++
++CCCOM= $(CC)
++LDCC= $(CCCOM)
++DYNLD= $(CCCOM)
++RANLIB= ranlib
++ARFLAGS= cr
++LORDER= lorder
++TSORT= tsort
++
++RMDEP= :
++MKDEP= $(CCCOM) -M
++MKDEP_OUT=
+diff -urN scsilib.orig/RULES/os-midnightbsd.def scsilib/RULES/os-midnightbsd.def
+--- scsilib.orig/RULES/os-midnightbsd.def Wed Dec 31 19:00:00 1969
++++ scsilib/RULES/os-midnightbsd.def Sat Apr 7 19:34:11 2007
+@@ -0,0 +1,23 @@
++#ident "@(#)os-midnightbsd.def 1.1 97/02/11 "
++###########################################################################
++# Written 1997 by J. Schilling
++###########################################################################
++#
++# Global os definitions for MidnightBSD
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING. If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++MANSTYLE= bsd
+diff -urN scsilib.orig/RULES/os-midnightbsd.id scsilib/RULES/os-midnightbsd.id
+--- scsilib.orig/RULES/os-midnightbsd.id Wed Dec 31 19:00:00 1969
++++ scsilib/RULES/os-midnightbsd.id Sat Apr 7 19:34:11 2007
+@@ -0,0 +1,24 @@
++#ident "@(#)os-midnightbsd.id 1.1 97/02/11 "
++###########################################################################
++# Written 1997 by J. Schilling
++###########################################################################
++#
++# OS specific MACRO definitions for MidnightBSD
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING. If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++O_ARCH= midnightbsd
++-O_ARCH= -$(O_ARCH)
+diff -urN scsilib.orig/RULES/sparc64-midnightbsd-cc.rul scsilib/RULES/sparc64-midnightbsd-cc.rul
+--- scsilib.orig/RULES/sparc64-midnightbsd-cc.rul Wed Dec 31 19:00:00 1969
++++ scsilib/RULES/sparc64-midnightbsd-cc.rul Sat Apr 7 19:34:11 2007
+@@ -0,0 +1,70 @@
++#ident "@(#)i386-freebsd-cc.rul 1.4 02/10/15 "
++###########################################################################
++# Written 1997 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for MidnightBSD
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING. If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++
++CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
++CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
++
++CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
++COPTS=
++CWOPTS= -Wall -Wtraditional \
++ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
++COPTOPT= -O
++KDEFINES= -DKERNEL -D_KERNEL
++COPTDYN= -fpic
++COPTGPROF= -pg
++
++LIB_PREFIX= lib
++LIB_SUFFIX= .a
++SHL_SUFFIX= .so.1.0
++
++#LIB_SOCKET= -lsocket -lnsl -ldl
++LIB_SOCKET=
++LIB_MATH= -lm
++#LIB_KVM= -lkvm
++LIB_KVM=
++
++LIBS_PATH= -L$(OLIBSDIR)
++
++LDFLAGS= $(LDOPTS) $(LDOPTX)
++LDLIBS= $(LIBS) $(LIBX)
++
++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
++LDOPTS= $(LIBS_PATH) $(LDPATH)
++LDOPTDYN= -shared -Wl,-soname,$(TARGET)
++LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
++
++FLOAT_OPTIONS=
++
++CC= @echo " ==> COMPILING \"$@\""; gcc
++LDCC= @echo " ==> LINKING \"$@\""; gcc
++DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
++RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
++ARFLAGS= cr
++LORDER= lorder
++TSORT= tsort
++
++RMDEP= :
++MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP_OUT=
+diff -urN scsilib.orig/RULES/sparc64-midnightbsd-gcc.rul scsilib/RULES/sparc64-midnightbsd-gcc.rul
+--- scsilib.orig/RULES/sparc64-midnightbsd-gcc.rul Wed Dec 31 19:00:00 1969
++++ scsilib/RULES/sparc64-midnightbsd-gcc.rul Sat Apr 7 19:34:11 2007
+@@ -0,0 +1,70 @@
++#ident "@(#)i386-freebsd-gcc.rul 1.4 02/10/15 "
++###########################################################################
++# Written 1997 by J. Schilling
++###########################################################################
++#
++# Platform dependent MACROS for MidnightBSD
++#
++###########################################################################
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; see the file COPYING. If not, write to
++# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++###########################################################################
++include $(SRCROOT)/$(RULESDIR)/rules.prg
++###########################################################################
++
++CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
++CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
++
++CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
++COPTS=
++CWOPTS= -Wall -Wtraditional \
++ -Wshadow -Wmissing-prototypes -Wstrict-prototypes
++COPTOPT= -O
++KDEFINES= -DKERNEL -D_KERNEL
++COPTDYN= -fpic
++COPTGPROF= -pg
++
++LIB_PREFIX= lib
++LIB_SUFFIX= .a
++SHL_SUFFIX= .so.1.0
++
++#LIB_SOCKET= -lsocket -lnsl -ldl
++LIB_SOCKET=
++LIB_MATH= -lm
++#LIB_KVM= -lkvm
++LIB_KVM=
++
++LIBS_PATH= -L$(OLIBSDIR)
++
++LDFLAGS= $(LDOPTS) $(LDOPTX)
++LDLIBS= $(LIBS) $(LIBX)
++
++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
++LDOPTS= $(LIBS_PATH) $(LDPATH)
++LDOPTDYN= -shared -Wl,-soname,$(TARGET)
++LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
++
++FLOAT_OPTIONS=
++
++CC= @echo " ==> COMPILING \"$@\""; gcc
++LDCC= @echo " ==> LINKING \"$@\""; gcc
++DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
++RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
++ARFLAGS= cr
++LORDER= lorder
++TSORT= tsort
++
++RMDEP= :
++MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
++MKDEP_OUT=
--- /dev/null
+++ sysutils/cdrdao/files/patch-dao::cdrdao.man
@@ -0,0 +1,27 @@
+--- dao/cdrdao.man.orig Sat Dec 28 03:05:59 2002
++++ dao/cdrdao.man Sat Dec 28 03:08:17 2002
+@@ -764,11 +764,9 @@
+ .I cdrdao
+ in that order:
+
+-1. /etc/cdrdao.conf
++1. %%PREFIX%%/etc/cdrdao.conf
+
+-2. /etc/defaults/cdrdao
+-
+-3. $HOME/.cdrdao
++2. $HOME/.cdrdao
+
+
+ Command line options will overwrite the loaded settings.
+@@ -831,8 +829,8 @@
+
+ .SH BUGS
+ If the program is terminated during the write/simulation process used IPC
+-resources may not be released. Use ipcs(8) and ipcrm(8) to delete them.
++resources may not be released. Use ipcs(1) and ipcrm(1) to delete them.
+ .SH AUTHOR
+ Andreas Mueller mueller at daneb.ping.de
+ .SH SEE ALSO
+-.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(8), " ipcrm (8)
++.BR gcdmaster "(1), "cdrecord "(1), "cdda2wav "(1), "cdparanoia "(1), " sox "(1), "ipcs "(1), " ipcrm (1)
More information about the Midnightbsd-cvs
mailing list