Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7401/10.3/unstable/crypto/finkinfo

Modified Files:
        ettercap-ssl.info ettercap-ssl.patch 
Log Message:
Fix nested functions in ./configure. Switch to gettext3.


Index: ettercap-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/ettercap-ssl.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ettercap-ssl.info   10 Feb 2006 21:10:53 -0000      1.13
+++ ettercap-ssl.info   8 Mar 2006 23:56:43 -0000       1.14
@@ -1,11 +1,11 @@
 Info2: <<
 Package: ettercap-ssl%type_pkg[-gtk]
 Version: 0.7.3
-Revision: 2
+Revision: 3
 Maintainer: Jeremy Higgs <[EMAIL PROTECTED]>
 Type: -gtk (boolean)
 Depends: <<
-gettext,
+libgettext3-shlibs,
 libiconv,
 libtool14-shlibs, 
 libncurses5-shlibs, 
@@ -22,7 +22,7 @@
 fink (>= 0.19.2-1), 
 cctools (>= 446-1),
 
-gettext-dev,
+libgettext3-dev,
 gettext-bin,
 gettext-tools,
 libiconv-dev,
@@ -55,10 +55,7 @@
 Source: mirror:sourceforge:ettercap/ettercap-NG-%v.tar.gz
 Source-MD5: 28fb15cd024162c55249888fe1b97820
 SourceDirectory: ettercap-NG-%v
-PatchScript: <<
-  sed 's|@FINK_PREFIX@|%p|g' < %a/%{Ni}.patch | patch -p1
-  perl -pi -e 's/"MACOSX"/"DARWIN"/' configure
-<<
+Patch: %{Ni}.patch
 ConfigureParams: --mandir=%p/share/man --with-libpcre=%p --with-libnet=%p 
--with-libpcap=%p --with-libncurses=%p --enable-plugins --with-openssl=%p 
--disable-dependency-tracking
 CompileScript: <<
   #!/bin/bash -ev
@@ -119,6 +116,11 @@
 <<
 DescPort: <<
 Patch modifies Makefile.in file to put the plugins in the proper directory.
+
+Fix spelling of token that configure uses to indicate OS X.
+
+Remove nested functions (prohibitted by gcc4) that are due to mis-use
+of AC_TRY_COMPILE macro.
 <<
 License: GPL
 Homepage: http://ettercap.sourceforge.net/

Index: ettercap-ssl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/ettercap-ssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ettercap-ssl.patch  10 Aug 2004 13:29:13 -0000      1.2
+++ ettercap-ssl.patch  8 Mar 2006 23:56:43 -0000       1.3
@@ -1,12 +1,54 @@
-diff -Naur ettercap-NG-0.7.0.orig/Makefile.in ettercap-NG-0.7.0/Makefile.in
---- ettercap-NG-0.7.0.orig/Makefile.in Mon Jul  5 21:28:57 2004
-+++ ettercap-NG-0.7.0/Makefile.in      Tue Jul  6 12:09:27 2004
+diff -Nurd -x'*~' ettercap-NG-0.7.3.orig/Makefile.in 
ettercap-NG-0.7.3/Makefile.in
+--- ettercap-NG-0.7.3.orig/Makefile.in 2005-05-27 11:11:46.000000000 -0400
++++ ettercap-NG-0.7.3/Makefile.in      2006-03-08 18:13:44.000000000 -0500
 @@ -19,7 +19,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = @FINK_PREFIX@/share/@PACKAGE@/plugins/
++pkglibdir = $(prefix)/share/@PACKAGE@/plugins/
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+diff -Nurd -x'*~' ettercap-NG-0.7.3.orig/configure ettercap-NG-0.7.3/configure
+--- ettercap-NG-0.7.3.orig/configure   2005-05-27 11:11:45.000000000 -0400
++++ ettercap-NG-0.7.3/configure        2006-03-08 18:11:02.000000000 -0500
+@@ -28243,7 +28243,7 @@
+ 
+ fi
+ 
+-   elif test "$OS" != "MACOSX" -a "$OS" != "WINDOWS"; then
++   elif test "$OS" != "DARWIN" -a "$OS" != "WINDOWS"; then
+       echo "$as_me:$LINENO: checking whether $CC accepts -pthread" >&5
+ echo $ECHO_N "checking whether $CC accepts -pthread... $ECHO_C" >&6
+       LDFLAGS_store="$LDFLAGS"
+@@ -28260,13 +28260,8 @@
+ int
+ main ()
+ {
+-
+-            int main(int argc, char **argv)
+-            {
+                pthread_create(NULL, NULL, NULL, NULL);
+                return 0;
+-            }
+-
+   ;
+   return 0;
+ }
+@@ -29604,15 +29599,10 @@
+ int
+ main ()
+ {
+-
+-               int main(int argc, char **argv)
+-               {
+                   char *q;
+                   char p[NS_MAXDNAME];
+ 
+                   dn_expand(q, q, q, p, sizeof(p));
+-               }
+-
+   ;
+   return 0;
+ }



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to