Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17:/tmp/cvs-serv3118

Modified Files:
        pine-ssl.info pine-ssl.patch 
Log Message:
minor update to building; combine the files; new upstream for pine-ssl


Index: pine-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/pine-ssl.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pine-ssl.info       7 Dec 2006 07:23:53 -0000       1.4
+++ pine-ssl.info       10 Sep 2007 00:18:07 -0000      1.5
@@ -1,35 +1,46 @@
+Info2: <<
 Package: pine-ssl
-Version: 4.61
-Revision: 1003
-Description: Text based tool for managing emails
-License: Restrictive/Distributable
-Maintainer: None <[EMAIL PROTECTED]>
-Conflicts: pine
-Replaces: pine
-Provides: pine
-Depends: openssl097, openssl097-shlibs, openldap-ssl-shlibs, 
cyrus-sasl2-shlibs, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 
5.4-20041023-1006)
-BuildDepends: openssl097-dev, openldap-ssl-dev, cyrus-sasl2-dev, libncurses5 
(>= 5.4-20041023-1006)
+#Package: pine%type_pkg[-ssl]
+Type: -ssl (-ssl)
+Version: 4.64
+Revision: 1002
 Source: mirror:custom:pine%v.tar.Z
-Source-MD5: f8bcede83c63bfd4198d7e55ee723cf9
+Source-MD5: 75af127948cc0c701d424d22d621f792
 CustomMirror: <<
  Primary: ftp://ftp.cac.washington.edu/pine/old/
  Secondary: ftp://ftp.cac.washington.edu/pine/
 <<
+BuildDepends: libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12), 
(%type_raw[-ssl] = -ssl) openssl097-dev, (%type_raw[-ssl] = -ssl) 
openldap-ssl-dev, (%type_raw[-ssl] = -ssl) cyrus-sasl2-dev
+
+BuildConflicts: openldap23-dev
+Depends: ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 
5.4-20041023-1006), (%type_raw[-ssl] = -ssl) openssl097, (%type_raw[-ssl] = 
-ssl) openssl097-shlibs, (%type_raw[-ssl] = -ssl) openldap-ssl-shlibs, 
(%type_raw[-ssl] = -ssl) cyrus-sasl2-shlibs
 GCC: 4.0
+Conflicts: pine, pine-ssl
+Replaces: pine, pine-ssl
+PatchFile: %n.patch
+PatchFile-MD5: bd2978624fb8d64825a9743f44155a14
 PatchScript: <<
- sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
+ #!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+ if [ "%type_raw[-ssl]" == "-ssl" ]; then
  mkdir ldap
  ln -s %p/lib ldap/libraries
  ln -s %p/include ldap/include
+ fi
 <<
 CompileScript: <<
  #!/bin/sh -ev
+ if [ "%type_raw[-ssl]" == "." ]; then
+ ./build NOSSL EXTRACFLAGS=-I%p/include EXTRALDFLAGS=-L%p/lib  DEBUG="-g -O2 
-DDEBUG" osx 
+ fi
+ if [ "%type_raw[-ssl]" == "-ssl" ]; then
  ln -s /usr krb5
  ./build osx \
  SSLCERTS=%p/etc/ssl SSLINCLUDE=%p/include/openssl \
  SSLLIB=%p/lib EXTRACFLAGS=-I%p/include EXTRALDFLAGS=-L%p/lib \
  DEBUG="-g -O2 -DDEBUG" \
  LDAPLIBS="../ldap/libraries/libldap.a ../ldap/libraries/liblber.a -L%p/lib 
-lsasl2" 
+ fi
 <<
 InstallScript: <<
  mkdir -p %i/bin
@@ -63,11 +74,16 @@
 <<
 DocFiles: README CPYRIGHT
 RuntimeVars: PINECONF: %p/etc/pine.conf
-DescDetail:  <<
- Includes SSL, LDAP and Kerberos support (using Apple Kerberos libs
- and fink libs for ssl, ldap).
-
- Includes bug fix patches from 
- http://www.math.washington.edu/~chappa/pine/#BugFixes.
+License: Restrictive/Distributable
+Description: Text based tool for managing emails
+DescDetail: <<
+ The pine-ssl package includes SSL, LDAP and Kerberos support (using Apple 
+ Kerberos libs and fink libs for ssl, ldap); the pine package does not.
 <<
+DescPort: <<
+ Patched imap/Makefile to back out a change in version 4.64 which was
+ preventing the fink package for pine-ssl from building.
+<<
+Maintainer: None <[EMAIL PROTECTED]>
 Homepage: http://www.washington.edu/pine
+<<

Index: pine-ssl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/pine-ssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pine-ssl.patch      7 Dec 2006 07:23:53 -0000       1.2
+++ pine-ssl.patch      10 Sep 2007 00:18:07 -0000      1.3
@@ -32,3 +32,26 @@
  then
      exit 0
  fi
+diff -ruN pine4.64/imap/Makefile pine4.64-patched/imap/Makefile
+--- pine4.64/imap/Makefile     2005-04-30 13:50:20.000000000 -0700
++++ pine4.64-patched/imap/Makefile     2007-09-09 16:54:34.000000000 -0700
+@@ -345,7 +345,7 @@
+ 
+ oxp:  an
+       $(BUILD) BUILDTYPE=osx \
+-      IP=6 EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
++      IP=6 \
+       SPECIALS="SSLDIR=/System/Library/OpenSSL 
SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib PAMLDFLAGS=-lpam" \
+       PASSWDTYPE=pam \
+       EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1"
+diff -ruN pine4.64/imap/src/osdep/unix/env_unix.c 
pine4.64-patched/imap/src/osdep/unix/env_unix.c
+--- pine4.64/imap/src/osdep/unix/env_unix.c    2004-09-13 14:31:19.000000000 
-0700
++++ pine4.64-patched/imap/src/osdep/unix/env_unix.c    2007-09-09 
10:53:53.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include <grp.h>
+ #include <signal.h>
+ #include <sys/wait.h>
++#define setpgrp setpgid
+ 
+ /* c-client environment parameters */
+ 


-------------------------------------------------------------------------
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
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to