Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

7 files changed, 84 insertions, 8 deletions

diff --git a/extra/xv/.footprint b/extra/xv/.footprint
new file mode 100644
index 000000000..ca8c129b5
--- /dev/null
+++ b/extra/xv/.footprint
@@ -0,0 +1,20 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/bggen
+-rwxr-xr-x	root/root	usr/bin/vdcomp
+-rwxr-xr-x	root/root	usr/bin/xcmap
+-rwxr-xr-x	root/root	usr/bin/xv
+-rwxr-xr-x	root/root	usr/bin/xvpictoppm
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/xv/
+-rw-r--r--	root/root	usr/share/doc/xv/xvdocs.pdf
+-rw-r--r--	root/root	usr/share/doc/xv/xvdocs.ps
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/bggen.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/vdcomp.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/xcmap.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/xv.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/xvpictoppm.1.gz
diff --git a/extra/xv/.md5sum b/extra/xv/.md5sum
new file mode 100644
index 000000000..fa9b5f53e
--- /dev/null
+++ b/extra/xv/.md5sum
@@ -0,0 +1,3 @@
+5cbd76ea3e927cbc7dd7e914fdbbd82e  xv-3.10a-Makefile.diff
+9fb2d0ec320498105cafeba38a588472  xv-3.10a-jumbo-patches-20070520.tar.gz
+2d4fbeec1561304362781cc8e2f7f72d  xv-3.10a.tar.gz
diff --git a/extra/xv/Pkgfile b/extra/xv/Pkgfile
new file mode 100644
index 000000000..0785e0d7e
--- /dev/null
+++ b/extra/xv/Pkgfile
@@ -0,0 +1,23 @@
+# Description: Image Viewer
+# URL: http://www.trilon.com/xv
+# Maintainer: Kevin Monceaux, Kevin at RawFedDogs dot net
+# Depends on: libtiff, libjasper, libjpeg, libpng, xorg-libx11, xorg-libxcb, xorg-libxau, xorg-libxdmcp, zlib
+
+name=xv
+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)
+
+build() {
+    cd $name-$version
+    patch -p1 < $SRC/$name-$version-jumbo-fix-enh-patch-20070520.txt
+    make JP2KDIR=/usr/lib
+    mkdir -p $PKG/usr/{bin,lib,share/man/man1}
+
+    make DESTDIR=$PKG PREFIX=/usr  install
+
+    rm $PKG/usr/share/doc/xv/README.jumbo
+
+}
diff --git a/extra/xv/xv-3.10a-Makefile.diff b/extra/xv/xv-3.10a-Makefile.diff
new file mode 100644
index 000000000..093778bc9
--- /dev/null
+++ b/extra/xv/xv-3.10a-Makefile.diff
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..7cc98f741
--- /dev/null
+++ b/extra/xv/xv-3.10a-manpage.diff
@@ -0,0 +1,12 @@
+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.
diff --git a/xorg/libgl/pre-install b/xorg/libgl/pre-install
deleted file mode 100644
index 098d7a18f..000000000
--- a/xorg/libgl/pre-install
+++ /dev/null
@@ -1,7 +0,0 @@
-if ( pkginfo -i | grep nvidia > /dev/null ) ; then
-	pkgrm nvidia
-fi
-if ( pkginfo -i | grep nvidia-96xx > /dev/null ) ; then
-        pkgrm nvidia-96xx
-fi
-
diff --git a/xorg/mesa3d/Pkgfile b/xorg/mesa3d/Pkgfile
index bfc62d2ad..ecfcd8be9 100755
--- a/xorg/mesa3d/Pkgfile
+++ b/xorg/mesa3d/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.mesa3d.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: expat, libdrm, xorg-makedepend, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, libgl
+# Depends on: expat, libdrm, xorg-makedepend, xorg-libx11, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage
 
 name=mesa3d
 version=7.8.2