Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3577/10.3/unstable/main/finkinfo/x11
Modified Files: qt3.info Log Message: some info file cleanup, and a few minor bugfixes Index: qt3.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11/qt3.info,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- qt3.info 22 May 2006 12:03:29 -0000 1.33 +++ qt3.info 3 Aug 2006 17:30:00 -0000 1.34 @@ -1,12 +1,12 @@ Package: qt3 Version: 3.3.6 -Revision: 17 +Revision: 19 Description: Cross-Platform GUI application framework License: GPL Maintainer: Benjamin Reed <[EMAIL PROTECTED]> Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r), %N-doc (>= %v-%r), pkgconfig, macosx (>= 10.3.9-1) -BuildDepends: cctools (>= 446-0) | cctools-single-module, cups-dev, fink (>= 0.24-1), freetype219, gcc3.3, libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, x11-dev, macosx (>= 10.3.9-1) +BuildDepends: cctools (>= 446-0) | cctools-single-module, cups-dev, fink (>= 0.24-1), freetype219, gcc3.3, libgl-dev, libpng3 (>= 1.2.5-4), libjpeg, macosx (>= 10.3.9-1), pkgconfig, x11-dev BuildConflicts: autogen-dev Provides: %N-bin Conflicts: qt, qt2, %N-dev @@ -178,35 +178,39 @@ # %p/bin install -d -m 0755 %i/bin - for file in `cd %i/lib/qt3/bin; ls`; do - ln -sf %p/lib/qt3/bin/$file %i/bin/$file + for file in `cd %i/lib/%N/bin; ls`; do + ln -sf %p/lib/%N/bin/$file %i/bin/$file done # %p/include/qt install -d -m 0755 %i/include - ln -sf %p/include/qt %i/lib/qt3/include + ln -sf %p/include/qt %i/lib/%N/include # %p/lib - install -d -m 0755 %i/lib/qt3/lib - mv %i/lib/*.* %i/lib/qt3/lib/ + install -d -m 0755 %i/lib/%N/lib + mv %i/lib/*.* %i/lib/%N/lib/ - for file in `cd %i/lib/qt3/lib; ls`; do - [ "$file" != "pkgconfig" ] && ln -sf %p/lib/qt3/lib/$file %i/lib/$file + for file in `cd %i/lib/%N/lib; ls`; do + [ "$file" != "pkgconfig" ] && ln -sf %p/lib/%N/lib/$file %i/lib/$file done # clean up some bad data in the .la and .pc files - perl -pi -e "s,^libdir=.*,libdir='%p/lib/qt3/lib',; s,-L..QTDIR./lib ,,; s,^includedir=.*,includedir='%p/lib/qt3/include'," %i/lib/qt3/lib/*.la %i/lib/pkgconfig/*.pc + perl -pi -e "s,^libdir=.*,libdir='%p/lib/%N/lib',; s,-L..QTDIR./lib ,,; s,^includedir=.*,includedir='%p/lib/%N/include'," %i/lib/%N/lib/*.la %i/lib/pkgconfig/*.pc - # %p/lib/qt3/doc - ln -sf %p/share/doc/%N %i/lib/qt3/doc + # %p/lib/%N/doc + ln -sf %p/share/doc/%N %i/lib/%N/doc + + # mkspecs bad symlink + rm -rf %i/lib/%N/mkspecs/default + ln -sf darwin-g++ %i/lib/%N/mkspecs/default #### CLEAN UP FILES #### # fix the -L$(QTDIR) junk in the .la file - perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/qt3/lib/*.la + perl -pi -e 's,\$\(QTDIR\),%p/lib/qt3,g' %i/lib/%N/lib/*.la # remove the .prl files, we don't want them - rm -rf %i/lib/qt3/lib/*.prl + rm -rf %i/lib{,/%N/lib}/*.prl #### MAN PAGES #### @@ -276,27 +280,27 @@ lib/libqt-mt.*.dylib lib/libeditor.*.dylib lib/libqui.*.dylib - lib/qt3/lib/libqt-mt.*.dylib - lib/qt3/lib/libeditor.*.dylib - lib/qt3/lib/libqui.*.dylib - lib/qt3/plugins/imageformats - lib/qt3/plugins/sqldrivers + lib/%N/lib/libqt-mt.*.dylib + lib/%N/lib/libeditor.*.dylib + lib/%N/lib/libqui.*.dylib + lib/%N/plugins/imageformats + lib/%N/plugins/sqldrivers << Shlibs: << - %p/lib/qt3/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.3.6-2) - %p/lib/qt3/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.3.6-2) - %p/lib/qt3/lib/libqui.1*.dylib 1.0.0 %n (>= 3.3.6-2) + %p/lib/%N/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.3.6-2) + %p/lib/%N/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.3.6-2) + %p/lib/%N/lib/libqui.1*.dylib 1.0.0 %n (>= 3.3.6-2) << PostInstScript: << -/usr/X11R6/bin/fc-cache >/dev/null 2>&1 || : -if [ -d %p/lib/qt3-plugins ] && [ ! -L %p/lib/qt3-plugins ]; then - if rsync -arL %p/lib/qt3-plugins/ %p/lib/qt3/plugins/; then - rm -rf %p/lib/qt3-plugins - ln -sf %p/lib/qt3/plugins %p/lib/qt3-plugins +(/usr/X11R6/bin/fc-cache -f || :) >/tmp/fc-cache.log 2>&1 || : +if [ -d %p/lib/%N-plugins ] && [ ! -L %p/lib/%N-plugins ]; then + if rsync -arL %p/lib/%N-plugins/ %p/lib/%N/plugins/; then + rm -rf %p/lib/%N-plugins + ln -sf %p/lib/%N/plugins %p/lib/%N-plugins else cat <<END; WARNING: I was unable to copy your plugins from the (deprecated) -%p/lib/qt3-plugins directory into %p/lib/qt3/plugins. +%p/lib/%N-plugins directory into %p/lib/%N/plugins. Some Qt applications may not work as expected. END @@ -313,10 +317,10 @@ bin/designer lib/libdesigner* share/applnk/Development/designer.desktop - lib/qt3/bin/designer - lib/qt3/lib/libdesigner* - lib/qt3/plugins/designer - lib/qt3/templates + lib/%N/bin/designer + lib/%N/lib/libdesigner* + lib/%N/plugins/designer + lib/%N/templates << << SplitOff3: << @@ -330,19 +334,19 @@ share/man/man1/lrelease.1 share/man/man1/lupdate.1 share/applnk/Development/linguist.desktop - lib/qt3/bin/l* - lib/qt3/bin/qm2ts - lib/qt3/phrasebooks + lib/%N/bin/l* + lib/%N/bin/qm2ts + lib/%N/phrasebooks << << SplitOff4: << Package: %N-doc Conflicts: qt-doc, qt2, qt Replaces: qt-doc, qt2, qt, qt3 - Files: share/doc/%N lib/qt3/doc + Files: share/doc/%N lib/%N/doc << -PreInstScript: rm -rf %p/lib/qt3/mkspecs/default +PreInstScript: rm -rf %p/lib/%N/mkspecs/default Homepage: http://www.trolltech.com/ DescPackaging: << ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits