Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2268/10.3/unstable/main/finkinfo/graphics
Modified Files:
xpaint.info xpaint.patch
Log Message:
New version. Only tested on 10.3 w/AppleX11, but at least it's no
worse on 10.4T or xorg than previous version.
Index: xpaint.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/xpaint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xpaint.patch 18 Jan 2004 00:38:18 -0000 1.1
+++ xpaint.patch 28 Sep 2005 00:07:02 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' xpaint-2.7.0.orig/Imakefile xpaint-2.7.0/Imakefile
---- xpaint-2.7.0.orig/Imakefile 2003-06-11 09:44:30.000000000 -0400
-+++ xpaint-2.7.0/Imakefile 2003-10-28 13:25:44.000000000 -0500
+diff -Nurd -x'*~' xpaint-2.7.8.1.orig/Imakefile xpaint-2.7.8.1/Imakefile
+--- xpaint-2.7.8.1.orig/Imakefile 2005-06-03 08:26:03.000000000 -0400
++++ xpaint-2.7.8.1/Imakefile 2005-09-27 16:59:22.000000000 -0400
@@ -9,6 +9,7 @@
#include "./Local.xawdefs"
@@ -9,7 +9,7 @@
"-DEDITOR=\"$(EDITOR)\"" \
"-DSHAREDIR=\"$(SHAREDIR)\"" \
"-DXAPPLOADDIR=\"$(XAPPLOADDIR)\"" \
-@@ -89,7 +90,7 @@
+@@ -102,7 +103,7 @@
#endif
DEPLIBS = always xpaint.man XPaint.ad
@@ -18,30 +18,36 @@
SUBDIRS = rw
-@@ -103,7 +104,6 @@
+@@ -116,6 +117,8 @@
# Other targets...
- all::
-- if test "$(XAWLIB_DEFINES)" = "" ; then cat xaw95-1.1.4/INFO_XAW95 ; fi
+ start::
++ rm -f xaw_incdir
++ ln -sf @PREFIX@/include/X11/Xaw3d xaw_incdir
+ @if ! [ -d xaw_incdir ] ; then ./configure ; make ; fi
install::
- mkdir -p $(DESTDIR)$(SHAREDIR)/include
-@@ -140,6 +140,12 @@
- echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
- xmkmf ; make
-
-+xaw3d::
-+ -$(RM) $(XAW95DEPENDS)
-+ echo "XAWLIB_DEFINES = " > Local.xawdefs
-+ echo "SYS_LIBRARIES = -lXaw3d -lX11 -lXt -lXext [EMAIL PROTECTED]@/lib
-L/usr/X11R6/lib" >> Local.xawdefs
-+ xmkmf ; make
+@@ -151,7 +154,7 @@
+ @echo "'xpaint' compiled with Xaw3d widgets"
+ @echo "Variants are 'make xaw3dg' and 'make nextaw' and 'make xaw95'"
+ @echo ""
+-
+
- xaw95static:: libXaw95.a
- -$(RM) $(XAW95DEPENDS)
- echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
-diff -Nurd -x'*~' xpaint-2.7.0.orig/Local.config xpaint-2.7.0/Local.config
---- xpaint-2.7.0.orig/Local.config 2003-06-03 08:56:41.000000000 -0400
-+++ xpaint-2.7.0/Local.config 2003-10-28 13:25:44.000000000 -0500
+ xaw3dg::
+ -$(RM) $(XAWDEPENDS)
+ ./configure xaw3dg ; make
+@@ -176,7 +179,7 @@
+ @echo "Another alternative is to use the Xaw3d widgets :"
+ @echo "Type 'make xaw3d' or 'make xaw3dg'"
+ @echo ""
+-
++
+ clean::
+ -$(RM) preproc substads XPaint.ad XPaint.ad.h DefaultRC.txt.h PGP.*
+ $(RM) -rf share/out xaw_incdir
+diff -Nurd -x'*~' xpaint-2.7.8.1.orig/Local.config xpaint-2.7.8.1/Local.config
+--- xpaint-2.7.8.1.orig/Local.config 2005-04-30 17:33:14.000000000 -0400
++++ xpaint-2.7.8.1/Local.config 2005-09-27 18:08:27.000000000 -0400
@@ -8,8 +8,8 @@
XCOMM Local customization
@@ -51,9 +57,9 @@
+DESTDIR = @DESTDIR@
+SHAREDIR = @PREFIX@/share/xpaint
- PRINT_COMMAND = lpr -Plp
- EDITOR = emacs -fn 9x15 -cr green -ms red -bg lightyellow -fg black
-@@ -132,10 +132,10 @@
+ XCOMM Printing system defaults
+ PRINT_COMMAND = lpr
+@@ -144,10 +144,10 @@
XCOMM Uncomment these lines and tailor to taste, if you don't like
XCOMM the default paths and man page extension.
XCOMM
@@ -68,7 +74,7 @@
XCOMM Add '-g' here if you want to include debugging information.
XCOMM Also add any optimizer flags etc. that you want.
-@@ -167,3 +167,14 @@
+@@ -179,3 +179,18 @@
JPEG_LIB = -L/usr/local/lib -ljpeg
XPM_INCLUDE = -I/usr/X11R6/include/X11
#endif
@@ -82,11 +88,52 @@
+PNG_INCLUDE = [EMAIL PROTECTED]@/include
+XPM_INCLUDE = -I/usr/X11R6/include/X11
+
-+XAPPLOADDIR = @PREFIX@/etc/app-defaults
-diff -Nurd -x'*~' xpaint-2.7.0.orig/misc.h xpaint-2.7.0/misc.h
---- xpaint-2.7.0.orig/misc.h 2003-04-06 12:13:13.000000000 -0400
-+++ xpaint-2.7.0/misc.h 2003-10-28 13:25:44.000000000 -0500
-@@ -16,22 +16,6 @@
++CONFDIR = @PREFIX@/etc
++XAPPLOADDIR = $(CONFDIR)/app-defaults
++DOCDIR = @PREFIX@/share/doc/xpaint
++
++DEPEND = \# gccmakedep
+diff -Nurd -x'*~' xpaint-2.7.8.1.orig/bitmaps/Imakefile
xpaint-2.7.8.1/bitmaps/Imakefile
+--- xpaint-2.7.8.1.orig/bitmaps/Imakefile 2002-11-14 05:09:21.000000000
-0500
++++ xpaint-2.7.8.1/bitmaps/Imakefile 2005-09-27 16:06:24.000000000 -0400
+@@ -1,5 +1,5 @@
+ MISC = Imakefile
+-SRCS = *\/*
++SRCS =
+
+ makelist:
+ sh -c 'for i in '"$(TEXT) $(SRCS) $(MISC) $(HDRS)"' ; do \
+diff -Nurd -x'*~' xpaint-2.7.8.1.orig/configure xpaint-2.7.8.1/configure
+--- xpaint-2.7.8.1.orig/configure 2005-06-03 08:26:11.000000000 -0400
++++ xpaint-2.7.8.1/configure 2005-09-27 17:36:25.000000000 -0400
+@@ -7,7 +7,7 @@
+ echo "(looking for Xaw, Xaw3d, Xaw95, neXtaw)"
+ echo ""
+ else
+- WIDGETS=`echo $1 | tr [a:z] [A:Z]`
++ WIDGETS=`echo $1 | tr [a-z] [A-Z]`
+ fi
+
+ if test "$WIDGETS" = "" ; then
+@@ -66,11 +66,11 @@
+ fi
+
+ if test "$WIDGETS" = "XAW3D" ; then
+- ln -sf /usr/include/X11/Xaw3d xaw_incdir
++ ln -sf @PREFIX@/include/X11/Xaw3d xaw_incdir
+ echo "XAWLIB_DEFINES = -DXAW3D"
+ echo "XAWLIB_DEFINES = -DXAW3D" > Local.xawdefs
+- echo "SYS_LIBRARIES = -lXaw3d -L."
+- echo "SYS_LIBRARIES = -lXaw3d -L." >> Local.xawdefs
++ echo "SYS_LIBRARIES = -lXaw3d -lX11 -lXt -lXext -L."
++ echo "SYS_LIBRARIES = -lXaw3d -lX11 -lXt -lXext -L." >> Local.xawdefs
+ echo ""
+ xmkmf ; echo "cd rw" ; cd rw ; xmkmf
+ exit
+diff -Nurd -x'*~' xpaint-2.7.8.1.orig/misc.h xpaint-2.7.8.1/misc.h
+--- xpaint-2.7.8.1.orig/misc.h 2005-08-15 15:50:05.000000000 -0400
++++ xpaint-2.7.8.1/misc.h 2005-09-27 15:54:26.000000000 -0400
+@@ -17,22 +17,6 @@
#define USE_DRAND
#endif
@@ -97,7 +144,7 @@
-long random(void);
-#endif
-
--#if !defined(linux) & !defined(__EMX__) & !defined(__FreeBSD__) &
!defined(__CYGWIN__)
+-#if !defined(__VMS) & !defined(linux) & !defined(__EMX__) &
!defined(__FreeBSD__) & !defined(__CYGWIN__)
-#if defined(BSD4_4) || defined(HPArchitecture) || defined(SGIArchitecture) ||
defined(_AIX) || defined(_SCO_DS)
-void srandom(unsigned int);
-#else
@@ -109,14 +156,3 @@
#ifdef USE_DRAND
#ifdef DECLARE_DRAND48
extern double drand48();
-diff -Nurd -x'*~' xpaint-2.7.0.orig/xpaint.man.in xpaint-2.7.0/xpaint.man.in
---- xpaint-2.7.0.orig/xpaint.man.in 2002-11-02 17:22:39.000000000 -0500
-+++ xpaint-2.7.0/xpaint.man.in 2003-10-28 13:26:46.000000000 -0500
-@@ -1,6 +1,6 @@
- .\" $Id$
- .\"
--.TH xpaint l "Release XPAINT_VERSION"
-+.TH xpaint 1 "Release XPAINT_VERSION"
- .SH NAME
- xpaint \- Simple Paint program
- .SH SYNOPSIS
Index: xpaint.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/graphics/xpaint.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xpaint.info 10 Jun 2005 05:06:29 -0000 1.2
+++ xpaint.info 28 Sep 2005 00:07:02 -0000 1.3
@@ -1,6 +1,6 @@
Package: xpaint
-Version: 2.7.0
-Revision: 11
+Version: 2.7.8.1
+Revision: 1
Description: Image editor/painting program
DescDetail: <<
XPaint is an X Window System color image editing program which supports
@@ -17,7 +17,7 @@
and layers. Some examples of filter and layer codes are included.
<<
DescPort: <<
-Play some pathname games for imake.
+Play many pathname games for imake.
Program mis-determines prototypes for randomizer functions (misc.h).
Since there is an #include for the header that contains the (system)
@@ -25,32 +25,30 @@
Convert to Xaw3d widget set (cf. Xaw or Xaw95).
-Some files are installed not-in-DESTDIR. I'm not comfortable doing
-'rm -rf %d/etc' in case something ever goes wrong; safer to stash
-it in /tmp.
+Omit gccmakedep because it falsely assumes arch=i386.
+
+Can't figure out how to supress installation of app-defaults symlink
+from x11 standard location in addition to fink's ("actual") location,
+so just delete it (if it gets created--might depend on x11 variant).
<<
-Homepage: https://sourceforge.net/projects/sf-xpaint/
+Homepage: http://sourceforge.net/projects/sf-xpaint/
License: OSI-Approved
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Depends: x11, xv, gv, xaw3d-shlibs, libtiff-shlibs, libjpeg-shlibs,
libpng3-shlibs,app-defaults
BuildDepends: xaw3d, libtiff, libjpeg, libpng3, rman, x11-dev
Source: mirror:sourceforge:sf-xpaint/%n-%v.tar.bz2
-Source-MD5: 596be813d83922fc4e802bdec19469b3
+Source-MD5: e608680bd362531231af521f0df377ae
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' -e 's|@DESTDIR@|%d|g' <%a/%n.patch | patch -p1
<<
-SetMACOSX_DEPLOYMENT_TARGET: 10.3
CompileScript: <<
xmkmf -a
make xaw3d
<<
InstallScript: <<
- #!/bin/sh
make INSTALLFLAGS=-c install install.man
- mv %d/usr/X11R6/lib/X11/doc/html/xpaint.1.html %i/share/%n
- safety=/tmp/%n-%v-%r_$$
- rm -rf $safety
- mkdir $safety
- mv %d/etc %d/usr $safety
+ # simple 'rm -rf' feels dangerous if spaces in %d
+ rm -f %d/usr/X11R6/lib/X11/app-defaults
+ rmdir -p %d/usr/X11R6/lib/X11 || true
<<
DocFiles: README README.PNG README.old
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
