Use cp1250 instead of windows-1250 for an encoding as the former

seems to be a bit more widely supported.  Fixes unknown encoding problems
on netbsd-2 when building textproc/xmlto

4 files changed, 35 insertions, 2 deletions

diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index a0f91b719a8..b75f0b5bc9f 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2007/08/31 08:32:57 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/10/01 23:39:20 dmcmahill Exp $
 #
 
 DISTNAME=	docbook-xsl-1.73.2
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,6 +40,10 @@ do-install:
 	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \
 	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \
 	done
+	for f in `${FIND} ${DESTDIR}${XSLDIR} -name \*.orig -print` ; do \
+		${ECHO} "Remove .orig file $$f" ; \
+		${RM} $$f ; \
+	done
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-xsl/distinfo b/textproc/docbook-xsl/distinfo
index 62137ab76ed..ecd8a32ac8c 100644
--- a/textproc/docbook-xsl/distinfo
+++ b/textproc/docbook-xsl/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.22 2007/08/31 08:32:57 wiz Exp $
+$NetBSD: distinfo,v 1.23 2007/10/01 23:39:21 dmcmahill Exp $
 
 SHA1 (docbook-xsl-1.73.2.tar.bz2) = f33a07535410a5e90041045dbc8027196ab353cb
 RMD160 (docbook-xsl-1.73.2.tar.bz2) = 5d3bfae0b3705c5ae93fa5b1678df215d18dbef6
 Size (docbook-xsl-1.73.2.tar.bz2) = 1674300 bytes
+SHA1 (patch-aa) = 6e4b4bc4bb0d04556e769f02ca51fa53c657f9a4
+SHA1 (patch-ab) = 7b214be5405967d582cbe6ed6e923709c3c353ce
diff --git a/textproc/docbook-xsl/patches/patch-aa b/textproc/docbook-xsl/patches/patch-aa
new file mode 100644
index 00000000000..db03ef12629
--- /dev/null
+++ b/textproc/docbook-xsl/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2007/10/01 23:39:21 dmcmahill Exp $
+
+cp1250 seems to be a bit more widely supported.  Fixes unknown encoding problems
+on netbsd-2
+
+--- fo/biblio-iso690.xsl.orig	2007-06-28 23:19:07.000000000 +0000
++++ fo/biblio-iso690.xsl
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="windows-1250"?>
++<?xml version="1.0" encoding="cp1250"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                 version='1.0'>
diff --git a/textproc/docbook-xsl/patches/patch-ab b/textproc/docbook-xsl/patches/patch-ab
new file mode 100644
index 00000000000..710fc97e91d
--- /dev/null
+++ b/textproc/docbook-xsl/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2007/10/01 23:39:22 dmcmahill Exp $
+
+cp1250 seems to be a bit more widely supported.  Fixes unknown encoding problems
+on netbsd-2
+
+--- html/biblio-iso690.xsl.orig	2007-06-28 23:19:07.000000000 +0000
++++ html/biblio-iso690.xsl
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="windows-1250"?>
++<?xml version="1.0" encoding="cp1250"?>
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version='1.0'>
+