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

Modified Files:
        seamonkey.info 
Log Message:
A bit of shell avoids need for xmkmf


Index: seamonkey.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seamonkey.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- seamonkey.info      28 Mar 2008 17:03:18 -0000      1.24
+++ seamonkey.info      7 Apr 2008 02:07:16 -0000       1.25
@@ -6,7 +6,7 @@
 #Type: ft219 (.), sys_nspr (.)
 Type: ft219 (.), sys_nspr (no)
 
-Depends: %N-shlibs (>= %v-%r), libgnomeui2
+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,
@@ -24,12 +24,21 @@
 <<
 SourceDirectory: mozilla
 
+PatchFile: %n.patch
+PatchFile-MD5: 51f541962568db0c10cf0127fc9e28fa
 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..
- Xdir=`which xmkmf|sed -e 's,/bin/xmkmf,,'`
- sed -e 's|@PREFIX@|%p|g' -e "s,/usr/X11R6,$Xdir," <%a/%n.patch | patch -p1
+ if [ -e /usr/X11R6/include/X11/X.h ]; then
+   Xdir="/usr/X11R6"
+ elif [ -e /usr/X11/include/X11/X.h ]; then
+   Xdir="/usr/X11"
+ else
+   echo "Could not determine X11 prefix"
+   exit 1
+ fi
+ sed -e 's,@PREFIX@,%p,g' -e "s,/usr/X11R6,$Xdir," <%{PatchFile} | 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}
@@ -104,6 +113,7 @@
 # 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: <<
+ --disable-dependency-tracking \
  --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='' \
@@ -125,7 +135,14 @@
 
 CompileScript: <<
 #!/bin/sh -ev
- Xdir=`which xmkmf|sed -e 's,/bin/xmkmf,,'`
+ if [ -e /usr/X11R6/include/X11/X.h ]; then
+   Xdir="/usr/X11R6"
+ elif [ -e /usr/X11/include/X11/X.h ]; then
+   Xdir="/usr/X11"
+ else
+   echo "Could not determine X11 prefix"
+   exit 1
+ fi
  export CPATH=$Xdir/include:%p/include
  export LIBRARY_PATH=$Xdir/lib:%p/lib
  if [ "%type_raw[ft219]" == "ft219" ];
@@ -141,11 +158,18 @@
 
 InstallScript: <<
 #!/bin/sh -ev
-Xdir=`which xmkmf|sed -e 's,/bin/xmkmf,,'`
+ if [ -e /usr/X11R6/include/X11/X.h ]; then
+   Xdir="/usr/X11R6"
+ elif [ -e /usr/X11/include/X11/X.h ]; then
+   Xdir="/usr/X11"
+ else
+   echo "Could not determine X11 prefix"
+   exit 1
+ fi
 export CPATH=$Xdir/include:%p/include
 export LIBRARY_PATH=$Xdir/lib:%p/lib
 
-make install DESTDIR=%d
+make -j1 install DESTDIR=%d
 
 # The following gets installed twice. To hedge our bets, put a symlink in one 
of the 2 places :
 if test -f %i/lib/%N/ipc/modules/libtestmodule.dylib
@@ -157,7 +181,7 @@
 # Install NSS headers.
 /bin/cp -R -L dist/public/nss %i/include/%N/nss
 
-# Lik .pc file (the other .pc files Require the name 'nspr',
+# Link .pc file (the other .pc files Require the name 'nspr',
 # when using --with-system-nspr _ and nspr itself installs no .pc file
 if test "%type_raw[sys_nspr]" == "."
        then ln -s %N-nspr.pc %i/lib/pkgconfig/nspr.pc
@@ -312,7 +336,7 @@
 
 SplitOff2: <<
   Package: %N-dev
-  Depends: %N-shlibs (= %v-%r), pkgconfig
+  Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.21-1)
   BuildDependsOnly: true
   Description: Seamonkey - development headers and libraries
   InstallScript: <<


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to