aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/cdrdao/Makefile37
-rw-r--r--sysutils/cdrdao/distinfo6
-rw-r--r--sysutils/cdrdao/files/patch-configure1104
-rw-r--r--sysutils/cdrdao/files/patch-dao::Makefile.in13
-rw-r--r--sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc11
-rw-r--r--sysutils/cdrdao/files/patch-dao::main.cc18
-rw-r--r--sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk8
-rw-r--r--sysutils/cdrdao/files/patch-utils::Makefile.in17
-rw-r--r--sysutils/cdrdao/files/patch-xdao::Makefile.in15
-rw-r--r--sysutils/gcdmaster/Makefile1
-rw-r--r--sysutils/gcdmaster/pkg-plist1
11 files changed, 39 insertions, 1192 deletions
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index ee775fec09c4..ee6c660cf1f4 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= cdrdao
-PORTVERSION= 1.2.2
-PORTREVISION?= 1
+PORTVERSION= 1.2.3
+PORTREVISION?= 0
CATEGORIES= sysutils audio
MASTER_SITES= SF
DISTNAME= cdrdao-${PORTVERSION}
@@ -28,35 +28,42 @@ MP3OGG_LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao \
.if ${PORTNAME} == "gcdmaster"
USE_GNOME= gnomehier pkgconfig
-LIB_DEPENDS= ${MP3OGG_LIB_DEPENDS} \
+GCONF_SCHEMAS= gcdmaster.schemas
+LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \
gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
-RUN_DEPENDS= ${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \
+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
+CONFIGURE_ARGS+= --with-lame=no
.else
-MAN1= cdrdao.1 cue2toc.1
-CONFIGURE_ARGS= --without-xdao
+MAN1= cdrdao.1 cue2toc.1 toc2cddb.1 toc2cue.1
+CONFIGURE_ARGS+= --with-xdao=no
.if defined(WITH_TOC2MP3)
-LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame
+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
+CONFIGURE_ARGS+= --with-lame=no
PLIST_SUB+= TOC2MP3="@comment "
.endif
.if !defined(WITHOUT_MP3OGG)
USE_GNOME= pkgconfig
LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS}
+CONFIGURE_ENV+= AO_CFLAGS=-I${LOCALBASE}/include \
+ AO_LIBS="-L${LOCALBASE}/lib -lao" \
+ MAD_CFLAGS=-I${LOCALBASE}/include \
+ MAD_LIBS="-L${LOCALBASE}/lib -lmad" \
+ VORBISFILE_CFLAGS=-I${LOCALBASE}/include \
+ VORBISFILE_LIBS="-L${LOCALBASE}/lib -lvorbisfile"
.else
-CONFIGURE_ARGS+= --without-mp3-support --without-ogg-support
+CONFIGURE_ARGS+= --with-mp3-support=no --with-ogg-support=no
.endif
.endif
CONFIGURE_ARGS+= --with-pcctsbin=${LOCALBASE}/bin \
--with-pcctsinc=${LOCALBASE}/include/pccts \
- --without-posix-threads --with-scglib=pkg
+ --with-posix-threads=no --with-scglib
MAKE_ENV= CCOM=cc LANG=C
SCSILIBTARGET= ${ARCH}-freebsd-cc
@@ -112,6 +119,9 @@ post-patch:
.endfor
@${REINPLACE_CMD} -E -e 's|(^CDRDAO_DATA_DIR.+=).+|\1 ${DATADIR}|' \
${WRKSRC}/dao/Makefile.in
+.for i in toc2cddb.1 toc2cue.1
+ @${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i}
+.endfor
.endif
do-install:
@@ -131,9 +141,12 @@ do-install:
${LOCALBASE}/share/mime-info
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \
${LOCALBASE}/share/pixmaps
+ @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.schemas \
+ ${LOCALBASE}/etc/gconf/schemas
@${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \
${LOCALBASE}/share/mime/packages
@${MKDIR} ${DATADIR}
+ @${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade ${DATADIR}
@${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${DATADIR}
.else
@${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${PREFIX}/bin
@@ -141,7 +154,9 @@ do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${PREFIX}/bin
@${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${PREFIX}/man/man1
@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${PREFIX}/man/man1
@${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${PREFIX}/bin
+ @${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${PREFIX}/man/man1
@${MKDIR} ${DATADIR}
@${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${DATADIR}/drivers
.if defined(WITH_TOC2MP3)
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index 2a9793dc6c85..abce168b5cb8 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdrdao-1.2.2.tar.bz2) = f0cbf36907406cb4f4c568f9e6669a34
-SHA256 (cdrdao-1.2.2.tar.bz2) = de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
-SIZE (cdrdao-1.2.2.tar.bz2) = 1408344
+MD5 (cdrdao-1.2.3.tar.bz2) = 8d15ba6280bb7ba2f4d6be31d28b3c0c
+SHA256 (cdrdao-1.2.3.tar.bz2) = 8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e
+SIZE (cdrdao-1.2.3.tar.bz2) = 1428695
diff --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure
deleted file mode 100644
index e2c19c4c8ff6..000000000000
--- a/sysutils/cdrdao/files/patch-configure
+++ /dev/null
@@ -1,1104 +0,0 @@
---- 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
-
-
-@@ -10333,10 +10247,7 @@
- scsilib_objs="ScsiIf-lib.o"
-
- case "$host" in
-- *-freebsd2*)
-- scsilib_libs="$scsilib_libs"
-- ;;
-- *-freebsd[34567]*)
-+ *-freebsd*)
- scsilib_libs="$scsilib_libs -lcam"
- ;;
- esac
-@@ -10355,7 +10266,7 @@
- scsilib_objs="ScsiIf-linux.o sg_err.o"
- ;;
-
-- *-freebsd[34567]*)
-+ *-freebsd*)
- scsilib_libs="-lcam"
- scsilib_objs="ScsiIf-freebsd-cam.o"
- ;;
-@@ -10601,7 +10512,7 @@
- esac
-
- case "$host" in
-- *-linux* | *-freebsd[4567]* | *-solaris*)
-+ *-linux* | *-freebsd* | *-solaris*)
- sound_if_obj=SoundIF-ao.o
- ;;
-
-@@ -10612,146 +10523,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 +10936,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 +11914,6 @@
- s,@LAME_CFLAGS@,$LAME_CFLAGS,;t t
- s,@LAME_LIBS@,$LAME_LIBS,;t t
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
--s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s,@SIGCPP2_CFLAGS@,$SIGCPP2_CFLAGS,;t t
- s,@SIGCPP2_LIBS@,$SIGCPP2_LIBS,;t t
- s,@GTKMM2_CFLAGS@,$GTKMM2_CFLAGS,;t t
diff --git a/sysutils/cdrdao/files/patch-dao::Makefile.in b/sysutils/cdrdao/files/patch-dao::Makefile.in
deleted file mode 100644
index 9825c488840b..000000000000
--- a/sysutils/cdrdao/files/patch-dao::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- dao/Makefile.in.orig 2006-09-20 10:51:30.000000000 +0000
-+++ dao/Makefile.in 2007-08-31 22:31:51.000000000 +0000
-@@ -315,8 +315,8 @@
- libdao_a_DEPENDENCIES = \
- @scsilib_objs@
-
--cdrdao_LDADD = -L. -ldao -L$(top_builddir)/paranoia -lcdda_paranoia \
-- -L$(top_builddir)/trackdb -ltrackdb @thread_libs@ \
-+cdrdao_LDADD = ./libdao.a $(top_builddir)/paranoia/libcdda_paranoia.a \
-+ $(top_builddir)/trackdb/libtrackdb.a @thread_libs@ \
- @scsilib_libs@ $(am__append_1) $(am__append_2) @AO_LIBS@
- cdrdao_DEPENDENCIES = \
- $(top_builddir)/paranoia/libcdda_paranoia.a \
diff --git a/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc b/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
deleted file mode 100644
index 4314414c0b1c..000000000000
--- a/sysutils/cdrdao/files/patch-dao::ScsiIf-lib.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- dao/ScsiIf-lib.cc.orig Tue Oct 29 19:40:39 2002
-+++ dao/ScsiIf-lib.cc Tue Oct 29 20:14:24 2002
-@@ -430,7 +430,7 @@
- #include "ScsiIf-common.cc"
- //<<<<<<< ScsiIf-lib.cc
-
--#ifndef linux
-+#ifdef linux
-
- /* Function for mapping any SCSI device to the corresponding SG device.
- * Taken from D. Gilbert's example code.
diff --git a/sysutils/cdrdao/files/patch-dao::main.cc b/sysutils/cdrdao/files/patch-dao::main.cc
index ab89bf6c6622..01782c823acb 100644
--- a/sysutils/cdrdao/files/patch-dao::main.cc
+++ b/sysutils/cdrdao/files/patch-dao::main.cc
@@ -1,15 +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 @@
+@@ -2314,11 +2314,7 @@
- SETTINGS = new Settings;
+ Settings* settings = new Settings;
-- settingsPath = "/etc/cdrdao.conf";
-- if (SETTINGS->read(settingsPath) == 0)
-- message(3, "Read settings from \"%s\".", settingsPath);
+- settingsPath = "/etc/cdrdao.conf";
+- if (settings->read(settingsPath) == 0)
+- log_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);
+- settingsPath = "/etc/defaults/cdrdao";
++ settingsPath = "%%PREFIX%%/etc/cdrdao.conf";
+ if (settings->read(settingsPath) == 0)
+ log_message(3, "Read settings from \"%s\".", settingsPath);
diff --git a/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk b/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk
deleted file mode 100644
index f6899477dae0..000000000000
--- a/sysutils/cdrdao/files/patch-scsilib::inc::avoffset.mk
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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)
diff --git a/sysutils/cdrdao/files/patch-utils::Makefile.in b/sysutils/cdrdao/files/patch-utils::Makefile.in
deleted file mode 100644
index ca4b959011de..000000000000
--- a/sysutils/cdrdao/files/patch-utils::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- utils/Makefile.in.orig Sun Feb 15 04:04:35 2004
-+++ utils/Makefile.in Mon Feb 16 00:50:20 2004
-@@ -237,11 +237,11 @@
- toc2cue_SOURCES = toc2cue.cc
- cue2toc_SOURCES = main.c cue2toc.c cue2toc.h timecode.c timecode.h
- toc2mp3_SOURCES = toc2mp3.cc
--toc2cddb_LDADD = -L$(top_builddir)/trackdb -ltrackdb $(am__append_1) \
-+toc2cddb_LDADD = $(top_builddir)/trackdb/libtrackdb.a $(am__append_1) \
- $(am__append_4) @AO_LIBS@
--toc2cue_LDADD = -L$(top_builddir)/trackdb -ltrackdb $(am__append_2) \
-+toc2cue_LDADD = $(top_builddir)/trackdb/libtrackdb.a $(am__append_2) \
- $(am__append_5) @AO_LIBS@
--toc2mp3_LDADD = -L$(top_builddir)/trackdb -ltrackdb @LAME_LIBS@ \
-+toc2mp3_LDADD = $(top_builddir)/trackdb/libtrackdb.a @LAME_LIBS@ \
- $(am__append_3) $(am__append_6) @AO_LIBS@
- toc2mp3_CXXFLAGS = @LAME_CFLAGS@
- INCLUDES = -I$(top_builddir)/trackdb
diff --git a/sysutils/cdrdao/files/patch-xdao::Makefile.in b/sysutils/cdrdao/files/patch-xdao::Makefile.in
deleted file mode 100644
index 9f261df68d2e..000000000000
--- a/sysutils/cdrdao/files/patch-xdao::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- xdao/Makefile.in.orig 2006-09-20 10:51:34.000000000 +0000
-+++ xdao/Makefile.in 2007-08-31 22:33:12.000000000 +0000
-@@ -341,9 +341,9 @@
- glade_DATA = \
- glade/ProjectChooser.glade
-
--gcdmaster_LDADD = @sound_if_obj@ -L$(top_builddir)/dao -ldao \
-- -L$(top_builddir)/paranoia -lcdda_paranoia \
-- -L$(top_builddir)/trackdb -ltrackdb @scsilib_libs@ \
-+gcdmaster_LDADD = @sound_if_obj@ $(top_builddir)/dao/libdao.a \
-+ $(top_builddir)/paranoia/libcdda_paranoia.a \
-+ $(top_builddir)/trackdb/libtrackdb.a @scsilib_libs@ \
- @LIBGUIMM2_LIBS@ @GTKMM2_LIBS@ $(am__append_1) $(am__append_3) \
- @AO_LIBS@ $(am__empty)
- AM_CXXFLAGS = @GTKMM2_CFLAGS@ @LIBGUIMM2_CFLAGS@ @AO_CFLAGS@ \
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index db9e23f3c336..2a8112f330f3 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -6,7 +6,6 @@
#
PORTNAME= gcdmaster
-PORTREVISION= 3
COMMENT= GNOME frontend for cdrdao
diff --git a/sysutils/gcdmaster/pkg-plist b/sysutils/gcdmaster/pkg-plist
index 5c7e16737e65..02b5fd38a219 100644
--- a/sysutils/gcdmaster/pkg-plist
+++ b/sysutils/gcdmaster/pkg-plist
@@ -1,4 +1,5 @@
bin/gcdmaster
+%%DATADIR%%/Preferences.glade
%%DATADIR%%/ProjectChooser.glade
share/application-registry/gcdmaster.applications
share/applications/gcdmaster.desktop
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 07:35:30 +0000