experimental/todai/ecc/main/finkinfo/text latex2html-ja.info,NONE,1.1 okumura-clsfiles.info,NONE,1.1 dvipdfmx.info,1.2,1.3 morisawa-fontfiles.info,1.2,1.3 ptex-jisfonts.info,1.2,1.3 ptex-texmf.info,1.

2005-09-27 Thread AIDA Shinra
Update of /cvsroot/fink/experimental/todai/ecc/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16727

Modified Files:
dvipdfmx.info morisawa-fontfiles.info ptex-jisfonts.info 
ptex-texmf.info ptex.info 
Added Files:
latex2html-ja.info okumura-clsfiles.info 
Log Message:
* New virtual package ptex-generation3-base.
* Cleanup Conflicts/Replaces/Provides.
* Change ptex* (= 3.1.3-7) to ptex* (= 3.1.3-8).
* Change xdvik (= 22.40y1-7) to xdvik (= 22.40y1-8).


--- NEW FILE: latex2html-ja.info ---
Package: latex2html-ja
Version: 2002-2-1
Revision: 3
Depends: tetex-base | ptex-generation3-base, netpbm-bin
Conflicts: latex2html
Replaces: latex2html
Provides: latex2html
Source: 
http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/latex2html-%v.tar.gz
SourceRename: latex2html-%v.v1.71.tar.gz
SourceDirectory: latex2html-%v
Source-MD5: a79cda0648c8721ab6df5020cd11e220
Source2: 
http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data/l2h-2002-2-1+jp2.0.patch.gz
Source2-MD5: d9410f69e046604c8c109ba6bb774e51
ConfigureParams: --with-texpath=%p/etc/texmf.local/tex/latex/html 
--with-mktexlsr=/bin/ls
PatchScript: zcat ../l2h-2002-2-1+jp2.0.patch.gz | patch -p1 -F3
InstallScript: make install DESTDIR=%d
DocFiles: BUGS Changes FAQ INSTALL LICENSE MANIFEST README* TODO
License: OSI-Approved
PostInstScript: 
 if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/etc/texmf.local; fi

PostRmScript: 
 if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/etc/texmf.local; fi

Description: Converts LaTeX documents to HTML(ja-patch)
DescDetail: 
This package is Japanese-patched LaTeX2HTML.
See for more information.

http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/

NOTICE: Non-Japanese users may face some problems. Please use
original latex2html.

DescUsage: Source .tex file encoding is bound to be EUC-JP.
DescPort: 
We substitute /bin/ls for mkteklsr during compile/install to avoid problems
if mktexlsr is not present on the system.  We run mktexlsr (if present) in
a Post Install script instead.

Thanks to Ross Moore and Daniel Steffen for modifying the upstream code
to enable the DESTDIR method.

DescPackaging: Thanks to Dave Morrison for original packaging.
Homepage: http://www.latex2html.org
Maintainer: Todai Fink Team [EMAIL PROTECTED]


Index: dvipdfmx.info
===
RCS file: 
/cvsroot/fink/experimental/todai/ecc/main/finkinfo/text/dvipdfmx.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dvipdfmx.info   12 Apr 2005 14:16:08 -  1.2
+++ dvipdfmx.info   27 Sep 2005 09:50:31 -  1.3
@@ -1,8 +1,8 @@
 Package: dvipdfmx
 Version: 20050201
-Revision: 6
+Revision: 7
 GCC: 3.3
-Depends: ptex-base, libkpathsea4-shlibs, libpng3-shlibs, ghostscript, 
appleotffonts
+Depends: ptex-generation3-base, libkpathsea4-shlibs, libpng3-shlibs, 
ghostscript, appleotffonts
 BuildDepends: libkpathsea4, libpng3
 Source: http://project.ktug.or.kr/dvipdfmx/snapshot/release/%n-%v.tar.gz
 Source-MD5: d6b69f30f9ad1ee52853e9ed3cd984f8

--- NEW FILE: okumura-clsfiles.info ---
Package: okumura-clsfiles
Version: 050319
Revision: 2
Depends: ptex-generation3-base, ptex-jisfonts
Suggests: dvipdfmx, morisawa-fontfiles
Source: http://oku.edu.mie-u.ac.jp/~okumura/jsclasses/jsclasses-%v.zip
Source-MD5: 1f54271b79204083a622d60f3ca5fe3a
NoSourceDirectory: true
CompileScript: 
#!/bin/sh
for file in *.ins
do
echo Extracting from $file
%p/bin/ptex --interaction=batchmode $file  /dev/null
done

InstallScript: 
  install -m 755 -d  %i/etc/texmf.local/ptex/platex/jsclasses
  install -m 644 *.sty *.cls %i/etc/texmf.local/ptex/platex/jsclasses

DocFiles: jsclasses.dtx morisawa.dtx okumacro.dtx okuverb.dtx
PostInstScript: 
# If ls-R does not exist, we don't run mktexlsr(user may prefer not to).
if [ -x %p/bin/mktexlsr ]  [ -f %p/etc/texmf.local/ls-R ]
then
%p/bin/mktexlsr %p/etc/texmf.local
fi

PostRmScript: 
# If ls-R does not exist, we don't run mktexlsr(user may prefer not to).
if [ -x %p/bin/mktexlsr ]  [ -f %p/etc/texmf.local/ls-R ]
then
%p/bin/mktexlsr %p/etc/texmf.local
fi

Description: Document class for pTeX made by H.Okumura
DescDetail: This package will be installed to %p/etc/texmf.local
License: BSD
Maintainer: Todai Fink Team [EMAIL PROTECTED]
Homepage: http://oku.edu.mie-u.ac.jp/~okumura/jsclasses/

Index: ptex-jisfonts.info
===
RCS file: 
/cvsroot/fink/experimental/todai/ecc/main/finkinfo/text/ptex-jisfonts.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ptex-jisfonts.info  12 Apr 2005 14:16:08 -  1.2
+++ ptex-jisfonts.info  27 Sep 2005 09:50:31 -  1.3
@@ -1,8 +1,8 @@
 Package: ptex-jisfonts
 Version: 1.0
-Revision: 6
-Depends: ptex-base (=3.1.8.1-5)
-Suggests: dvipdfmx, okumura-clsfiles, xdvik
+Revision: 7
+Depends: ptex-generation3-base
+Suggests: 

fink/perlmod/Fink ChangeLog,1.1148,1.1149

2005-09-27 Thread Alexander Hansen
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21793

Modified Files:
ChangeLog 
Log Message:
Typo

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1148
retrieving revision 1.1149
diff -u -d -r1.1148 -r1.1149
--- ChangeLog   27 Sep 2005 04:05:13 -  1.1148
+++ ChangeLog   27 Sep 2005 12:29:28 -  1.1149
@@ -9,7 +9,7 @@
 
 2005-09-25  Alexander Hansen [EMAIL PROTECTED]
 
-   * PkgVersion.pm: Both of the axel versions that we have in Fin
+   * PkgVersion.pm: Both of the axel versions that we have in Fink
don't take --verbose.  Change flag to -v (which works) instead.
 
 2005-09-21  Daniel Macks  [EMAIL PROTECTED]



---
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. 
Download it for free - -and be entered to win a 42 plasma tv or your very
own Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


fink/perlmod/Fink ChangeLog,1.873.2.62,1.873.2.63 NetAccess.pm,1.40.2.1,1.40.2.2

2005-09-27 Thread Alexander Hansen
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12459/perlmod/Fink

Modified Files:
  Tag: branch_0_24
ChangeLog NetAccess.pm 
Log Message:
Change flag for axel's verbose mode to comply with reality.  This does NOT
guarantee that axel will be fully functional.

Index: NetAccess.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/NetAccess.pm,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -d -r1.40.2.1 -r1.40.2.2
--- NetAccess.pm26 Sep 2005 01:08:38 -  1.40.2.1
+++ NetAccess.pm27 Sep 2005 18:23:11 -  1.40.2.2
@@ -373,7 +373,7 @@
$cmd = axel -S 1;
}
if (Fink::Config::verbosity_level() = 1) {
-   $cmd .=  --verbose;
+   $cmd .=  -v;
}
if ($file ne filename($url)) {
$cmd .=  -o $cmd_file;

Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.873.2.62
retrieving revision 1.873.2.63
diff -u -d -r1.873.2.62 -r1.873.2.63
--- ChangeLog   26 Sep 2005 15:11:45 -  1.873.2.62
+++ ChangeLog   27 Sep 2005 18:23:11 -  1.873.2.63
@@ -1,3 +1,6 @@
+2005-09-27  Alexander Hansen [EMAIL PROTECTED]
+   * NetAccess.pm:  Backport axel verbose flag (-v vs --verbose) from HEAD.
+
 2005-09-25  Alexander Hansen [EMAIL PROTECTED]
* NetAccess.pm: Backport wget nonverbose flag change from HEAD.
 



---
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


dists/10.3/unstable/main/finkinfo/base fink-mirrors.info,1.13,1.14

2005-09-27 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20533

Modified Files:
fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/fink-mirrors.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fink-mirrors.info   15 Aug 2005 17:06:16 -  1.13
+++ fink-mirrors.info   27 Sep 2005 18:55:36 -  1.14
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.8.1
+Version: 0.24.10.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
+Source-MD5: fd734503431c9f209e6cc976df6d484b
 Depends: fink (= 0.17.3-1)
 Replaces: fink ( 0.17.2-1)
 CompileScript:  sed -e s|@PREFIX@|%p|g  postinstall.pl.in  postinstall.pl



---
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


dists/10.4-transitional/unstable/main/finkinfo/base fink-mirrors.info,1.2,1.3

2005-09-27 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20670

Modified Files:
fink-mirrors.info 
Log Message:
new version


Index: fink-mirrors.info
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/base/fink-mirrors.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fink-mirrors.info   15 Aug 2005 17:06:43 -  1.2
+++ fink-mirrors.info   27 Sep 2005 18:56:08 -  1.3
@@ -1,9 +1,9 @@
 Package: fink-mirrors
-Version: 0.24.8.1
+Version: 0.24.10.1
 Revision: 1
 Essential: yes
 Source: mirror:custom:fink/%n-%v.tar.gz
-Source-MD5: ec354141dade6a5fe9e58f1f65caa4fc
+Source-MD5: fd734503431c9f209e6cc976df6d484b
 Depends: fink (= 0.17.3-1)
 Replaces: fink ( 0.17.2-1)
 CompileScript:  sed -e s|@PREFIX@|%p|g  postinstall.pl.in  postinstall.pl



---
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


dists/10.3/unstable/main/finkinfo/graphics xpaint.info,1.2,1.3 xpaint.patch,1.1,1.2

2005-09-27 Thread Daniel Macks
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.patch18 Jan 2004 00:38:18 -  1.1
+++ xpaint.patch28 Sep 2005 00:07:02 -  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/Imakefile2003-06-11 09:44:30.0 -0400
-+++ xpaint-2.7.0/Imakefile 2003-10-28 13:25:44.0 -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.0 -0400
 xpaint-2.7.8.1/Imakefile   2005-09-27 16:59:22.0 -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.0 -0400
-+++ xpaint-2.7.0/Local.config  2003-10-28 13:25:44.0 -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.0 -0400
 xpaint-2.7.8.1/Local.config2005-09-27 18:08:27.0 -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.0 -0400
-+++ xpaint-2.7.0/misc.h2003-10-28 13:25:44.0 -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.0 
-0500
 xpaint-2.7.8.1/bitmaps/Imakefile   2005-09-27 16:06:24.0 -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
+--- 

dists/10.4-transitional/unstable/main/finkinfo/graphics xpaint.info,1.2,1.3 xpaint.patch,1.1,1.2

2005-09-27 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/graphics
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2268/10.4-transitional/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.4-transitional/unstable/main/finkinfo/graphics/xpaint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xpaint.patch27 Apr 2005 03:25:46 -  1.1
+++ xpaint.patch28 Sep 2005 00:07:02 -  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/Imakefile2003-06-11 09:44:30.0 -0400
-+++ xpaint-2.7.0/Imakefile 2003-10-28 13:25:44.0 -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.0 -0400
 xpaint-2.7.8.1/Imakefile   2005-09-27 16:59:22.0 -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.0 -0400
-+++ xpaint-2.7.0/Local.config  2003-10-28 13:25:44.0 -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.0 -0400
 xpaint-2.7.8.1/Local.config2005-09-27 18:08:27.0 -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.0 -0400
-+++ xpaint-2.7.0/misc.h2003-10-28 13:25:44.0 -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.0 
-0500
 xpaint-2.7.8.1/bitmaps/Imakefile   2005-09-27 16:06:24.0 -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