Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv3036
Modified Files:
pine.info pine.patch
Log Message:
minor update to building; combine the files; new upstream for pine-ssl
Index: pine.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/pine.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pine.patch 7 Dec 2006 07:23:54 -0000 1.2
+++ pine.patch 10 Sep 2007 00:17:40 -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 */
+
Index: pine.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/pine.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pine.info 18 May 2007 00:32:17 -0000 1.5
+++ pine.info 10 Sep 2007 00:17:40 -0000 1.6
@@ -1,22 +1,47 @@
+Info2: <<
Package: pine
+#Package: pine%type_pkg[-ssl]
+Type: -ssl (.)
Version: 4.64
-Revision: 1001
+Revision: 1002
Source: mirror:custom:pine%v.tar.Z
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)
+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)
+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-ssl
-Replaces: pine-ssl
+Conflicts: pine, pine-ssl
+Replaces: pine, pine-ssl
PatchFile: %n.patch
-PatchFile-MD5: 8739d1dbaefc822a9ab2957b15cc1f2d
-PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
-CompileScript: ./build NOSSL EXTRACFLAGS=-I%p/include EXTRALDFLAGS=-L%p/lib
DEBUG="-g -O2 -DDEBUG" osx
+PatchFile-MD5: bd2978624fb8d64825a9743f44155a14
+PatchScript: <<
+ #!/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
cp bin/pine %i/bin
@@ -52,8 +77,13 @@
License: Restrictive/Distributable
Description: Text based tool for managing emails
DescDetail: <<
-Does not include SSL, LDAP or Kerberos functionality
-(use pine-ssl for that).
+ 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
+<<
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
