3 files changed, 72 insertions, 4 deletions
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 768235b178d..8e2fc74a155 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2004/10/03 00:18:17 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/03/23 18:02:48 reed Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xcdroast/}
 
@@ -53,7 +53,6 @@ post-install:
 	done)
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index 6ef0e2fda65..b99d6bb042a 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 13:40:59 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/03/23 18:02:48 reed Exp $
 
 SHA1 (xcdroast-0.98alpha15.tar.gz) = f354ea9ffe918c4ec11312d5537e6e245730fecc
 RMD160 (xcdroast-0.98alpha15.tar.gz) = 9198f67659023ce8f508fa2c331df9d9c8b81a8f
@@ -6,4 +6,5 @@ Size (xcdroast-0.98alpha15.tar.gz) = 3282794 bytes
 SHA1 (gtk2locale.patch) = bb3d2f2c7edede86af6c367c8b5b09339251250c
 Size (gtk2locale.patch) = 643 bytes
 SHA1 (patch-aa) = 0beee32a5550646cd360459d90281cb0ec9a826a
+SHA1 (patch-ab) = 085da3b440ba1d6a0e305626e1ac3fba49d2f546
 SHA1 (patch-ad) = 417a82344e14ae2a9f602254b152337c33afae4a
diff --git a/sysutils/xcdroast/patches/patch-ab b/sysutils/xcdroast/patches/patch-ab
new file mode 100644
index 00000000000..2d9050811f4
--- /dev/null
+++ b/sysutils/xcdroast/patches/patch-ab
@@ -0,0 +1,68 @@
+$NetBSD: patch-ab,v 1.5 2005/03/23 18:02:48 reed Exp $
+
+--- configure.orig	2003-10-25 15:51:45.000000000 -0700
++++ configure
+@@ -4361,55 +4361,6 @@ echo "$as_me: error: Library requirement
+ 	LIBS="$LIBS $PKGCONFIG_LIBS"
+ 	CFLAGS="$CFLAGS $PKGCONFIG_CFLAGS"
+ 
+-	# Extract the first word of "pcre-config", so it can be a program name with args.
+-set dummy pcre-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_PCRE_CONFIG+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case $PCRE_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PCRE_CONFIG="$PCRE_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_PCRE_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_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="no"
+-  ;;
+-esac
+-fi
+-PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
+-
+-if test -n "$PCRE_CONFIG"; then
+-  echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5
+-echo "${ECHO_T}$PCRE_CONFIG" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-	if test "x$PCRE_CONFIG" = "xno" ; then
+-        	{ { echo "$as_me:$LINENO: error: pcre-config not found please install libpcre3-dev or similar" >&5
+-echo "$as_me: error: pcre-config not found please install libpcre3-dev or similar" >&2;}
+-   { (exit 1); exit 1; }; }
+-	else
+-        	LIBS="$LIBS `$PCRE_CONFIG --libs`"
+-        	CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
+-	fi
+-
+ else
+ 
+ 
+@@ -9249,7 +9200,6 @@ s,@ENABLE_GTK2@,$ENABLE_GTK2,;t t
+ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@PKGCONFIG_CFLAGS@,$PKGCONFIG_CFLAGS,;t t
+ s,@PKGCONFIG_LIBS@,$PKGCONFIG_LIBS,;t t
+-s,@PCRE_CONFIG@,$PCRE_CONFIG,;t t
+ s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
+ s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
+ s,@GLIB_LIBS@,$GLIB_LIBS,;t t