[cvs] dists/10.4/unstable/crypto/finkinfo seamonkey.info,1.20,1.21

[Jean-François M. <jfm...@us...>]

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

Modified Files:
	seamonkey.info 
Log Message:
same in HEAD

Index: seamonkey.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seamonkey.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- seamonkey.info	5 Jan 2008 04:10:10 -0000	1.20
+++ seamonkey.info	31 Jan 2008 17:04:31 -0000	1.21
@@ -1,7 +1,7 @@
 Info2: <<
 Package: seamonkey
 Version: 1.1.7
-Revision: 2
+Revision: 3
 ## parameters needed at several places :
 Type: ft219 (.), sys_nspr (.)
 
@@ -27,7 +27,8 @@
  #!/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
+ Xdir=`which xmkmf|sed -e 's,/bin/xmkmf,,'`
+ sed -e 's|@PREFIX@|%p|g' -e "s,/usr/X11R6,$Xdir," <%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}
@@ -123,19 +124,20 @@
 
 CompileScript: <<
 #!/bin/sh -ev
-if [ "%type_raw[ft219]" == "ft219" ];
+ Xdir=`which xmkmf|sed -e 's,/bin/xmkmf,,'`
+ if [ "%type_raw[ft219]" == "ft219" ];
     then
 	export PATH=%p/lib/freetype219/bin:$PATH
 	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig
-	export CPATH=/usr/X11R6/include:%p/include
-	export LIBRARY_PATH=/usr/X11R6/lib:%p/lib
+	export CPATH=$Xdir/include:%p/include
+	export LIBRARY_PATH=$Xdir/lib:%p/lib
     else
 	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%p/lib/freetype219/lib/pkgconfig
-	export CPATH=/usr/X11R6/include:%p/include
-	export LIBRARY_PATH=/usr/X11R6/lib:%p/lib
-fi
-env ac_cv_func_res_ninit=yes MOZ_ENABLE_COREXFONTS=1 ./configure %c
-make -w
+	export CPATH=$Xdir/include:%p/include
+	export LIBRARY_PATH=$Xdir/lib:%p/lib
+ fi
+ env ac_cv_func_res_ninit=yes MOZ_ENABLE_COREXFONTS=1 ./configure %c
+ make -w
 <<
 
 InstallScript: <<
@@ -153,10 +155,10 @@
 # Install NSS headers.
 /bin/cp -R -L dist/public/nss %i/include/%N/nss
 
-# Rename .pc file (other .pc files Require that name
+# Lik .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 mv %i/lib/pkgconfig/%N-nspr.pc %i/lib/pkgconfig/nspr.pc
+	then ln -s %N-nspr.pc %i/lib/pkgconfig/nspr.pc
 fi 
 
 # These files are redundant.