From 68b2a95000f8962b5be26955bbf08634061ffa7c Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 23 Oct 2010 19:23:51 +0200
Subject: xv, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/xv/Pkgfile                |  2 +-
 extra/xv/xv-3.10a-Makefile.diff | 25 -------------------------
 extra/xv/xv-3.10a-manpage.diff  | 12 ------------
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 extra/xv/xv-3.10a-Makefile.diff
 delete mode 100644 extra/xv/xv-3.10a-manpage.diff

(limited to 'extra')

diff --git a/extra/xv/Pkgfile b/extra/xv/Pkgfile
index 8f80c9d75..99e8d265c 100644
--- a/extra/xv/Pkgfile
+++ b/extra/xv/Pkgfile
@@ -8,7 +8,7 @@ version=3.10a
 release=2
 source=(ftp://ftp.trilon.com/pub/xv/${name}-${version}.tar.gz\
 	http://downloads.sourceforge.net/png-mng/$name-$version-jumbo-patches-20070520.tar.gz \
-        $name-$version-Makefile.diff)
+	http://nutyx.meticul.eu/files/patchs/$name/$name-$version-Makefile.diff)
 
 build() {
     cd $name-$version
diff --git a/extra/xv/xv-3.10a-Makefile.diff b/extra/xv/xv-3.10a-Makefile.diff
deleted file mode 100644
index 093778bc9..000000000
--- a/extra/xv/xv-3.10a-Makefile.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur xv-3.10a-orig/Makefile xv-3.10a/Makefile
---- xv-3.10a-orig/Makefile	2007-12-22 09:35:05.000000000 -0600
-+++ xv-3.10a/Makefile	2007-12-22 13:04:29.000000000 -0600
-@@ -58,7 +58,7 @@
- ### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
- PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
--MANDIR = $(PREFIX)/share/man/man1
-+MANDIR = $(PREFIX)/man/man1
- MANSUF = 1
- DOCDIR = $(PREFIX)/share/doc/xv
- LIBDIR = $(PREFIX)/lib/xv
-@@ -179,10 +179,10 @@
- JP2K    = -DDOJP2K
- ###
- #JP2KDIR = ../../jasper
--JP2KDIR = /usr/local/lib
-+JP2KDIR = /usr/lib
- ###
- #JP2KINC = -I$(JP2KDIR)
--JP2KINC = -I/usr/local/include
-+JP2KINC = -I/usr/include
- ###
- #JP2KLIB = -L$(JP2KDIR) -ljasper
- JP2KLIB = $(JP2KDIR)/libjasper.a
diff --git a/extra/xv/xv-3.10a-manpage.diff b/extra/xv/xv-3.10a-manpage.diff
deleted file mode 100644
index 7cc98f741..000000000
--- a/extra/xv/xv-3.10a-manpage.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur xv-3.10a-orig/docs/xv.man xv-3.10a/docs/xv.man
---- xv-3.10a-orig/docs/xv.man	2007-12-22 09:35:05.000000000 -0600
-+++ xv-3.10a/docs/xv.man	2007-12-22 10:23:40.000000000 -0600
-@@ -21,7 +21,7 @@
- as a PostScript (or PDF) file, as it has gotten enormous
- and is no longer very well suited to the 'man' page format.
- Print a copy of the (100-ish page) manual found in
--.IR docs/xvdocs.ps .
-+.IR /usr/share/doc/xv/xvdocs.ps .
- If you are unable to get the manual to print on your printer,
- you may purchase a printed copy of the XV manual.  Click on 'About XV' in
- the program to get further information.
-- 
cgit v1.2.3-70-g09d2