Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23267
Modified Files: root4-cernlib.info root4.info root4.patch Log Message: Link always to the right libfreetype Index: root4.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/root4.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- root4.info 11 May 2005 22:57:41 -0000 1.16 +++ root4.info 12 May 2005 03:50:53 -0000 1.17 @@ -1,6 +1,6 @@ Package: root4 Version: 4.04.02 -Revision: 11 +Revision: 12 GCC: 3.3 BuildDependsOnly: false Description: Object-oriented data analysis framework @@ -23,6 +23,7 @@ Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz Source-MD5: df628ba7e4976c8f31a1c28c343117d9 SourceDirectory: root +Patch: root4.patch PatchScript: << /usr/bin/sed "s/-lfreetype/\`freetype-config --libs\`/" config/root-config.in > tmp /bin/mv -f tmp config/root-config.in Index: root4-cernlib.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/root4-cernlib.info,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- root4-cernlib.info 11 May 2005 22:57:41 -0000 1.16 +++ root4-cernlib.info 12 May 2005 03:50:53 -0000 1.17 @@ -1,6 +1,6 @@ Package: root4-cernlib Version: 4.04.02 -Revision: 11 +Revision: 12 GCC: 3.3 BuildDependsOnly: false Description: Object-oriented data analysis framework @@ -28,6 +28,7 @@ Source: ftp://root.cern.ch/root/root_v%v.source.tar.gz Source-MD5: df628ba7e4976c8f31a1c28c343117d9 SourceDirectory: root +Patch: root4.patch PatchScript: << /usr/bin/sed "s/-lfreetype/\`freetype-config --libs\`/" config/root-config.in > tmp /bin/mv -f tmp config/root-config.in Index: root4.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/root4.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- root4.patch 18 Dec 2004 16:31:12 -0000 1.7 +++ root4.patch 12 May 2005 03:50:53 -0000 1.8 @@ -1,57 +1,31 @@ ---- root.orig/Makefile Fri Jul 9 05:32:58 2004 -+++ root.new/Makefile Fri Aug 13 15:04:52 2004 -@@ -43,7 +43,7 @@ - ##### Modules to build ##### - - MODULES = build cint metautils utils base cont meta net zip clib matrix \ -- newdelete hist tree freetype graf g3d gpad gui minuit \ -+ newdelete hist tree graf g3d gpad gui minuit \ - histpainter treeplayer treeviewer proof physics postscript \ - rint html eg geom geompainter vmc fumili mlp gedold ged quadp \ - guibuilder -@@ -72,6 +72,9 @@ - SYSTEMDO = $(UNIXDO) - endif +--- root.orig/asimage/Module.mk Wed May 11 18:07:35 2005 ++++ root.new/asimage/Module.mk Wed May 11 18:08:06 2005 +@@ -178,7 +178,7 @@ + "$(SOFLAGS)" libASImage.$(SOEXT) $@ \ + "$(ASIMAGEO) $(ASIMAGEDO)" \ + "$(ASIMAGELIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \ +- $(ASEXTRALIB) $(XLIBS) $(FREETYPELDFLAGS) $(FREETYPELIB)" ++ $(FREETYPELDFLAGS) $(FREETYPELIB) $(ASEXTRALIB) $(XLIBS)" endif -+endif -+ifneq ($(ARCH),macosx) -+MODULES += freetype + + $(ASIMAGEDS): $(ASIMAGEH) $(ASIMAGEL) $(ROOTCINTTMP) +@@ -202,7 +202,7 @@ + "$(SOFLAGS)" libASImageGui.$(SOEXT) $@ \ + "$(ASIMAGEGUIO) $(ASIMAGEGUIDO)" \ + "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \ +- $(ASEXTRALIB) $(XLIBS) $(FREETYPELDFLAGS) $(FREETYPELIB)" ++ $(FREETYPELDFLAGS) $(FREETYPELIB) $(ASEXTRALIB) $(XLIBS)" endif - ifneq ($(OPENGLINCDIR),) - ifneq ($(OPENGLULIB),) ---- root.orig/config/root-config.in Mon Sep 20 07:09:19 2004 -+++ root.new/config/root-config.in Sat Sep 25 23:28:42 2004 -@@ -258,7 +258,7 @@ - auxcflags=`[ -d ${finkdir}/include ] && echo -I${finkdir}/include` - auxlibs="-lm `[ -d ${finkdir}/lib ] && echo -L${finkdir}/lib` -ldl" - # cannot find the one linked to libGraf if relocated after built -- rootlibs="$rootlibs -lfreetype" -+ rootlibs="$rootlibs -L/usr/X11R6/lib -lfreetype" - if [ $macosx_minor -le 3 ]; then - forcelibs=$rootulibs - forceglibs=$rootuglibs ---- root.orig/config/Makefile.macosx Thu Dec 16 10:54:39 2004 -+++ root.new/config/Makefile.macosx Fri Dec 17 12:04:40 2004 -@@ -24,9 +24,11 @@ - CC = gcc - CXXFLAGS = -pipe -W -Wall -Wno-long-double -Woverloaded-virtual \ - -fsigned-char -fno-common \ -- -I/usr/X11R6/include $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) -+ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 \ -+ $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) - CFLAGS = -pipe -W -Wall -Wno-long-double -fsigned-char -fno-common \ -- -I/usr/X11R6/include $(EXTRA_CFLAGS) $(FINK_CFLAGS) -+ -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 \ -+ $(EXTRA_CFLAGS) $(FINK_CFLAGS) - CINTCXXFLAGS = -pipe -W -Wall -Wno-long-double -Woverloaded-virtual \ - -fsigned-char -fno-common \ - -DG__REGEXP $(EXTRA_CXXFLAGS) $(FINK_CXXFLAGS) \ -@@ -64,7 +66,7 @@ - # System libraries: - SYSLIBS = -lm $(EXTRA_LDFLAGS) $(FINK_LDFLAGS) $(OSTHREADLIBDIR) \ -- $(OSTHREADLIB) -ldl -+ $(OSTHREADLIB) -ldl -L/usr/X11R6/lib -lfreetype - XLIBS = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lX11 - CILIBS = -lm $(EXTRA_LDFLAGS) $(FINK_LDFLAGS) -ldl + $(ASIMAGEGUIDS): $(ASIMAGEGUIH) $(ASIMAGEGUIL) $(ROOTCINTTMP) +--- root.orig/x11ttf/Module.mk Thu May 5 18:46:24 2005 ++++ root.new/x11ttf/Module.mk Wed May 11 20:16:33 2005 +@@ -40,7 +40,7 @@ + @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ + "$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ \ + "$(X11TTFO) $(X11TTFDO)" \ +- "$(FREETYPELDLFAGS) $(FREETYPELIB) $(X11TTFLIBEXTRA) $(XLIBS)" ++ "$(FREETYPELDFLAGS) $(FREETYPELIB) $(X11TTFLIBEXTRA) $(XLIBS)" + $(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMP) + @echo "Generating dictionary [EMAIL PROTECTED]" ------------------------------------------------------- This SF.Net email is sponsored by Oracle Space Sweepstakes Want to be the first software developer in space? Enter now for the Oracle Space Sweepstakes! http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits