From 2a532e525e55b9a9597d7c48a7e652bdb2fb9cae Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 28 Oct 2003 00:40:38 +0000
Subject: Enable XML interface for advanced features, per Ben Collver's PR
 23271. Bump PKGREVISION.

---
 sysutils/vcdimager-devel/Makefile         |  6 +++---
 sysutils/vcdimager-devel/PLIST            | 10 +++++++++-
 sysutils/vcdimager-devel/distinfo         |  4 +++-
 sysutils/vcdimager-devel/patches/patch-aa | 22 ++++++++++++++++++++++
 sysutils/vcdimager-devel/patches/patch-ab | 22 ++++++++++++++++++++++
 5 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 sysutils/vcdimager-devel/patches/patch-aa
 create mode 100644 sysutils/vcdimager-devel/patches/patch-ab

(limited to 'sysutils')

diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index c27be725901..25102d5011d 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/08/09 10:44:50 seb Exp $
+# $NetBSD: Makefile,v 1.9 2003/10/28 00:40:38 wiz Exp $
 #
 
 DISTNAME=	vcdimager-0.7.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/vcdimager/
 
@@ -18,5 +18,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
 INFO_FILES=	vcdimager.info
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-
+.include "../../textproc/libxml2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vcdimager-devel/PLIST b/sysutils/vcdimager-devel/PLIST
index 7cb7f55f7ce..e4f5ed5a460 100644
--- a/sysutils/vcdimager-devel/PLIST
+++ b/sysutils/vcdimager-devel/PLIST
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/05 21:07:43 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/10/28 00:40:38 wiz Exp $
 bin/cdxa2mpeg
 bin/vcddebug
 bin/vcdimager
+bin/vcdxbuild
+bin/vcdxgen
+bin/vcdxminfo
+bin/vcdxrip
 info/vcdimager.info
 info/vcdimager.info-1
 info/vcdimager.info-2
 info/vcdimager.info-3
 man/man1/vcdimager.1
 man/man1/vcddebug.1
+man/man1/vcdxbuild.1
+man/man1/vcdxgen.1
+man/man1/vcdxminfo.1
+man/man1/vcdxrip.1
diff --git a/sysutils/vcdimager-devel/distinfo b/sysutils/vcdimager-devel/distinfo
index 3d39db35edc..e6776329c12 100644
--- a/sysutils/vcdimager-devel/distinfo
+++ b/sysutils/vcdimager-devel/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/25 12:29:22 wiz Exp $
+$NetBSD: distinfo,v 1.2 2003/10/28 00:40:38 wiz Exp $
 
 SHA1 (vcdimager-0.7.12.tar.gz) = bea4b5f8fd5ad9165219e5fdcf40890b1698d9db
 Size (vcdimager-0.7.12.tar.gz) = 520829 bytes
+SHA1 (patch-aa) = 6e9a9a38952840593affd5d8dba449cdd406f46b
+SHA1 (patch-ab) = 397644b04c25eedb7fb4146867d062856ea5b7e6
diff --git a/sysutils/vcdimager-devel/patches/patch-aa b/sysutils/vcdimager-devel/patches/patch-aa
new file mode 100644
index 00000000000..2072e5dc8f2
--- /dev/null
+++ b/sysutils/vcdimager-devel/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2003/10/28 00:40:38 wiz Exp $
+
+--- aclocal.m4.orig	2002-01-04 12:30:38.000000000 -0800
++++ aclocal.m4
+@@ -4246,7 +4246,7 @@ dnl
+       AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ 
+ int 
+ main()
+@@ -4341,7 +4341,7 @@ main()
+           CFLAGS="$CFLAGS $XML_CFLAGS"
+           LIBS="$LIBS $XML_LIBS"
+           AC_TRY_LINK([
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ #include <stdio.h>
+ ],      [ LIBXML_TEST_VERSION; return 0;],
+         [ echo "*** The test program compiled, but did not run. This usually means"
diff --git a/sysutils/vcdimager-devel/patches/patch-ab b/sysutils/vcdimager-devel/patches/patch-ab
new file mode 100644
index 00000000000..b9809496afb
--- /dev/null
+++ b/sysutils/vcdimager-devel/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2003/10/28 00:40:38 wiz Exp $
+
+--- configure.orig	2002-01-04 12:30:49.000000000 -0800
++++ configure
+@@ -7790,7 +7790,7 @@ else
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ 
+ int
+ main()
+@@ -7911,7 +7911,7 @@ echo "${ECHO_T}no" >&6
+ #line 7911 "configure"
+ #include "confdefs.h"
+ 
+-#include <xmlversion.h>
++#include <libxml/xmlversion.h>
+ #include <stdio.h>
+ 
+ #ifdef F77_DUMMY_MAIN
-- 
cgit v1.2.3