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

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


Index: vflib3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/vflib3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vflib3.patch        10 Sep 2007 22:43:02 -0000      1.2
+++ vflib3.patch        4 Dec 2008 18:28:28 -0000       1.3
@@ -1,3 +1,24 @@
+diff -ruN VFlib3-3.6.14/Makefile.in VFlib3-3.6.14.new/Makefile.in
+--- VFlib3-3.6.14/Makefile.in  2002-12-09 19:52:10.000000000 -0500
++++ VFlib3-3.6.14.new/Makefile.in      2008-12-04 12:20:06.000000000 -0500
+@@ -13,7 +13,7 @@
+ 
+ default all:
+       for d in $(MAKE_SUBDIRS) ; do \
+-        (cd $$d ; $(MAKE) $@); done
++        (cd $$d ; $(MAKE) $@) || exit 1; done
+ 
+ install:
+       @if [ ! -d $(bindir) ] ; then \
+@@ -25,7 +25,7 @@
+       @if [ ! -d $(runtimedir) ] ; then \
+           ./recmkdir $(runtimedir); fi
+       @for d in $(INST_SUBDIRS) ; do \
+-        (cd $$d ; $(MAKE) $@); done
++        (cd $$d ; $(MAKE) $@) || exit 1; done
+       @echo "Installing vflibcaps..."
+       @for f in `ls ./vflibcaps/vflibcap*`; do \
+          ./$(INSTALL_DATA) $$f $(runtimedir); done
 diff -ruN VFlib3-3.6.13/VFlib3-config.in VFlib3-3.6.13.new/VFlib3-config.in
 --- VFlib3-3.6.13/VFlib3-config.in     2001-05-30 00:40:15.000000000 -0400
 +++ VFlib3-3.6.13.new/VFlib3-config.in 2003-06-09 11:00:32.000000000 -0400
@@ -98,6 +119,24 @@
        exit(0);
      } else if ((argc >= 2) && (strcmp(argv[0], "-v") == 0)){
        --argc; argv++;
+diff -ruN VFlib3-3.6.14/utils/Makefile.in VFlib3-3.6.14.new/utils/Makefile.in
+--- VFlib3-3.6.14/utils/Makefile.in    1999-10-31 19:24:11.000000000 -0500
++++ VFlib3-3.6.14.new/utils/Makefile.in        2008-12-04 12:19:12.000000000 
-0500
+@@ -7,12 +7,12 @@
+ 
+ default all: 
+       @for d in $(SUBDIRS) ; do \
+-        (cd $$d ; $(MAKE) $@); done 
++        (cd $$d ; $(MAKE) $@) || exit 1; done 
+ 
+ install uninstall::
+       @echo "Installing utility programs..."
+       @for d in $(SUBDIRS) ; do \
+-        (cd $$d ; $(MAKE) $@); done 
++        (cd $$d ; $(MAKE) $@) || exit 1; done 
+ 
+ clean veryclean::
+       for d in $(SUBDIRS) ; do \
 diff -ru VFlib3-3.6.13/ltconfig VFlib3-3.6.13-patched/ltconfig
 --- VFlib3-3.6.13/ltconfig     Tue Nov 25 17:04:40 2003
 +++ VFlib3-3.6.13-patched/ltconfig     Tue Nov 25 17:02:38 2003

Index: vflib3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/vflib3.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- vflib3.info 10 Sep 2007 22:43:02 -0000      1.6
+++ vflib3.info 4 Dec 2008 18:28:28 -0000       1.7
@@ -1,6 +1,6 @@
 Package: vflib3
 Version: 3.6.14
-Revision: 3
+Revision: 4
 Source: 
http://www-masu.ist.osaka-u.ac.jp/~kakugawa/download/TypeHack/VFlib3-%v.tar.gz
 Source-MD5: f95090401d79ca987bfcd1f08d77454f
 BuildDepends: t1lib5-nox, freetype, libgettext3-dev, gettext-bin, 
gettext-tools, libkpathsea4, x11-dev
@@ -17,7 +17,11 @@
   perl -pi.bak -e 's|makedefault\:\ default|makedefault\:\ all|;' Makefile.in
   perl -pi.bak -e 's|VFCFLAGS=|[EMAIL PROTECTED]@\ |;' make-sub.in
   sed -i.bak -e 's,`$,XYZ`,' -e "s,XYZ,'," t1lib/mkt1enc.sh
-<<
+
+  # make sure we link against local just-built lib, not one that's in %p/lib
+# perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
+  perl -pi -e 's,(\$\(CC\).*\.o) \$\(VFLIB\),\1 .libs/libVFlib3.dylib,' 
src/Makefile.in
+ <<
 
 DocFiles: ANNOUNCE* CHANGES COPYING* DISTRIB.txt INSTALL.txt
 InfoDocs: VFlib-36.info VFlib-36.info-1  VFlib-36.info-2  VFlib-36.info-3 
VFlib-36.info-4 VFlib-36.info-5


-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to