Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv32104/unstable/main/finkinfo/x11

Modified Files:
        xv.info xv.patch 
Log Message:
Majorly more modern patchset (may have lost some feature-addition bits
from old, but new has security and compilability improvements...deal
with it when/if someone complains)

Old maintainer busy with academic life for a while.


Index: xv.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/xv.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xv.patch    19 Dec 2005 19:43:11 -0000      1.4
+++ xv.patch    6 Jun 2007 02:19:31 -0000       1.5
@@ -1,180 +1,67 @@
-diff -Naur xv.patched/Makefile xv.fink/Makefile
---- xv.patched/Makefile        Sun Feb 29 11:25:09 2004
-+++ xv.fink/Makefile   Sun Dec 19 19:37:00 2005
-@@ -14,7 +14,7 @@
- #       -Wuninitialized -Wparentheses
- 
- 
--CCOPTS = -O2 -m486 -D_BSD_SOURCE
-+CCOPTS = -O2 -pipe -fomit-frame-pointer -IFINKINSTALLPREFIX/include 
-I/usr/X11R6/include
- 
+diff -Nurd -x'*~' xv-3.10a.20070520/Makefile xv-3.10a.fink/Makefile
+--- xv-3.10a.20070520/Makefile 2007-06-01 12:28:16.000000000 -0400
++++ xv-3.10a.fink/Makefile     2007-06-01 12:29:06.000000000 -0400
+@@ -1,7 +1,7 @@
+ # Makefile for xv
  
- ### NOTE: Sun running OpenWindows:
-@@ -27,11 +27,11 @@
- ### '-I' options on the CCOPTS line to tell the compiler where said files are.
+ # your C compiler (and options) of choice
+-CC = cc
++CC = gcc
+ #CC = gcc -ansi
+ # note that -ansi kills __USE_MISC (gcc 2.95.3), which, at least on Linux,
+ # determines whether stdlib.h includes prototypes for mktemp(), random(), etc.
+@@ -18,7 +18,7 @@
+ #       -Wuninitialized -Wparentheses
  
  
--### Installation locations
--BINDIR = /usr/local/bin
--MANDIR = /usr/local/man/man1
-+###Installation locations
-+BINDIR = FINKINSTALLPREFIX/bin
-+MANDIR = FINKINSTALLPREFIX/share/man/man1
+-CCOPTS = -O
++CCOPTS = -Os -Wall -pipe -I/usr/X11R6/include
+ #
+ # these are the usual optimization and warning options for gcc; all such
+ # warnings but one (mktemp() use) have been eliminated (at least on Linux):
+@@ -62,7 +62,7 @@
  MANSUF = 1
--LIBDIR = /usr/local/lib
-+LIBDIR = FINKINSTALLPREFIX/lib
- 
- 
- buildit: all
-@@ -46,9 +46,9 @@
- ### on your machine, *COMMENT OUT* the following lines
- ###
- JPEG    = -DDOJPEG
--JPEGDIR = /usr/local/lib
--JPEGINC = -I/usr/local/include
--JPEGLIB = -L/usr/local/lib -ljpeg
-+JPEGDIR = 
-+JPEGINC = 
-+JPEGLIB = -ljpeg
- 
- 
- ###
-@@ -56,18 +56,18 @@
- ### on your machine, *COMMENT OUT* the following lines
- ###
- PNG    = -DDOPNG
--PNGDIR = /usr/local/lib
--PNGINC = -I/usr/local/include
--PNGLIB = -L/usr/local/lib -lpng
-+PNGDIR = 
-+PNGINC = 
-+PNGLIB = -lpng
- 
- 
- ###
- ### if, for whatever reason, you're unable to get the PNG library to compile
- ### on your machine, *COMMENT OUT* the following lines
- ###
--ZLIBDIR = /usr/local/lib
--ZLIBINC = -I/usr/local/include
--ZLIBLIB = -L/usr/local/lib -lz
-+ZLIBDIR = 
-+ZLIBINC = 
-+ZLIBLIB = -lz
+ DOCDIR = $(PREFIX)/share/doc/xv
+ LIBDIR = $(PREFIX)/lib/xv
+-SYSCONFDIR = /etc
++SYSCONFDIR = $(PREFIX)/etc
+ DESTDIR =
  
  
+@@ -182,10 +182,10 @@
+ JP2KDIR = /usr/local/lib
  ###
-@@ -75,9 +75,9 @@
- ### on your machine, *COMMENT OUT* the following lines
+ #JP2KINC = -I$(JP2KDIR)
+-JP2KINC = -I/usr/local/include
++JP2KINC = -I$(JP2KDIR)/include
  ###
- TIFF    = -DDOTIFF
--TIFFDIR = /usr/local/lib
--TIFFINC = -I/usr/local/include
--TIFFLIB = -L/usr/local/lib -ltiff
-+TIFFDIR = 
-+TIFFINC = 
-+TIFFLIB = -ltiff
+ #JP2KLIB = -L$(JP2KDIR) -ljasper
+-JP2KLIB = $(JP2KDIR)/libjasper.a
++JP2KLIB = -L$(JP2KDIR)/lib -ljasper
  
  
  ###
-@@ -95,7 +95,7 @@
- # the way there.  SYSV means System V R3.
- # UNIX = -DSVR4
- # UNIX = -DSYSV
--     
-+
- 
- #----------Machine Specific Configurations----------
- 
-@@ -216,7 +216,7 @@
-       $(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
-       $(DXWM) $(MCHN) $(TVL10N) $(MGCSFX) $(PNG) $(PNGINC) $(ZLIBINC)
- 
--LIBS = -L/usr/X11R6/lib -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm
-+LIBS = -LFINKINSTALLPREFIX/lib -L/usr/X11R6/lib -lX11 $(JPEGLIB) $(TIFFLIB) 
$(PNGLIB) $(ZLIBLIB) -lm
- 
- OBJS =        xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o 
\
-       xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
-@@ -267,6 +267,9 @@
- 
- 
- install: all
-+      mkdir -p $(BINDIR)
-+      mkdir -p $(MANDIR)
-+      mkdir -p $(LIBDIR)
-       cp xv bggen vdcomp xcmap xvpictoppm $(BINDIR)
-       cp docs/xv.man     $(MANDIR)/xv.$(MANSUF)
-       cp docs/bggen.man  $(MANDIR)/bggen.$(MANSUF)
-diff -Naur xv.patched/config.h xv.fink/config.h
---- xv.patched/config.h        Sun Feb 29 11:25:09 2004
-+++ xv.fink/config.h   Sun Feb 29 11:23:44 2004
-@@ -22,10 +22,14 @@
- #    if defined(__FreeBSD__) || defined(__NetBSD__)
- #      define GUNZIP "/usr/bin/gunzip -q" 
- #    else
--#      if defined(__linux__)
--#        define GUNZIP "/bin/gunzip -q"
-+#      if defined(__APPLE__)
-+#        define GUNZIP "FINKINSTALLPREFIX/bin/gunzip -q"
- #      else
--#        define GUNZIP "/usr/local/bin/gunzip -q"
-+#        if defined(__linux__)
-+#          define GUNZIP "/bin/gunzip -q"
-+#        else
-+#          define GUNZIP "/usr/local/bin/gunzip -q"
-+#        endif
- #      endif
- #    endif
- #  endif
-@@ -83,7 +87,7 @@
- #define USE_BUNZIP2
- 
- #ifdef USE_BUNZIP2
--#  define BUNZIP2 "/bin/bunzip2"
-+#  define BUNZIP2 "FINKINSTALLPREFIX/bin/bunzip2"
- #endif
- 
- /***************************************************************************
-@@ -108,7 +112,7 @@
-  * should not need to be changed
-  */
- 
--#define GS_PATH "/usr/local/bin/gs"
-+#define GS_PATH "FINKINSTALLPREFIX/bin/gs"
- #define GS_LIB  "."               
- #define GS_DEV  "ppmraw"         
- 
-diff -Naur xv.patched/vdcomp.c xv.fink/vdcomp.c
---- xv.patched/vdcomp.c        Sun Feb 29 11:25:09 2004
-+++ xv.fink/vdcomp.c   Sun Feb 29 11:23:44 2004
-@@ -96,6 +96,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#define NeXT
-+
- /* include a malloc.h, of some sort... */
- #ifndef VMS   /* VMS hates multi-line '#if's */
- # if !defined(ibm032)                    && \
-@@ -112,6 +114,9 @@
-      !defined(sequent)
- 
- #  if defined(hp300) || defined(hp800) || defined(NeXT)
-+#   if defined(__APPLE__)
-+#     include <sys/types.h>               /* Because malloc uses u_short on 
Mac OS X */
-+#   endif
- #   include <sys/malloc.h>                /* it's in 'sys' on HPs and NeXT */
- #  else
- #   if !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
-diff -Naur xv.patched/xv.h xv.fink/xv.h
---- xv.patched/xv.h    Sun Feb 29 11:25:10 2004
-+++ xv.fink/xv.h       Sun Feb 29 11:23:45 2004
-@@ -11,6 +11,8 @@
- #define REVDATE   "Version 3.10a+FLmask+jp5.3.3+PNG patch 1.2d+misc  Rev: 
12/29/94"
- #define VERSTR    "3.10a+FLmask+jp+png-1.2d+misc"
+diff -Nurd -x'*~' xv-3.10a.20070520/vdcomp.c xv-3.10a.fink/vdcomp.c
+--- xv-3.10a.20070520/vdcomp.c 2007-06-01 12:28:16.000000000 -0400
++++ xv-3.10a.fink/vdcomp.c     2007-06-01 12:29:20.000000000 -0400
+@@ -119,7 +119,7 @@
+       !defined(__FreeBSD__)               && \
+       !defined(__OpenBSD__)               && \
+       !defined(__NetBSD__)                && \
+-      !defined(__DARWIN__)
++      !defined(__APPLE__)
  
-+#define __NetBSD__
-+#define NeXT
+ #    if defined(hp300) || defined(hp800) || defined(NeXT)
+ #      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
+diff -Nurd -x'*~' xv-3.10a.20070520/xv.h xv-3.10a.fink/xv.h
+--- xv-3.10a.20070520/xv.h     2007-06-01 12:28:16.000000000 -0400
++++ xv-3.10a.fink/xv.h 2007-06-01 12:29:06.000000000 -0400
+@@ -158,7 +158,7 @@
  
- /*
-  * uncomment the following, and modify for your site, but only if you've
+ #ifndef VMS
+ #  include <errno.h>
+-#  ifndef __NetBSD__
++#  if !(defined __NetBSD__ || defined __APPLE__)
+ #    if !(defined __GLIBC__ && __GLIBC__ >= 2)
+        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
+        extern char *sys_errlist[]; /* this too... */

Index: xv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/xv.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xv.info     28 Jun 2006 04:59:36 -0000      1.9
+++ xv.info     6 Jun 2007 02:19:31 -0000       1.10
@@ -1,43 +1,51 @@
 Package: xv 
 Version: 3.10a
-Revision: 24
+Revision: 24.1
 Architecture: powerpc
-Maintainer: Eric Lee <[EMAIL PROTECTED]>
+#Maintainer: Eric Lee <[EMAIL PROTECTED]>
+Maintainer: Daniel Macks <[EMAIL PROTECTED]>
 BuildDepends: <<
- x11-dev,
- libjpeg, 
- libpng3, 
- libtiff,
- gcc3.3
+       libjasper1,
+       libjpeg, 
+       libpng3, 
+       libtiff,
+       x11-dev
 <<
 Depends: <<
- bzip2,
- gzip,
- ghostscript,
- x11, 
- libjpeg-shlibs, 
- libpng3-shlibs,
- libtiff-shlibs
+       ghostscript,
+       libjasper1-shlibs,
+       libjpeg-shlibs, 
+       libpng3-shlibs,
+       libtiff-shlibs,
+       x11
 <<
+
+# main program, long-unattended upstream
 Source: ftp://ftp.cis.upenn.edu/pub/xv/xv-%v.tar.gz
 Source-MD5: 2d4fbeec1561304362781cc8e2f7f72d
+
+# large 3rd-party patchset, used in fink up to xv-3.10a-24
 #Source2: 
ftp://ftp.lair.net/pub/unix/graphics/xv/xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz
-Source2: 
mirror:master:/xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz
-Source2-MD5: f627d0d86b7c948f0b5e389e53271883
+#Source2: 
mirror:master:/xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz
+#Source2-MD5: f627d0d86b7c948f0b5e389e53271883
+
+# semi-regularly-updated 3rd-party patchset, fink xv-3.10a-25 is jumbo-20070520
+Source2: mirror:sourceforge:png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz
+Source2-MD5: 9fb2d0ec320498105cafeba38a588472
+
 PatchScript: <<
-  gunzip --stdout 
../xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz | patch -p1
-  sed s#FINKINSTALLPREFIX#%p#g < %a/%n.patch | patch -p1
-<<
-CompileScript: make -e CC=gcc-3.3 CXX=g++-3.3
-InstallScript: <<
- make BINDIR=%i/bin MANDIR=%i/share/man/man1 LIBDIR=%i/lib install
- mkdir -p %i/share/doc/xv
- mv %i/lib/xvdocs.ps %i/share/doc/xv
-<<
-DocFiles: <<
- docs/README docs/*.ps docs/*.doc docs/penn.policy docs/bigxv.jpg
- docs/xv.blurb docs/xv.ann docs/gif.ack docs/gif.aspect
+# first apply public 3rd-party stuff
+# gunzip --stdout 
../xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz | patch -p1
+  patch -p1 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt
+
+# then patch in apple and local-fink stuff
+  patch -p1 < %a/%n.patch
+# perl -pi -e 's,/usr/local,%p,' Makefile
+  perl -pi -e 's,^(TIFF|JPEG|PNG|JP2K)DIR = .*,\1DIR = %p,' Makefile
 <<
+CompileScript: make PREFIX=%p
+InstallScript: make install PREFIX=%p DESTDIR=%d
+DocFiles: docs/*
 Description: Image viewer
 DescDetail: <<
 xv is an interactive image manipulation program for the X Window
@@ -49,12 +57,24 @@
 also display them. 
 <<
 DescPackaging: <<
+Fink's xv-3.10a-24 is a concatenation of many patches:
+
 Fixes for huge patch file by Remi Mommsen <[EMAIL PROTECTED]>
 
 ftp.lair.net no longer hosts the patchfile we need, but opendarwin has it.
 
 kurt is also hosting a copy at:
 
http://schwehr.org/software/xv-3.10a+jp-extension-rev5.3.3+FLmask.v2.1+png+misc.patch.gz
+
+Maintained through 3.10a-24 by Eric Lee, dmacks now surrogate parent.
+
+SourceN patches are semi-official public stuff
+finkinfo %n.patch is apple- or fink-specific stuff
+
+Fink's xv-3.10a-25 is 20070520 from http://www.sonic.net/~roelofs/greg_xv.html
+Patched Makefile to use Fink's graphics-libs
+Patched xv.h and vdcomp.c to understand darwin headers
+Should re-incorporate parts of old .patch suite...eventually...
 <<
 License: Restrictive
 Homepage: http://www.trilon.com/xv/index.html


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to