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

Modified Files:
      Tag: pangocairo-branch
        lesstif.info lesstif.patch 
Log Message:
new version based on Submissions #1952937; scrap old lib that has not been 
usable or used in years


Index: lesstif.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/lesstif.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- lesstif.patch       19 Jul 2007 22:23:35 -0000      1.1.2.2
+++ lesstif.patch       13 Jun 2008 17:39:40 -0000      1.1.2.3
@@ -1,30 +1,39 @@
-diff -Nurd -x'*~' lesstif-0.93.18.orig/configure lesstif-0.93.18/configure
---- lesstif-0.93.18.orig/configure     2001-12-20 12:02:54.000000000 -0500
-+++ lesstif-0.93.18/configure  2007-03-27 03:51:09.000000000 -0400
-@@ -1597,10 +1597,8 @@
+diff -Nurd -x'*~' lesstif-0.95.0.orig/clients/Motif-2.1/mwm/Makefile.in 
lesstif-0.95.0/clients/Motif-2.1/mwm/Makefile.in
+--- lesstif-0.95.0.orig/clients/Motif-2.1/mwm/Makefile.in      2006-06-10 
05:35:34.000000000 -0400
++++ lesstif-0.95.0/clients/Motif-2.1/mwm/Makefile.in   2008-06-08 
03:35:38.000000000 -0400
+@@ -300,7 +300,7 @@
+ LDADD = ../../../lib/Xm-2.1/libXm.la \
+               $(X_LIBS) $(XPLIB) -lXt $(X_PRE_LIBS) -lXext -lX11 
$(X_EXTRA_LIBS)
  
-                                                   
ac_config_headers="$ac_config_headers include/LTconfig.h"
+-appdir = $(libdir)/X11/app-defaults
++appdir = $(prefix)/etc/app-defaults
+ mwmddir = $(libdir)/X11/mwm
+ mwmd_DATA = system.mwmrc alt.map README
+ 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
+@@ -2150,7 +2150,7 @@
  
--if (aclocal --print-ac-dir) </dev/null >/dev/null 2>&1 && test -w `aclocal 
--print-ac-dir`; then
--    ACLOCALDIR=`aclocal --print-ac-dir`
-+    [EMAIL PROTECTED]@/share/aclocal
+ echo "$as_me:$LINENO: checking where to store autoconf macro files" >&5
+ echo $ECHO_N "checking where to store autoconf macro files... $ECHO_C" >&6
+-ACLOCALDIR=`aclocal --print-ac-dir`
[EMAIL PROTECTED]@/share/aclocal
  
--fi
  
  if test x$ACLOCALDIR != x ; then
-   Aclocal_TRUE=
-diff -ru lesstif-0.93.18/ltmain.sh lesstif-0.93.18-patched/ltmain.sh
---- lesstif-0.93.18/ltmain.sh  2001-12-20 12:03:07.000000000 -0500
-+++ lesstif-0.93.18-patched/ltmain.sh  2002-06-05 08:22:05.000000000 -0400
-@@ -3948,10 +3948,10 @@
+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 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
--        if test "$installed" = no && test $need_relink = yes; then
+-        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
++#       if test "$installed" = no && test "$need_relink" = yes; then
 +#         $echo >> $output "\
 +#relink_command=\"$relink_command\""
 +#       fi

Index: lesstif.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/lesstif.info,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -d -r1.2.2.5 -r1.2.2.6
--- lesstif.info        8 Jun 2008 05:36:35 -0000       1.2.2.5
+++ lesstif.info        13 Jun 2008 17:39:40 -0000      1.2.2.6
@@ -1,28 +1,36 @@
 Package: lesstif
-Version: 0.93.18
+Version: 0.95.0
 Epoch: 1
-Revision: 3
+Revision: 1
 Source: mirror:sourceforge:lesstif/%n-%v.tar.gz
-Source-MD5: 74bce66719adb680009f145ef801bce2
+Source-MD5: 9c9ff519bcaf5c2e013d7992fe5260cd
+Source2: 
http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.95.0-2.1.diff.gz
+Source2-MD5: 89e1e1823eb37a40a54330a834c68b6b
 Depends: %N-shlibs (= %e:%v-%r)
 PatchFile: %n.patch
-PatchFile-MD5: 977dbd80926783607f68c7a8519be349
+PatchFile-MD5: 3f028612d5153c358cc56cc2e9122170
 PatchScript: <<
   sed -e 's|@PREFIX@|%p|' < %{PatchFile} | patch -p1
-  perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' 
scripts/autoconf/ac_find_motif.m4
-  perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,' configure
+  gzcat ../lesstif2_0.95.0-2.1.diff.gz | patch -p1
+  patch -p1 < ./debian/patches/020_bad_integer_cast.diff
+  patch -p1 < ./debian/patches/020_missing_xm_h.diff
+  patch -p1 < ./debian/patches/020_render_table_crash.diff
+  patch -p1 < ./debian/patches/020_unsigned_int.diff
+  patch -p1 < ./debian/patches/020_xpmpipethrough.diff
+  patch -p1 < ./debian/patches/021_xim_chained_list_crash.diff
 <<
 BuildDepends: x11-dev, fink (>= 0.24.12-1)
-Replaces: lesstif-dev, openmotif3
-Conflicts: openmotif3
+Replaces: lesstif-bin (<< 1:0.95.0-1), lesstif-dev, openmotif3, openmotif4
+Conflicts: openmotif3, openmotif4
 BuildDependsOnly: True
-ConfigureParams: --enable-build-12 --enable-build-21 --enable-static 
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
+ConfigureParams: --disable-build-12 --disable-build-20 --enable-build-21 
--enable-static --enable-production --with-fontconfig_lib=/usr/X11R6/lib 
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
 InstallScript: <<
  make install DESTDIR=%d 
  mkdir -p %i/share/doc/%n
  mv %i/LessTif/doc %i/share/doc/%n
  rm -R %i/LessTif
  mv %i/man %i/share
+ rm %i/share/man/man1/ltversion.1
 <<
 SplitOff: <<
   Package: %N-shlibs
@@ -31,21 +39,24 @@
   Files: lib/libMrm.*.dylib lib/libUil.*.dylib lib/libXm.*.dylib 
lib/libDtPrint.*.dylib
   Shlibs: <<
     %p/lib/libDtPrint.1.dylib 2.0.0 %n (>= 0.93.18-1)
-    %p/lib/libMrm.1.dylib 2.0.0 %n (>= 0.93.18-1)
     %p/lib/libMrm.2.dylib 3.0.0 %n (>= 0.93.18-1)
-    %p/lib/libUil.1.dylib 2.0.0 %n (>= 0.93.18-1)
     %p/lib/libUil.2.dylib 3.0.0 %n (>= 0.93.18-1)
-    %p/lib/libXm.1.dylib 2.0.0 %n (>= 0.93.18-1)
     %p/lib/libXm.2.dylib 3.0.0 %n (>= 0.93.18-1)
   <<
   DocFiles: AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS FAQ  README NEWS 
ReleaseNotes.txt
 <<
 SplitOff2: <<
   Package: %N-bin
-  Depends: %N-shlibs (= %e:%v-%r)
-  Replaces: %N (<= 0.93.18-4), openmotif3-bin
-  Conflicts: openmotif3-bin
-  Files: bin share/man/man1 share/man/man5 lib/X11 share/doc/%N/doc
+  Depends: %N-shlibs (= %e:%v-%r), app-defaults
+  Replaces: %N (<= 0.93.18-4), openmotif3-bin, openmotif4-bin
+  Conflicts: openmotif3-bin, openmotif4-bin
+  Files: <<
+    bin/mwm bin/uil bin/xmbind
+    share/man/man1 share/man/man5
+    lib/X11
+    etc
+    share/doc/%N/doc
+  <<
   DocFiles: AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS FAQ README 
ReleaseNotes.txt
 <<
 DocFiles: AUTHORS BUG-REPORTING COPYING COPYING.LIB CREDITS FAQ README 
ReleaseNotes.txt
@@ -60,11 +71,10 @@
 #
 Description: Free implementation of OSF/Motif
 DescPort: <<
-Currently, builds the 1.2 and 2.1 versions, with the 2.1 libraries
-and includes installed as the default.
+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).
+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
@@ -73,6 +83,14 @@
 Previous versions by Christoph Pfisterer.
 
 Patch configure to avoid requiring %p/share/aclocal being +w for build user
+or having fink's aclocal present
+
+Patch to place xrdb file in fink-standard location.
+
+Some build-time tools (motif-util mxmkmf) moved %N-bin -> %N as of
+1:0.95.0-1
+
+ltversion doesn't exist, so nuke its manpage
 <<
 DescUsage: <<
  Clients which link both libXm and libXt from XFree86 >= 4.2 should


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to