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

Modified Files:
      Tag: pangocairo-branch
        ekiga.info 
Log Message:
reformat deps, minor cleanup/clearer script bits; rm comments that seem 
out-of-date and/or are already in keeping with best-practices for related pkgs


Index: ekiga.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/Attic/ekiga.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- ekiga.info  19 May 2008 16:44:57 -0000      1.1.2.1
+++ ekiga.info  20 May 2008 02:33:37 -0000      1.1.2.2
@@ -4,11 +4,31 @@
 Maintainer: None <[EMAIL PROTECTED]>
 GCC: 4.0
 BuildDepends: <<
- intltool, libxml2-bin, libxslt-bin, pkgconfig, sed, audiofile, dbus-dev, 
esound,
- evolution-data-server-dev, gconf2-dev, glib2-dev, gtk+2-dev, libart2, 
avahi-dev,
- libavahi-glib1-dev, libbonobo2-dev, libgettext3-dev, libgnome2-dev, 
libgnomeui2-dev,
- opal2 (>= 2.2.8), openh323-1 (>= 1.19.0-2), orbit2-dev, 
- pango1-xft2-ft219-dev, pwlib1 (>= 1.10.7), x11-dev
+       audiofile,
+       avahi-dev,
+       dbus-dev,
+       esound,
+       evolution-data-server-dev,
+       gconf2-dev,
+       glib2-dev,
+       gtk+2-dev,
+       intltool,
+       libart2,
+       libavahi-glib1-dev,
+       libbonobo2-dev,
+       libgettext3-dev,
+       libgnome2-dev,
+       libgnomeui2-dev,
+       libxml2-bin,
+       libxslt-bin,
+       opal2 (>= 2.2.8),
+       openh323-1 (>= 1.19.0-2),
+       orbit2-dev, 
+       pango1-xft2-ft219-dev,
+       pkgconfig,
+       pwlib1 (>= 1.10.7),
+       sed,
+       x11-dev
 <<
 # sed : because of the patchscript...
 # configure looks for: scrollkeeper, pkg-config, /sw/etc/gconf (-> probably 
depends: gconf2), XML::Parser, gnome-doc-utils, intltool
@@ -23,22 +43,30 @@
 # (satisfied through gconf-editor -> libgnomeui2 -> gnome-vfs2-ssl | 
gnome-vfs2 ) _
 # probably forgotten dep in evolution-data-server, but from the PID's, they 
are called (all from '1') in the order :
 # /sw/sbin/gnome-vfs-daemon  
/sw/libexec/evolution/2.6/evolution-exchange-storage 
/sw/libexec/evolution-data-server-1.6)
-Depends: evolution-exchange, gconf-editor, opal2-shlibs (>= 2.2.8), 
openh323-1-shlibs (>= 1.19.0-2), rarian-compat, yelp
+Depends: <<
+       evolution-exchange,
+       gconf-editor, 
+       opal2-shlibs (>= 2.2.8),
+       openh323-1-shlibs (>= 1.19.0-2),
+       rarian-compat,
+       yelp
+<<
 # yelp-viewer-seamonkey depends on seamonkey _ not only -shlibs (provisionally 
fixed in seamonkey.info).
 # Avoid for the moment a dep just on yelp, because :
 # 1) dependency EDS also depends on seamonkey , and none has been tested to 
build correctly (let alone identical debs..) with eg firefox
 # 2) additional risk (+ wasted footprint...) in having one of them depend on 
firefox and the other on seamonkey.. 
-## validator doesn't know that depends are recursive... (re: scrollkeeper)
 Source: mirror:gnome:sources/%n/2.0/%n-%v.tar.bz2
 Source-MD5: d86636c2195b4fb95aec427c17570008
 PatchScript: <<
 #!/bin/sh -ev
-# to strip binaries (cf LDFLAGS):
- echo '__mh_execute_header' > symlst
-# link with dylibs (and opal2) :
-  sed -ri -e '/darwin\* \)/,+2{ s, \-DSTATIC_LIBS_USED,, ; 
s,-lh323_Darwin_ppc_r_s -lpt_Darwin_ppc_r_s,-lpt -lopal, }' configure
-# cf e-d-s for next :
-  for f in `find . -name ltmain.sh` ; do sed -ri.bak -e 
's,(s%%/)(\[\^/\]\*\$%%%%),\1\\+\2,' $f ; done
+       # to strip binaries (cf LDFLAGS):
+       echo '__mh_execute_header' > symlst
+
+       # link with dylibs (and opal2) :
+       sed -ri -e '/darwin\* \)/,+2{ s, \-DSTATIC_LIBS_USED,, ; 
s,-lh323_Darwin_ppc_r_s -lpt_Darwin_ppc_r_s,-lpt -lopal, }' configure
+
+       # cf e-d-s for next :
+       for f in `find . -name ltmain.sh` ; do sed -ri.bak -e 
's,(s%%/)(\[\^/\]\*\$%%%%),\1\\+\2,' $f ; done
 <<
 NoSetLDFLAGS: true
 SetLDFLAGS: -Wl,-x -exported_symbols_list %b/symlst -dead_strip
@@ -56,50 +84,52 @@
 # enabling sdl doesn't work because of undefined symbol _SDL_main
 CompileScript: <<
 #!/bin/sh -ev
-  export CPATH=%p/include
-  export 
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:${PKG_CONFIG_PATH}
-  ./configure %c
-  make all
-# following _ to get correct LOAD_COMMANDS _ should be re-done by editing 
src/Makefile.in ..
-# also, should be checked, after eg sdl is enabled, to see if it deals 
correctly with frameworks
-  cd src
-  ls=$(otool -L ekiga|fgrep -v "`otool -D ekiga`"|sed -r -e 's,^\t,,' -e 's, 
.*,,'|egrep -vx '/usr/lib/lib(System|gcc|stdc\+\+).*\.dylib'|fgrep "`nm -mfgu 
ekiga|fgrep ' (from '|sed -r -e 's,.* \(from ,/,' -e 's,\)$,,'|sort -u`"|sed -r 
-e 's,(.*)/([^/]+)\.framework/\2,-F\1 -framework \2,'|xargs)
-  g++ -Wl,-x -exported_symbols_list %b/symlst -dead_strip -Wl,-bind_at_load -o 
ekiga `ls -1 *.o|fgrep -v 'dbus-helper.o'|xargs` \
-       ../lib/.libs/libekiga.a $ls
-  ls=$(otool -L ekiga-helper|fgrep -v "`otool -D ekiga-helper`"|sed -r -e 
's,^\t,,' -e 's, .*,,'|egrep -vx 
'/usr/lib/lib(System|gcc|stdc\+\+).*\.dylib'|fgrep "`nm -mfgu 
ekiga-helper|fgrep ' (from '|sed -r -e 's,.* \(from ,/,' -e 's,\)$,,'|sort 
-u`"|sed -r -e 's,(.*)/([^/]+)\.framework/\2,-F\1 -framework \2,'|xargs)
-  g++ -Wl,-x -exported_symbols_list %b/symlst -dead_strip -Wl,-bind_at_load -o 
ekiga-helper dbus-helper.o $ls
+       export CPATH=%p/include
+       export 
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:${PKG_CONFIG_PATH}
+       ./configure %c
+       make all
+
+       # following _ to get correct LOAD_COMMANDS _ should be re-done by 
editing src/Makefile.in ..
+       # also, should be checked, after eg sdl is enabled, to see if it deals 
correctly with frameworks
+       pushd src
+               ls=$(otool -L ekiga|fgrep -v "`otool -D ekiga`"|sed -r -e 
's,^\t,,' -e 's, .*,,'|egrep -vx 
'/usr/lib/lib(System|gcc|stdc\+\+).*\.dylib'|fgrep "`nm -mfgu ekiga|fgrep ' 
(from '|sed -r -e 's,.* \(from ,/,' -e 's,\)$,,'|sort -u`"|sed -r -e 
's,(.*)/([^/]+)\.framework/\2,-F\1 -framework \2,'|xargs)
+               g++ -Wl,-x -exported_symbols_list %b/symlst -dead_strip 
-Wl,-bind_at_load -o ekiga `ls -1 *.o|fgrep -v 'dbus-helper.o'|xargs` 
../lib/.libs/libekiga.a $ls
+               ls=$(otool -L ekiga-helper|fgrep -v "`otool -D 
ekiga-helper`"|sed -r -e 's,^\t,,' -e 's, .*,,'|egrep -vx 
'/usr/lib/lib(System|gcc|stdc\+\+).*\.dylib'|fgrep "`nm -mfgu 
ekiga-helper|fgrep ' (from '|sed -r -e 's,.* \(from ,/,' -e 's,\)$,,'|sort 
-u`"|sed -r -e 's,(.*)/([^/]+)\.framework/\2,-F\1 -framework \2,'|xargs)
+               g++ -Wl,-x -exported_symbols_list %b/symlst -dead_strip 
-Wl,-bind_at_load -o ekiga-helper dbus-helper.o $ls
+       popd
 <<
 Infotest: <<
-TestScript: make -ik check
+       TestScript: make -ik check
 <<
 InstallScript: <<
-  make install DESTDIR=%d
+       make install DESTDIR=%d
 <<
 ConfFiles: %p/etc/gconf/schemas/ekiga.schemas
-# explanation of pre-depends in docs is  bit evasive.. Would the following 
technically need a pre-depends on scrollkeeper and gconf2 ?
-# Or the same thing in a PreInstScript ??
 PostInstScript: <<
-if [ configure = "$1" ]; then
-  scrollkeeper-update -q
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 
--makefile-install-rule %p/etc/gconf/schemas/ekiga.schemas >/dev/null
-fi
+       if [ configure = "$1" ]; then
+               scrollkeeper-update -q
+               GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 
gconftool-2 --makefile-install-rule %p/etc/gconf/schemas/ekiga.schemas 
>/dev/null
+       fi
 <<
 ## How to express that it depends on gconf2 until purged ???
 ## Or just that executing "dpkg --purge" should if needed (provisionally) 
install gconf2 ??
 ## (trying to put a 'fink install gconf2" (+ removal at the end if needed) in 
the script is almost sure
 ## to lead to a dpkg db access deadlock)
 PreRmScript: <<
-if [ purge = "$1" ]; then
-  GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 
--makefile-uninstall-rule %p/etc/gconf/schemas/ekiga.schemas >/dev/null
-fi
+       if [ purge = "$1" ]; then
+               GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` 
gconftool-2 --makefile-uninstall-rule %p/etc/gconf/schemas/ekiga.schemas 
>/dev/null
+       fi
 <<
 PostRmScript: <<  
-if [ remove != "$1" ]; then
-  scrollkeeper-update -q
-fi
+       if [ remove != "$1" ]; then
+               scrollkeeper-update -q
+       fi
 <<
 DocFiles: AUTHORS COPYING ChangeLog FAQ NEWS
 Description: Voice and video over IP
-DescPort: video seems to find neither plugins, nor the built-in camera of a 
MacBook_Pro...
+DescPort: <<
+       video seems to find neither plugins, nor the built-in camera
+       of a MacBook_Pro...
+<<
 License: GPL
 Homepage: http://www.ekiga.org/


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft 
Defy all challenges. Microsoft(R) Visual Studio 2008. 
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to