Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/editors
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1526/10.4-transitional/stable/main/finkinfo/editors

Modified Files:
        texmacs.info 
Added Files:
        texmacs.patch 
Log Message:
New stable version 1.0.6. Sync all 10.3/10.4 trees

--- NEW FILE: texmacs.patch ---
--- TeXmacs-1.0.5.11-src/src/makefile.in.ori    2005-11-05 00:14:01.000000000 
+0100
+++ TeXmacs-1.0.5.11-src/src/makefile.in        2005-11-05 00:14:36.000000000 
+0100
@@ -118,7 +118,7 @@
 deps_incl = $(call incl_flags,System System/Boot System/Classes System/Files 
System/Link System/Misc Classes/Abstract Classes/Atomic Classes/Compound 
Data/Drd Data/String Data/Tree Data/Convert Resource Plugins Window Typeset 
Edit Texmacs Guile)
 
 deps_flags = $(deps_incl)\
- $(CPPFLAGS) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) $(CXXGUILE) \
+ $(CPPFLAGS) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) $(CXXGUILE) \
  -I$(tmsrc)/include $(CXXXWINDOW)
 # we should use -I- to separate local includes from system includes, but
 # headers of guile 1.6.0 use includes in quotes with names relative to the
@@ -171,7 +171,7 @@
 %.o: %.cpp # Disable implicit compilation rule
 
 cxx_flags    = $(strip $(CXX) $(1) -c $< -o $@)
-cxx_incl     = $(call cxx_flags,$(1) $(CXXIMLIB2) $(CXXFREETYPE) $(CXXICONV) \
+cxx_incl     = $(call cxx_flags,$(1) $(CXXFREETYPE) $(CXXIMLIB2) $(CXXICONV) \
   $(CXXGUILE) $(CPPFLAGS) $(CXXFLAGS)) 
 
 $(system_obj): Objects/%.o: %.cpp
@@ -251,8 +251,8 @@
 TEXMACS_objects := $(strip $(call uses,system classes data resource plugins\
  window typeset edit glue texmacs))
 
-link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDXWINDOW) \
-  $(LDGUILE) $(LDIMLIB2) $(LDFREETYPE) $(LDICONV) $(LDDL)
+link_options:=-L$(tmsrc)/lib -lm $(LDPATH) $(LDFREETYPE) $(LDXWINDOW) \
+  $(LDGUILE) $(LDIMLIB2) $(LDICONV) $(LDDL)
 
 $(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
        $(CP) $^ $@

Index: texmacs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/editors/texmacs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- texmacs.info        7 Aug 2005 15:57:22 -0000       1.3
+++ texmacs.info        6 Dec 2005 07:33:35 -0000       1.4
@@ -1,21 +1,22 @@
 Package: texmacs
-Version: 1.0.5.5
-Revision: 11
+Version: 1.0.6
+Revision: 1
 GCC: 3.3
 Source: mirror:custom:TeXmacs-%v-src.tar.gz
 CustomMirror: <<
  Primary: http://www.texmacs.org/Download/ftp/targz/
  Secondary: ftp://ftp.texmacs.org/pub/TeXmacs/targz/
 <<
-Source-MD5: 492bf5f75791c80d64a727767fedb8bc
+Source-MD5: 7b0a3896fd17cf2e993aa77d15bb6240
 License: GPL
-Depends: x11-shlibs, tetex-base, guile16, ispell, wget
-BuildDepends: x11, guile16-dev, x11-dev
+Depends: x11-shlibs, tetex-base, guile16, ispell, wget, imlib2-shlibs, 
libiconv, freetype219-shlibs
+BuildDepends: x11, guile16-dev, x11-dev, imlib2, libiconv-dev, freetype219
+Replaces: texmacs-extra-fonts, texmacs-type1-fonts
 BuildConflicts: freetype
 Recommends: ghostscript, netpbm, xfig, macaulay2, maxima, pari-gp, scilab
-Suggests: texmacs-fonts
-ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man --with-iconv=/usr 
--with-freetype=linked
-#Patch: %n.patch
+Suggests: texmacs-extra-fonts
+ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man --with-iconv=/usr 
--with-freetype=linked --with-imlib2
+Patch: %n.patch
 PatchScript: <<
 #!/bin/sh
 # increase the stacksize to something reasonable before starting 
@@ -23,8 +24,6 @@
 # change hardwired paths for ispell and aspell 
  perl -pi -e 's|/usr/lib/ispell/|%p/lib/|g' src/Plugins/Ispell/ispell.cpp
  perl -pi -e 's|/usr/lib/aspell/|%p/share/aspell/|g' 
src/Plugins/Ispell/ispell.cpp
-# libiconv needs to be linked in excplicitly
- perl -pi -e 's| \-lm| -lm -liconv|g' src/makefile
 # make place for Apple's resize brick in quartz-wm 
  perl -pi -e 's|(set_right_footer )\(s\)|$1 (s * "   ")|g' 
src/Edit/Interface/edit_footer.cpp
 # make the R plugin compile
@@ -40,7 +39,7 @@
 <<
 CompileScript: <<
 #!/bin/sh
- export PATH=%p/share/guile/1.6/scripts/binoverride:$PATH
+ export 
PATH=%p/share/guile/1.6/scripts/binoverride:%p/lib/freetype219/bin:$PATH
  ./configure %c
  export GUILE_LOAD_PATH=%p/share/guile/1.6
  make
@@ -92,6 +91,12 @@
  
  If you want to avoid having to create the standard bitmap fonts
  on the fly, consider installing the texmacs-fonts package.
+ From version 1.0.5.10 on, PostScript Type1 fonts are used by default.
+ TeXmacs uses the Type1 fonts from tetex, and an additional set of
+ fonts is contained in the texmacs-extra-fonts package. 
+ If you want a complete set of Type1 fonts, consider installing
+ the texmacs-type1-fonts package.
 <<
 Maintainer: Martin Costabel <[EMAIL PROTECTED]>
 Homepage: http://www.texmacs.org
+



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to