Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8070

Modified Files:
        tex-guy.info tex-guy.patch 
Log Message:
fix local-lib linking and make sure build crashes if compiler fails


Index: tex-guy.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tex-guy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tex-guy.patch       20 Jan 2006 20:32:31 -0000      1.1
+++ tex-guy.patch       4 Dec 2008 19:16:50 -0000       1.2
@@ -9,7 +9,42 @@
 [EMAIL PROTECTED]@
  exec_prefix=${prefix}
  exec_prefix_set=no
-
+ 
+diff -ruN TeX-Guy-1.3.2/Makefile.in TeX-Guy-1.3.2.new/Makefile.in
+--- TeX-Guy-1.3.2/Makefile.in  2007-05-01 04:58:52.000000000 -0400
++++ TeX-Guy-1.3.2.new/Makefile.in      2008-12-04 14:01:50.000000000 -0500
+@@ -20,26 +20,26 @@
+ include ./X11/x11-defs.mk
+ 
+ $(programs) $(programs_motif) $(programs_gtk)::
+-      (cd $@; $(MAKE) $@)
++      (cd $@; $(MAKE) $@) || exit 1
+ $(programs_obsolete_motif) $(programs_obsolete)::
+-      (cd $@; $(MAKE) $@)
++      (cd $@; $(MAKE) $@) || exit 1
+ 
+ all install uninstall:: 
+       @if test "X-$(programs)" != X-; then \
+         for d in ""$(programs);       do if test -d $$d; then \
+-            echo ''; echo '===' $$d; (cd $$d; $(MAKE) $@); \
++            echo ''; echo '===' $$d; (cd $$d; $(MAKE) $@) || exit 1; \
+           else true; fi; done; \
+        fi;
+       @if test "X-$(MOTIF_TYPE)" != X- -a "X-$(programs_motif)" != X-; \
+          then \
+         for d in ""$(programs_motif); do if test -d $$d; then \
+-            echo ''; echo '===' $$d; (cd $$d; $(MAKE) $@); \
++            echo ''; echo '===' $$d; (cd $$d; $(MAKE) $@) || exit 1; \
+           else true; fi; done; \
+        fi;
+       @if test "[EMAIL PROTECTED]@" = X-yes -a "X-$(programs_gtk)" != X-;  \
+          then \
+         for d in ""$(programs_gtk);   do if test -d $$d; then \
+-            echo ''; echo '===' $$d; (cd $$d; $(MAKE) $@); \
++            echo ''; echo '===' $$d; (cd $$d; $(MAKE) $@) || exit 1; \
+           else true; fi; done; \
+        fi;
+ 
 diff -ruN tex-guy-1.2.4/debian/TODO tex-guy-1.2.4.new/debian/TODO
 --- tex-guy-1.2.4/debian/TODO  1969-12-31 19:00:00.000000000 -0500
 +++ tex-guy-1.2.4.new/debian/TODO      2003-04-27 01:09:43.000000000 -0400

Index: tex-guy.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tex-guy.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tex-guy.info        4 Dec 2008 19:08:16 -0000       1.9
+++ tex-guy.info        4 Dec 2008 19:16:50 -0000       1.10
@@ -1,6 +1,6 @@
 Package: tex-guy
 Version: 1.3.2
-Revision: 1
+Revision: 2
 Source: 
http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/TeX-Guy-%v.tar.gz
 Source-MD5: bb7457994f0a6e37f78193383733c897
 BuildDepends: x11, lesstif, aalib, gtk+, vflib3-dev (>= 3.6.14-3), 
freetype-hinting | freetype, t1lib5-nox, tetex-base, glib, gtk+, 
libgettext3-dev, libiconv-dev, libkpathsea4, x11-dev, xmkmf
@@ -9,12 +9,15 @@
 PatchScript: <<
   sed -e 's,tex-guy-1.2.4,TeX-Guy-%v,g' -e 's,dvi2misc-0.1.1,dvi2misc-0.1.3,g' 
%a/%n.patch | patch -p1
   sed -i -e '/setpgrp/d' DVIlib2-2.9.1/spc_ps.c
+
+  # make sure we link against local just-built lib, not one that's in %p/lib
+  find . -name Makefile.in | xargs perl -pi -e 's,(DVILIB\s*=\s*)-L.*,\1 
../DVIlib2/libdvilib2.la,'
 <<
 ConfigureParams: --enable-static --enable-shared --with-gettext --with-x
 SetCPPFLAGS: -I%p/include/freetype1
 CompileScript: <<
 #!/bin/sh -ev
-export PATH=$PATH:/sw/lib/xmkmf/bin
+export PATH=$PATH:%p/lib/xmkmf/bin
 export IMAKEINCLUDE=-I%p/lib/X11/config
 ./configure %c
 make


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to