Add regenerated files for patch-aa and patch-ab, as I can't figure out

the build dependencies needed to regenerate them for bulk builds.

4 files changed, 245 insertions, 6 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 0cf9fd1d190..9900087356f 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/16 22:40:06 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/06 15:22:14 joerg Exp $
 #
 
 DISTNAME=	brasero-2.26.2
@@ -20,7 +20,6 @@ BUILD_DEPENDS+=         gnome-common>=2.26.0:../../devel/gnome-common
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake intltool gawk msgfmt
-USE_TOOLS+=	autoreconf autoconf automake
 USE_DIRS+=	gnome2-1.6
 
 CONFIGURE_ARGS+=	--disable-inotify
@@ -32,9 +31,6 @@ PKGCONFIG_OVERRIDE+=	libbrasero-media.pc.in
 post-extract:
 	cp ${FILESDIR}/scsi-netbsd.c ${WRKSRC}/libbrasero-media/
 
-pre-configure:
-	cd ${WRKSRC} && autoreconf -i
-
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 18012ca1b5f..6bf428a7c30 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2009/05/20 13:43:21 wiz Exp $
+$NetBSD: distinfo,v 1.4 2009/07/06 15:22:14 joerg Exp $
 
 SHA1 (brasero-2.26.2.tar.bz2) = a65f0167d209e86535611d37887481beb21e33c8
 RMD160 (brasero-2.26.2.tar.bz2) = 5110cd570448b9f3c4213483ee90f8f13a7dc038
 Size (brasero-2.26.2.tar.bz2) = 3326163 bytes
 SHA1 (patch-aa) = 3799e6f3a59e03bc8a187b0eca025c1f15bf5135
 SHA1 (patch-ab) = 5e9c3a4c3608a04270d6c7e034b5e3dd0c25e44f
+SHA1 (patch-ac) = 9829e879d145586bb00390c26d76879d8d999179
+SHA1 (patch-ad) = 80632fe45694e98692ab2aa69d24f97ad13de346
diff --git a/sysutils/brasero/patches/patch-ac b/sysutils/brasero/patches/patch-ac
new file mode 100644
index 00000000000..1d213f09efe
--- /dev/null
+++ b/sysutils/brasero/patches/patch-ac
@@ -0,0 +1,184 @@
+$NetBSD: patch-ac,v 1.1 2009/07/06 15:22:14 joerg Exp $
+
+--- configure.orig	2009-05-18 17:06:56.000000000 +0200
++++ configure
+@@ -912,6 +912,8 @@ HAVE_SG_IO_HDR_T_FALSE
+ HAVE_SG_IO_HDR_T_TRUE
+ HAVE_CAM_LIB_H_FALSE
+ HAVE_CAM_LIB_H_TRUE
++HAVE_SCSIIO_H_FALSE
++HAVE_SCSIIO_H_TRUE
+ BRASERO_SCSI_LIBS
+ LIBTOOL
+ ac_ct_F77
+@@ -21715,6 +21717,116 @@ else
+ fi
+ 
+ 
++{ $as_echo "$as_me:$LINENO: checking for scsireq_t" >&5
++$as_echo_n "checking for scsireq_t... " >&6; }
++if test "${ac_cv_type_scsireq_t+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_cv_type_scsireq_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++ #include <sys/scsiio.h>
++
++int
++main ()
++{
++if (sizeof (scsireq_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++ #include <sys/scsiio.h>
++
++int
++main ()
++{
++if (sizeof ((scsireq_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_scsireq_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_scsireq_t" >&5
++$as_echo "$ac_cv_type_scsireq_t" >&6; }
++if test "x$ac_cv_type_scsireq_t" = x""yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_SCSIREQ_T 1
++_ACEOF
++
++has_scsiio="yes"
++else
++  has_scsiio="no"
++fi
++
++
+ { $as_echo "$as_me:$LINENO: checking for struct uscsi_cmd" >&5
+ $as_echo_n "checking for struct uscsi_cmd... " >&6; }
+ if test "${ac_cv_type_struct_uscsi_cmd+set}" = set; then
+@@ -21829,11 +21941,13 @@ if test x"$has_cam" = x"yes"; then
+     BRASERO_SCSI_LIBS="-lcam"
+ elif test x"$has_sg" = x"yes"; then
+ 	:
++elif test x"$has_scsiio" = x"yes"; then
++	:
+ elif test x"$has_uscsi" = x"yes"; then
+ 	:
+ else
+-	{ { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
+-$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
++	{ { $as_echo "$as_me:$LINENO: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&5
++$as_echo "$as_me: error: Support Linux SG, FreeBSD CAM, NetBSD SCSIPI, Solaris USCSI. No supported SCSI interface headers could not be found." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -21861,6 +21975,14 @@ else
+   HAVE_USCSI_H_FALSE=
+ fi
+ 
++ if test x"$has_scsiio" = "xyes"; then
++  HAVE_SCSIIO_H_TRUE=
++  HAVE_SCSIIO_H_FALSE='#'
++else
++  HAVE_SCSIIO_H_TRUE='#'
++  HAVE_SCSIIO_H_FALSE=
++fi
++
+ 
+ 
+ # Check whether --enable-largefile was given.
+@@ -28616,6 +28738,13 @@ $as_echo "$as_me: error: conditional \"H
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${HAVE_SCSIIO_H_TRUE}" && test -z "${HAVE_SCSIIO_H_FALSE}"; then
++  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_SCSIIO_H\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++$as_echo "$as_me: error: conditional \"HAVE_SCSIIO_H\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+   { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -29161,6 +29290,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
diff --git a/sysutils/brasero/patches/patch-ad b/sysutils/brasero/patches/patch-ad
new file mode 100644
index 00000000000..38baa8eca12
--- /dev/null
+++ b/sysutils/brasero/patches/patch-ad
@@ -0,0 +1,57 @@
+$NetBSD: patch-ad,v 1.1 2009/07/06 15:22:14 joerg Exp $
+
+--- libbrasero-media/Makefile.in.orig	2009-05-18 17:06:54.000000000 +0200
++++ libbrasero-media/Makefile.in
+@@ -40,8 +40,11 @@ host_triplet = @host@
+ # Linux's SCSI CAM interface
+ @HAVE_SG_IO_HDR_T_TRUE@am__append_2 = scsi-sg.c
+ 
++# NetBSD's scsi(4)
++@HAVE_SCSIIO_H_TRUE@am__append_3 = scsi-netbsd.c
++
+ # Solaris's USCSI interface
+-@HAVE_USCSI_H_TRUE@am__append_3 = scsi-uscsi.c
++@HAVE_USCSI_H_TRUE@am__append_4 = scsi-uscsi.c
+ subdir = libbrasero-media
+ DIST_COMMON = $(libbraseromediainclude_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/brasero-media.h.in COPYING
+@@ -96,10 +99,11 @@ am__libbrasero_media_la_SOURCES_DIST = l
+ 	brasero-drive-selection.c brasero-drive-selection.h \
+ 	brasero-media-private.h brasero-medium-selection-priv.h \
+ 	brasero-gio-operation.h brasero-gio-operation.c scsi-cam.c \
+-	scsi-sg.c scsi-uscsi.c
++	scsi-sg.c scsi-uscsi.c scsi-netbsd.c
+ @HAVE_CAM_LIB_H_TRUE@am__objects_1 = scsi-cam.lo
+ @HAVE_SG_IO_HDR_T_TRUE@am__objects_2 = scsi-sg.lo
+-@HAVE_USCSI_H_TRUE@am__objects_3 = scsi-uscsi.lo
++@HAVE_SCSIIO_H_TRUE@am__objects_3 = scsi-netbsd.lo
++@HAVE_USCSI_H_TRUE@am__objects_4 = scsi-uscsi.lo
+ am_libbrasero_media_la_OBJECTS = libbrasero-marshal.lo \
+ 	scsi-get-configuration.lo scsi-read-disc-info.lo \
+ 	scsi-read-toc-pma-atip.lo scsi-sense-data.lo scsi-error.lo \
+@@ -114,7 +118,7 @@ am_libbrasero_media_la_OBJECTS = libbras
+ 	brasero-volume.lo brasero-drive.lo brasero-medium-selection.lo \
+ 	brasero-units.lo brasero-drive-selection.lo \
+ 	brasero-gio-operation.lo $(am__objects_1) $(am__objects_2) \
+-	$(am__objects_3)
++	$(am__objects_3) $(am__objects_4)
+ libbrasero_media_la_OBJECTS = $(am_libbrasero_media_la_OBJECTS)
+ libbrasero_media_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -420,7 +424,7 @@ libbrasero_media_la_SOURCES = libbrasero
+ 	brasero-drive-selection.c brasero-drive-selection.h \
+ 	brasero-media-private.h brasero-medium-selection-priv.h \
+ 	brasero-gio-operation.h brasero-gio-operation.c \
+-	$(am__append_1) $(am__append_2) $(am__append_3)
++	$(am__append_1) $(am__append_2) $(am__append_3) $(am__append_4)
+ EXTRA_DIST = \
+ 	libbrasero-marshal.list
+ 
+@@ -534,6 +538,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-sense-data.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-sg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-test-unit-ready.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-netbsd.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-uscsi.Plo@am__quote@
+ 
+ .c.o: