Add patch from upstream to fix build with perl 5.10.0.

Regen plist while there. ok phessler@
This commit is contained in:
sthen 2008-10-03 11:17:17 +00:00
parent ec2fd82af4
commit cbaad388d9
3 changed files with 39 additions and 8 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2008/07/25 20:48:12 martynas Exp $
# $OpenBSD: Makefile,v 1.5 2008/10/03 11:17:17 sthen Exp $
COMMENT= SVG vector drawing application
DISTNAME= inkscape-0.46
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= graphics
MAINTAINER= Benoit Chesneau <benoitc@metavers.net>

View File

@ -0,0 +1,34 @@
$OpenBSD: patch-utf8-to-roff,v 1.1 2008/10/03 11:17:17 sthen Exp $
r18573 from upstream;
"utf8-to-roff: work around what's arguably a bug in perl 5.10"
--- utf8-to-roff.orig Tue Mar 11 04:20:51 2008
+++ utf8-to-roff Fri Oct 3 12:05:01 2008
@@ -1,9 +1,25 @@
-#! /usr/bin/perl -w -CI
+if (true || '\'); then exec perl -CI "$0" "$@"; fi # ') {}
+# The above uses the fact that backslash isn't special in single quotes in
+# shell script, whereas in perl it escapes the following single quote.
+#
+# The problem it tries to solve is that we want perl to be run with -CI flag
+# (to have stdin interpreted as utf-8), so we would use `#! /usr/bin/perl -CI',
+# except that if we do that then perl 5.10 complains about it being too late
+# to apply -CI if the script is run with `perl -CI ./utf8-to-roff', as we want
+# to do from the Makefile. The reason we don't do `./utf8-to-roff' from the makefile
+# is that then we require the #! line to have the right location of perl instead of
+# just consulting the path. (Similarly, we could use `#! /usr/bin/env perl -CI',
+# though that still requires that /usr/bin/env exist.) The reason we don't just
+# remove the `-CI' from the #! line is that then the script couldn't be run correctly
+# with ./utf8-to-roff.
+
+
# Converts a man page from utf8 (not understood by groff 1.18) to groff escapes.
# I couldn't find any existing tool to convert from utf8 to groff, though I
# seem to recall seeing some code to do so somewhere.
#
# Hereby released into public domain by Peter Moulder.
+use warnings;
use strict;
# Table generated automatically using:

View File

@ -1,12 +1,11 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
bin/inkscape
bin/inkview
@comment $OpenBSD: PLIST,v 1.2 2008/10/03 11:17:17 sthen Exp $
@bin bin/inkscape
@bin bin/inkview
man/fr/
man/fr/man1/
@man man/fr/man1/inkscape.1
@man man/man1/inkscape.1
@man man/man1/inkview.1
share/applications/
share/applications/inkscape.desktop
share/inkscape/
share/inkscape/clipart/
@ -535,8 +534,6 @@ share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/inkscape.mo
share/locale/et/LC_MESSAGES/inkscape.mo
share/locale/eu/
share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/inkscape.mo
share/locale/fi/LC_MESSAGES/inkscape.mo
share/locale/fr/LC_MESSAGES/inkscape.mo