Update of /cvsroot/fink/experimental/jfmertens/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv22404

Modified Files:
        seamonkey.info 
Log Message:
update

Index: seamonkey.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/crypto/finkinfo/seamonkey.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- seamonkey.info      6 Mar 2007 03:07:14 -0000       1.24
+++ seamonkey.info      20 Dec 2007 16:40:00 -0000      1.25
@@ -1,34 +1,38 @@
 Info2: <<
 Package: seamonkey
-Version: 1.1.1
-Revision: 1
-Type: ft219 (.)
+Version: 1.1.7
+Revision: 2
+## parameters needed at several places :
+Type: ft219 (.), sys_nspr (.)
 
 Depends: %N-shlibs (>= %v-%r), libgnomeui2
 BuildDepends: <<
  (%type_raw[ft219] = ft219) fontconfig2-dev, (%type_raw[ft219] = ft219) 
freetype219, (%type_raw[ft219] = ft219) pango1-xft2-ft219-dev,
  atk1, cairo, gconf2-dev, glib2-dev, glitz, gnome-vfs2-unified-dev, gtk+2-dev,
- libbonobo2-dev, libgettext3-dev, libgnome2-dev, libgnomeui2-dev, libiconv-dev,
- libidl2, libjpeg, libpng3, orbit2-dev, pango1-xft2-dev, xft2-dev, x11-dev, 
pkgconfig
+ libbonobo2-dev, libgettext3-dev, libgnome2-dev, libgnomeui2-dev, 
libiconv-dev, libidl2, libjpeg, libpng3, 
+ (%type_raw[sys_nspr] = .) nspr,  orbit2-dev, pango1-xft2-dev, xft2-dev, 
x11-dev, pkgconfig, fink (>= 0.27.2)
 <<
 GCC: 4.0
 
-Source-MD5: 4409ad62738d403719a62d00c0276e08
+Source-MD5: 6642c1c9f635068b7537e7d967cac04e
 Source: mirror:custom:mozilla.org/%N/releases/%v/%N-%v.source.tar.bz2
 CustomMirror: <<
   Primary: http://ftp.mozilla.org/pub/
-  nam-US: ftp://ftp.tux.org/pub/net/mozilla/
-  asi-JP: http://www.t.ring.gr.jp/pub/net/www/mozilla/
+#  nam-US: ftp://ftp.tux.org/pub/net/mozilla/
+#  asi-JP: http://www.t.ring.gr.jp/pub/net/www/mozilla/
 <<
 SourceDirectory: mozilla
 
 PatchScript: <<
  #!/bin/sh -ev
+ find . -name CVS -o -name .cvsignore | xargs rm -fR
 ## someone should once re-generate this old patchfile, going back to the early 
mozilla versions, and that I've only edited since..
  sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
 ### next 4 points substitute a.o. for things from msek's old patchfile _ 
trying slowly to move to more 'literate programmimg' :):
  # we want a gtk2 build:
  perl -pi.bak -e 's, \-DXP_MACOSX \-DNO_X11,,' configure{,.in}
+### fix for 10.5
+ perl -pi -e 's,argument missing, -exported_symbols_list,' configure{,.in}
  # there should be a better way to make @executable_path work correctly, but 
didn't look at it yet...
  perl -pi.bak -e 's,(install_name|dylib_file) [EMAIL PROTECTED],\1 %p/lib/%N,' 
\
        config/{config,rules}.mk {directory/c-sdk,nsprpub}/configure{,.in} \
@@ -66,16 +70,16 @@
    modules/plugin/samples/{default/unix,unixprinting}/Makefile.in
 ### Non-portable use of sed (not even usable with GNU sed !)
  perl -pi.bak -e 's,sed \-E,/usr/bin/$&,' xpcom/typelib/xpidl/Makefile.in
-### To fix EXC_BAD_INSTRUCTION on macintel (XP_MACOSX is zapped in the patch 
file):
+### To fix EXC_BAD_INSTRUCTION on macintel (XP_MACOSX is zapped in the 
beginning of the patchscript):
  perl -pi.bak -e 's,XP_MACOSX,__APPLE__,' 
xpcom/reflect/xptcall/src/md/unix/xptc{stubs_unixish_x86.cpp,_platforms_unixish_x86.h}
 ### link nspr with g++ when using --enable-cplus
  perl -pi.bak -e 's,cplus$,$&\n\tMKSHLIB = \$(CCC) \$(DSO_LDOPTS) -o \$@,' 
nsprpub/pr/src/Makefile.in
 ### next is needed for extensions/java/xpcom/nsJavaInterfaces.cpp, when using 
"--enable-javaxpcom"
  # not sufficient : trouble at link time then (for same symbols) _ make should 
be run in toolkit/xre
- # (cf comment below "--enable-javaxpcom (needs xulrunner ?)")
+ # (cf comment below on "--enable-javaxpcom")
  #ln -s ../../../../toolkit/xre/nsXULAppAPI.h extensions/java/xpcom/src
 ### New with 1.0.1 :
- # till 1.0.1, the zapping of '-DXP_MACCOSX' in the patch file (this goes back 
to the first versions of mozilla!)
+ # till 1.0.1, the zapping of '-DXP_MACCOSX' in the beginning of the  
patchscript (this goes back to the first versions of mozilla!)
  # ensured that no frameworks were needed on the link line... What is going on 
?
  perl -pi.bak -e 's,endif \# WINNT,$&\nEXTRA_DSO_LDOPTS += 
-F/System/Library/Frameworks -framework CoreFoundation,' xpcom/build/Makefile.in
 ### With 1.1a :
@@ -94,27 +98,26 @@
 # https://bugzilla.mozilla.org/show_bug.cgi?id=334250
 ## can't enable static : "configure: error: Only one of --enable-shared or 
--enable-static must be specified."
 ## (and reluctant to impose 2 full builds on the user...)
-# Adding --enable-javaxpcom doesn't work ; needs xulrunner ? _ but error msg :
-# "--enable-libxul is only compatible with toolkit XUL applications"
-# cf : https://bugzilla.mozilla.org/show_bug.cgi?id=354004
+# Adding --enable-javaxpcom doesn't work _  
https://bugzilla.mozilla.org/show_bug.cgi?id=354004
 # Also "--enable-boehm" leads to trouble...; probably not important (for a 
'production' pkg): according to
 # http://www.hpl.hp.com/personal/Hans_Boehm/gc/ , it is only used as a leak 
detector.
 ConfigureParams: <<
- --enable-macos-target=10.4 --enable-optimize=-Os --disable-debug 
--enable-strip --enable-tests --with-pthreads \
+ --enable-macos-target=${MACOSX_DEPLOYMENT_TARGET} --enable-optimize=-Os 
--disable-debug --enable-strip --enable-tests --with-pthreads \
  --with-default-mozilla-five-home=%p/lib/%N --mandir=%p/share/man 
--with-qtdir=%p \
  (%type_raw[ft219] = ft219) --with-ft-prefix=%p/lib/freetype219 
(%type_raw[ft219] = ft219) --x-includes='' (%type_raw[ft219] = ft219) 
--x-libraries='' \
- --enable-application=suite --enable-default-toolkit=gtk2 --enable-cplus \
- --enable-extensions=all --enable-image-decoders=all 
--enable-necko-protocols=all \
+ --enable-application=suite --enable-default-toolkit=gtk2 --enable-cplus 
--enable-libxul--enable-xul \
+ --enable-extensions=all --enable-image-decoders=all 
--enable-image-encoders=all --enable-necko-protocols=all \
  --enable-ctl --enable-canvas --enable-update-packaging --enable-storage 
--enable-profilesharing \
  --enable-xpctools --enable-url-classifier --enable-ipv6 
--enable-ldap-experimental \
  --with-x --enable-xinerama --enable-xprint --enable-pango --enable-xft 
--enable-postscript \
  --enable-svg --enable-svg-renderer=cairo --enable-system-cairo \
- --with-system-mng --with-system-jpeg --with-system-png --with-system-zlib
+ --with-system-mng --with-system-jpeg --with-system-png --with-system-zlib 
(%type_raw[sys_nspr] = .) --with-system-nspr
 <<
 # no -fstrict-aliasing in '--enable-optimize', else "dereferencing type-punned 
pointer will break strict-aliasing rules" warnings
 # --enable-single-profile : causes trouble: launch aborts (right after loading 
libXt and before loading components/libprofile)
 # without any error msgs anywhere, nor crash log or anything...
-
+##
+# --with-system-nss ?
 NoSetLDFLAGS: true
 NoSetCPPFLAGS: true
 
@@ -150,6 +153,11 @@
 # Install NSS headers.
 /bin/cp -R -L dist/public/nss %i/include/%N/nss
 
+# Rename .pc file
+if test "%type_raw[sys_nspr]" == "."
+       then mv %i/lib/pkgconfig/%N-nspr.pc %i/lib/pkgconfig/nspr.pc
+fi 
+
 # These files are redundant.
 # comment out to see..
 #for f in %i/lib/%N/chrome/*.jar; do
@@ -199,8 +207,11 @@
 # ls -l %p/bld/mozilla-1.7.11-5/mozilla/dist/bin/chrome/icons/default
 # total 140
 
-# for compatiblity with firefox etc
-mv %i/share/aclocal/nspr.m4 %i/share/aclocal/nspr-%N.m4
+# for compatiblity with firefox etc (if "--system-nspr" is enabled, file 
doesn't exist,
+# and it is ugly to program by "cases"...)
+if test -f %i/share/aclocal/nspr.m4
+   then mv %i/share/aclocal/nspr.m4 %i/share/aclocal/nspr-%N.m4
+fi
 
 # Install a symlink to the docfiles
 mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
@@ -226,7 +237,7 @@
   Package: %N-shlibs
   Depends: <<
    (%type_raw[ft219] = ft219) fontconfig2-shlibs, (%type_raw[ft219] = ft219) 
pango1-xft2-ft219-shlibs,
-   cairo-shlibs, gnome-vfs2-unified-shlibs, gtk+2-shlibs
+   cairo-shlibs, gnome-vfs2-unified-shlibs, gtk+2-shlibs, (%type_raw[sys_nspr] 
= .) nspr-shlibs
   <<
   DocFiles: LEGAL LICENSE
   Description: Seamonkey - shared libraries
@@ -254,43 +265,44 @@
 # The following depends strongly on %c. Adjust at the last minute.
 # Here all shared libs are listed. One could probably consider those in 
plugins and ipc as meant to be internal, and omit them.
   Shlibs: <<
-    %p/lib/%N/libDebugRobot.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libgfxpsshar.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libgkgfx.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libgtkembedmoz.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libgtkxtbin.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libjsj.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libldap50.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libmozjs.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libmozpango-dvngx.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libmozpango-thaix.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libmozpango.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libmsgbaseutil.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libnpsimple.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libnss3.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libplc4.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libplds4.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libprldap50.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libssl3.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libxlibrgb.dylib 1.0.0 %n (>= 1.0.6-1)
-    %p/lib/%N/libxpcom.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libxpcom_compat.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libxpcom_core.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/libxpistub.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/plugins/libnullplugin.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/plugins/libunixprintplugin.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/ipc/modules/liblockmodule.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/ipc/modules/libtransmgr.dylib 1.0.0 %n (>= 1.0-1)
-    %p/lib/%N/ipc/modules/libtestmodule.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libDebugRobot.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libfreebl3.dylib 1.0.0 %n (>= 1.1.2-1)
+       %p/lib/%N/libgfxpsshar.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libgkgfx.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libgtkembedmoz.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libgtkxtbin.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libjsj.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libldap50.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libmozjs.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libmozpango-dvngx.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libmozpango-thaix.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libmozpango.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libmsgbaseutil.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libnpsimple.dylib 1.0.0 %n (>= 1.0-1)
+       (%type_raw[sys_nspr] = no) %p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libnss3.dylib 1.0.0 %n (>= 1.0-1)
+       (%type_raw[sys_nspr] = no) %p/lib/%N/libplc4.dylib 1.0.0 %n (>= 1.0-1)
+       (%type_raw[sys_nspr] = no) %p/lib/%N/libplds4.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libprldap50.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libssl3.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libxlibrgb.dylib 1.0.0 %n (>= 1.0.6-1)
+       %p/lib/%N/libxpcom.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libxpcom_compat.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libxpcom_core.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/libxpistub.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/plugins/libnullplugin.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/plugins/libunixprintplugin.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/ipc/modules/liblockmodule.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/ipc/modules/libtransmgr.dylib 1.0.0 %n (>= 1.0-1)
+       %p/lib/%N/ipc/modules/libtestmodule.dylib 1.0.0 %n (>= 1.0-1)
   <<
 ### list of dylibs that have disappeared at some point because of changes in 
%c 0r %v
-#    %p/lib/%N/libDebugRobot.dylib 1.0.0 %n (>= 1.0-1)
-#    %p/lib/%N/libnpsimple.dylib 1.0.0 %n (>= 1.0-1)
-#    %p/lib/%N/libxlibrgb.dylib 1.0.0 %n (>= 1.7.11-1)
-#    %p/lib/%N/ipc/modules/libtestmodule.dylib 1.0.0 %n (>= 1.0-1)
+#      %p/lib/%N/libDebugRobot.dylib 1.0.0 %n (>= 1.0-1)
+#      %p/lib/%N/libnpsimple.dylib 1.0.0 %n (>= 1.0-1)
+#      %p/lib/%N/libxlibrgb.dylib 1.0.0 %n (>= 1.7.11-1)
+#      %p/lib/%N/ipc/modules/libtestmodule.dylib 1.0.0 %n (>= 1.0-1)
 <<
 
 SplitOff2: <<
@@ -298,8 +310,17 @@
   Depends: %N-shlibs (= %v-%r), pkgconfig
   BuildDependsOnly: true
   Description: Seamonkey - development headers and libraries
-  InstallScript: mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
-  Files: bin/%N-config include lib/pkgconfig share/aclocal share/idl
+  InstallScript: <<
+       #!/bin/sh -ev
+       mkdir -p %i/share/doc; ln -s %N-shlibs %i/share/doc/%n
+##  Put this here instead of the "Files", since the existence or not of the 
files
+##  depends on whether "--system-nspr" is enabled _ and the bulk of the info 
file
+##  should not have to change with variations in %c ! 
+       if test -d %I/share/aclocal
+         then mv %I/share/aclocal %i/share
+       fi              
+<<
+  Files: bin/%N-config include lib/pkgconfig share/idl
 <<
 
 Description: WWW, chat, mail, news, calendar, a-book, etc


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

Reply via email to