Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17736

Modified Files:
        lesstif.info lesstif.patch 
Log Message:
Appears to use x11 libs and not fink libs, so make sure x11's -I and -L flags 
come before fink's.


Index: lesstif.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/lesstif.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lesstif.patch       13 Jun 2008 17:39:40 -0000      1.4
+++ lesstif.patch       4 Sep 2008 08:21:55 -0000       1.5
@@ -12,7 +12,7 @@
  AM_YFLAGS = -d
 diff -Nurd -x'*~' lesstif-0.95.0.orig/configure lesstif-0.95.0/configure
 --- lesstif-0.95.0.orig/configure      2006-06-10 05:35:28.000000000 -0400
-+++ lesstif-0.95.0/configure   2008-06-08 03:34:39.000000000 -0400
++++ lesstif-0.95.0/configure   2008-09-04 00:26:41.000000000 -0400
 @@ -2150,7 +2150,7 @@
  
  echo "$as_me:$LINENO: checking where to store autoconf macro files" >&5
@@ -22,21 +22,15 @@
  
  
  if test x$ACLOCALDIR != x ; then
-diff -Nurd -x'*~' lesstif-0.95.0.orig/ltmain.sh lesstif-0.95.0/ltmain.sh
---- lesstif-0.95.0.orig/ltmain.sh      2005-08-12 09:54:36.000000000 -0400
-+++ lesstif-0.95.0/ltmain.sh   2008-06-08 03:34:39.000000000 -0400
-@@ -5362,10 +5362,10 @@
+@@ -28766,9 +28766,9 @@
+ esac
  
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
--        if test "$installed" = no && test "$need_relink" = yes; then
--          $echo >> $output "\
--relink_command=\"$relink_command\""
--        fi
-+#       if test "$installed" = no && test "$need_relink" = yes; then
-+#         $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+#       fi
-       done
-       fi
+ saved_LIBS="$LIBS"
+-LIBS="$LIBS $freetype_lib"
++LIBS="$freetype_lib $LIBS"
+ saved_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
++CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS"
  
+ for ac_header in freetype/freetype.h
+ do

Index: lesstif.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/lesstif.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lesstif.info        13 Jun 2008 17:39:40 -0000      1.7
+++ lesstif.info        4 Sep 2008 08:21:55 -0000       1.8
@@ -8,7 +8,7 @@
 Source2-MD5: 89e1e1823eb37a40a54330a834c68b6b
 Depends: %N-shlibs (= %e:%v-%r)
 PatchFile: %n.patch
-PatchFile-MD5: 3f028612d5153c358cc56cc2e9122170
+PatchFile-MD5: ccfec9d8ac06306dd7beb0f95f818f44
 PatchScript: <<
   sed -e 's|@PREFIX@|%p|' < %{PatchFile} | patch -p1
   gzcat ../lesstif2_0.95.0-2.1.diff.gz | patch -p1
@@ -72,9 +72,6 @@
 Description: Free implementation of OSF/Motif
 DescPort: <<
 Lesstif 0.95.0 only builds Motif v2.1 libraries now.
-
-Have temporarily added a patch to disable libtool's relinking, until this
-problem can be addressed in a better way (DRM, in revision 6 of an old %v).
 <<
 DescPackaging: <<
 man pages that conflict with other packages are managed


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