>Number:         20604
>Category:       pkg
>Synopsis:       Update print/lyx package to use python
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Mar 06 12:48:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Miguel Mendez
>Release:        NetBSD 1.6O
>Organization:
>Environment:
	
	
System: NetBSD christine 1.6O NetBSD 1.6O (CHRISTINE.MP) #0: Tue Feb 25 21:35:01 CET 2003 root@christine:/usr/src/sys/arch/i386/compile/CHRISTINE.MP i386
Architecture: i386
Machine: i386
>Description:
The conversion scripts in LyX 1.3.0 are written in python. It's not a build depend,
so I've added it. Also patch the scripts so we call python2.2
>How-To-Repeat:
	
>Fix:

diff -ruN lyx.old/CVS/Entries lyx/CVS/Entries
--- lyx.old/CVS/Entries	2003-03-06 21:42:12.000000000 +0100
+++ lyx/CVS/Entries	2003-03-06 09:49:20.000000000 +0100
@@ -1,6 +1,6 @@
 /DESCR/1.1/Wed Oct 31 23:27:48 2001//
-/Makefile/1.53/Sun Mar  2 14:57:35 2003//
-/PLIST/1.7/Sun Mar  2 14:57:35 2003//
-/distinfo/1.15/Sun Mar  2 14:57:35 2003//
 D/patches////
+/Makefile/1.53/Mon Mar  3 20:38:00 2003//
+/PLIST/1.7/Mon Mar  3 20:38:00 2003//
+/distinfo/1.15/Mon Mar  3 20:38:00 2003//
 D
diff -ruN lyx.old/CVS/Entries.Log lyx/CVS/Entries.Log
--- lyx.old/CVS/Entries.Log	1970-01-01 01:00:00.000000000 +0100
+++ lyx/CVS/Entries.Log	2003-03-06 21:21:04.000000000 +0100
@@ -0,0 +1,4 @@
+A D/files////
+A D/pkg////
+R D/pkg////
+R D/files////
diff -ruN lyx.old/Makefile lyx/Makefile
--- lyx.old/Makefile	2003-03-02 15:57:35.000000000 +0100
+++ lyx/Makefile	2003-03-06 21:22:42.000000000 +0100
@@ -54,6 +54,7 @@
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../lang/gcc/buildlink2.mk"
+.include "../../lang/python22/buildlink2.mk"
 .include "../../textproc/aiksaurus/buildlink2.mk"
 .include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
diff -ruN lyx.old/distinfo lyx/distinfo
--- lyx.old/distinfo	2003-03-02 15:57:35.000000000 +0100
+++ lyx/distinfo	2003-03-06 21:40:26.000000000 +0100
@@ -2,5 +2,13 @@
 
 SHA1 (lyx-1.3.0.tar.gz) = 73324cf30ebb3b6997b979616a4069fffbd54b30
 Size (lyx-1.3.0.tar.gz) = 7270856 bytes
+SHA1 (patch-aa) = f8b815a433c3c77fabbe1d5624636d05f9e9ad30
+SHA1 (patch-ab) = c20f60425caf8a58c000074395b6b0d73e8b8cea
+SHA1 (patch-ac) = 1befc4ecdd2df71b99a01fe329cf2e83608926e1
 SHA1 (patch-ad) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
+SHA1 (patch-ae) = bd4ea9f304eba89796c34a53155792055062ae56
 SHA1 (patch-af) = 687545826d3727ba19e555d72d91162525c665f5
+SHA1 (patch-ag) = f16e44e985d002fca8c708fea4a747185df0faa1
+SHA1 (patch-ah) = f193659f2a21d3efe15133820934fa77363f89fc
+SHA1 (patch-ai) = a49eac76618df3b37bc6749958dc9087ae5f3d02
+SHA1 (patch-aj) = 8ce78ea029aad3cdd6c0a7b62b8c823dfe42fba2
diff -ruN lyx.old/patches/CVS/Entries lyx/patches/CVS/Entries
--- lyx.old/patches/CVS/Entries	2003-03-06 21:42:09.000000000 +0100
+++ lyx/patches/CVS/Entries	2003-03-03 21:38:00.000000000 +0100
@@ -1,3 +1,3 @@
-/patch-ad/1.4/Sun Mar  2 14:57:37 2003//
+/patch-ad/1.4/Mon Mar  3 20:38:00 2003//
 /patch-af/1.1/Sun Mar  2 14:57:38 2003//
 D
diff -ruN lyx.old/patches/patch-aa lyx/patches/patch-aa
--- lyx.old/patches/patch-aa	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-aa	2003-03-06 21:37:53.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/lyx2lyx/lyx2lyx.orig	2003-03-06 21:27:24.000000000 +0100
++++ lib/lyx2lyx/lyx2lyx	2003-03-06 21:27:51.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.2
+ # Copyright (C) 2002 José Matos <jamatos@lyx.org>
+ #
+ # This program is free software; you can redistribute it and/or
diff -ruN lyx.old/patches/patch-ab lyx/patches/patch-ab
--- lyx.old/patches/patch-ab	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-ab	2003-03-06 21:37:57.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- development/tools/generate_symbols_list.py.orig	2003-03-06 21:29:54.000000000 +0100
++++ development/tools/generate_symbols_list.py	2003-03-06 21:30:05.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.2
+ import sys,string,re,os
+ 
+ def get_code(code, font):
diff -ruN lyx.old/patches/patch-ac lyx/patches/patch-ac
--- lyx.old/patches/patch-ac	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-ac	2003-03-06 21:38:00.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/scripts/fen2ascii.py.orig	2003-03-06 21:32:49.000000000 +0100
++++ lib/scripts/fen2ascii.py	2003-03-06 21:32:57.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.2
+ #
+ # Copyright (C) 2001 The LyX Team.
+ #
diff -ruN lyx.old/patches/patch-ae lyx/patches/patch-ae
--- lyx.old/patches/patch-ae	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-ae	2003-03-06 21:38:11.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/scripts/fig2pstex.py.orig	2003-03-06 21:33:06.000000000 +0100
++++ lib/scripts/fig2pstex.py	2003-03-06 21:33:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.2
+ # This script converts a xfig file into Postscript/LaTeX files
+ 
+ import sys
diff -ruN lyx.old/patches/patch-ag lyx/patches/patch-ag
--- lyx.old/patches/patch-ag	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-ag	2003-03-06 21:38:25.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/scripts/general_command_wrapper.py.orig	2003-03-06 21:33:17.000000000 +0100
++++ lib/scripts/general_command_wrapper.py	2003-03-06 21:33:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.2
+ # This is a general wrapper script that will allow
+ # us to maintain security in the external material
+ # insets.
diff -ruN lyx.old/patches/patch-ah lyx/patches/patch-ah
--- lyx.old/patches/patch-ah	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-ah	2003-03-06 21:38:32.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/scripts/listerrors.orig	2003-03-06 21:33:25.000000000 +0100
++++ lib/scripts/listerrors	2003-03-06 21:33:29.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.2
+ """reformat noweb and compiler errors for LyX.
+ 
+ Expects to read from stdin and output to stdout.
diff -ruN lyx.old/patches/patch-ai lyx/patches/patch-ai
--- lyx.old/patches/patch-ai	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-ai	2003-03-06 21:38:40.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/scripts/pic2ascii.py.orig	2003-03-06 21:33:38.000000000 +0100
++++ lib/scripts/pic2ascii.py	2003-03-06 21:33:43.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.2
+ # This script converts a raster format picture into an ascii representation
+ # with the suffix .asc
+ 
diff -ruN lyx.old/patches/patch-aj lyx/patches/patch-aj
--- lyx.old/patches/patch-aj	1970-01-01 01:00:00.000000000 +0100
+++ lyx/patches/patch-aj	2003-03-06 21:38:50.000000000 +0100
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- lib/scripts/pic2png_eps.py.orig	2003-03-06 21:33:56.000000000 +0100
++++ lib/scripts/pic2png_eps.py	2003-03-06 21:34:03.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.2
+ # This script converts a raster format picture into a PNG and EPS file
+ 
+ import sys

>Release-Note:
>Audit-Trail:
>Unformatted: