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

Added Files:
        libc-client1-shlibs.info libc-client1-shlibs.patch 
Log Message:
New c-client, with shared libs that work and still backwards compat this time

--- NEW FILE: libc-client1-shlibs.info ---
Package: libc-client1-shlibs
Version: 2006k
Revision: 1
Source: mirror:custom:imap-%v.tar.Z
CustomMirror: <<
 Primary: ftp://ftp.cac.washington.edu/imap/
 Secondary: ftp://ftp.cac.washington.edu/imap/old/
<<
Source-MD5: 3a98066870fb8075c744079309e379c8
BuildDepends: system-openssl-dev
Replaces: uw-imap-c-client1-shlibs, uw-imap-c-client-ssl1-shlibs
PatchScript: <<
  sed 's|@FINKPREFIX@|%p|g' < %a/%n.patch | patch -p1
<<
CompileScript: make ops
InstallScript: make install PREFIX=%p DESTDIR=%i
DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
Shlibs: %p/lib/libc-client.1.dylib 2.0.0 libc-client1-shlibs (>= 2006k-1)
SplitOff: <<
  Package: libc-client-dev
  Depends: %N (>= %v-%r)
  Replaces: uw-imap-c-client, uw-imap-c-client-ssl
  BuildDependsOnly: true
  Files: <<
    include
    lib/libc-client.dylib
    lib/libc-client.a
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: UW c-client library for mail protocols
  DescDetail: <<
    C-client is a library of functions for accessing mail folders and messages.
    It was written as part of the University of Washington IMAP server, but has
    since found other use as well.

    This package contains the static lib and headers for using the c-client mail
    handling library.
  <<
<<
SplitOff2: <<
  Package: uw-ipopd
  Depends: %N (>= %v-%r)
  Files: <<
    sbin/ipop2d
    sbin/ipop3d
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: POP2 and POP3 servers from UW
  DescDetail: <<
    This package contains the POP2 and POP3 servers which were
    formerly part of the University of Washington IMAP package.

    This server has SSL support built in.
  <<
<<
SplitOff3: <<
  Package: uw-imapd
  Depends: %N (>= %v-%r)
  Files: <<
    sbin/imapd
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: Remote mail folder access server
  DescDetail: <<
    IMAP (the Interactive Mail Access Protocol) is a mechanism for
    accessing mail folders and the messages in them remotely, ie with
    your user mail program running on a different machine to the one
    where all the messages are stored.

    If you do install uw-imapd you will almost certainly want to install a
    Mail Transfer Agent such as Smail or Sendmail, as remote mail
    programs which use IMAP to access incoming and saved mail will
    usually want to send mail using SMTP, often to the same machine.

    This server has SSL support built in.
  <<
<<
SplitOff4: <<
  Package: uw-mlock
  Depends: %N (>= %v-%r)
  Files: <<
    bin/mlock
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: Mailbox locking program from UW
  DescDetail: <<
    C-client is a library of functions for accessing mail folders and messages.
    It was written as part of the University of Washington IMAP server, but has
    since found other use as well.

    libc-client.dylib uses this program to lock mailbox files so they don't get
    corrupted.
  <<
<<
SplitOff5: <<
  Package: uw-mailutils
  Depends: %N (>= %v-%r)
  Files: <<
    bin/dmail
    bin/tmail
    bin/mailutil
  <<
  DocFiles: CONTENTS LICENSE.txt NOTICE OSTYPE README SPECIALS SUPPORT docs/*
  Description: C-client support programs from UW
  DescDetail: <<
    C-client is a library of functions for accessing mail folders and messages.
    It was written as part of the University of Washington IMAP server, but has
    since found other use as well.

    This package contains some programs that can be used with the libc-client
    mail handling library.  They are:

    mailutil: a program for dealing with mailboxes of various types.
    dmail: a Mail Delivery Agent (MDA) for use with procmail
    tmail: a Mail Delivery Program (MDA) for use with sendmail etc.
  <<
<<
SplitOff100: <<
  Package: uw-imap-c-client
  Depends: libc-client-dev (>= %v-%r)
  DocFiles: LICENSE.txt
<<
SplitOff101: <<
  Package: uw-imap-c-client-ssl
  Depends: libc-client-dev (>= %v-%r)
  DocFiles: LICENSE.txt
<<
SplitOff102: <<
  Package: uw-imap-c-client1-shlibs
  Depends: libc-client1-shlibs (>= %v-%r)
  DocFiles: LICENSE.txt
<<
SplitOff103: <<
  Package: uw-imap-c-client-ssl1-shlibs
  Depends: libc-client1-shlibs (>= %v-%r)
  DocFiles: LICENSE.txt
<<

Description: UW c-client library for mail protocols
DescDetail: <<
  C-client is a library of functions for accessing mail folders and messages.
  It was written as part of the University of Washington IMAP server, but has
  since found other use as well.

  This package contains the shared c-client mail handling library with SSL
  support.
<<
DescPort: <<
 License: University of Washington's Free-Fork License
<<
License: Restrictive
Homepage: http://www.washington.edu/imap/
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>

--- NEW FILE: libc-client1-shlibs.patch ---
diff -ruN imap-2006k.orig/Makefile imap-2006k/Makefile
--- imap-2006k.orig/Makefile    2007-11-07 16:16:50.000000000 -0700
+++ imap-2006k/Makefile 2007-12-10 13:57:06.000000000 -0700
@@ -102,6 +102,7 @@
 # os4  OSF/1 (Digital UNIX) 4
 # osx  Mac OS X
 # oxp  Mac OS X with Pluggable Authentication Modules (PAM)
+# ops  Mac OS X with Pluggable Authentication Modules (Shared c-client lib)
 # ptx  PTX
 # pyr  Pyramid
 # qnx  QNX 4
@@ -411,6 +412,13 @@
        EXTRACFLAGS="$(EXTRACFLAGS) -I/usr/kerberos/include" \
        SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib 
SSLCERTS=/usr/share/ssl/certs SSLKEYS=/usr/share/ssl/private 
GSSDIR=/usr/kerberos LOCKPGM=/usr/sbin/mlock"
 
+ops:   an
+       $(TOUCH) ip6
+       $(BUILD) BUILDTYPE=osx IP=$(IP6) 
EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
+       PASSWDTYPE=pam \
+       EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
+       SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib [EMAIL 
PROTECTED]@/etc/ssl/certs [EMAIL PROTECTED]@/etc/ssl/private 
GSSINCLUDE=/usr/include GSSLIB=/usr/lib [EMAIL PROTECTED]@/var/spool [EMAIL 
PROTECTED]@/sbin/mlock PAMDLFLAGS=-lpam"
+
 oxp:   an
        $(TOUCH) ip6
        $(BUILD) BUILDTYPE=osx IP=$(IP6) 
EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
@@ -731,3 +739,30 @@
 # A monument to a hack of long ago and far away...
 love:
        @echo not war?
+
+install:
+       mkdir -p $(DESTDIR)/sbin
+       mkdir -p $(DESTDIR)/bin
+       mkdir -p $(DESTDIR)/lib
+       mkdir -p $(DESTDIR)/include/c-client
+       install -m755 ipopd/ipop2d $(DESTDIR)/sbin
+       install -m755 ipopd/ipop3d $(DESTDIR)/sbin
+       install -m755 imapd/imapd $(DESTDIR)/sbin
+       install -m755 mlock/mlock $(DESTDIR)/bin
+       install -m755 dmail/dmail $(DESTDIR)/bin
+       install -m755 tmail/tmail $(DESTDIR)/bin
+       install -m755 mailutil/mailutil $(DESTDIR)/bin
+       for i in src/c-client/*.h; do \
+               install -m644 $$i $(DESTDIR)/include/c-client; \
+       done
+       for i in src/osdep/unix/*.h; do \
+               install -m644 $$i $(DESTDIR)/include/c-client; \
+       done
+       install -m644 c-client/auths.c $(DESTDIR)/include/c-client
+       install -m644 c-client/linkage.c $(DESTDIR)/include/c-client
+       install -m644 c-client/linkage.h $(DESTDIR)/include/c-client
+       install -m644 c-client/osdep.h $(DESTDIR)/include/c-client
+       install -m644 c-client/libc-client.a $(DESTDIR)/lib
+       install -m644 c-client/libc-client.`cat c-client/MAJOR`.0.0.`cat 
c-client/SHLIBEXT` $(DESTDIR)/lib
+       ln -s $(PREFIX)/lib/libc-client.`cat c-client/MAJOR`.0.0.`cat 
c-client/SHLIBEXT` $(DESTDIR)/lib/libc-client.`cat c-client/MAJOR`.`cat 
c-client/SHLIBEXT`
+       ln -s $(PREFIX)/lib/libc-client.`cat c-client/MAJOR`.0.0.`cat 
c-client/SHLIBEXT` $(DESTDIR)/lib/libc-client.`cat c-client/SHLIBEXT`
diff -ruN imap-2006k.orig/src/dmail/Makefile imap-2006k/src/dmail/Makefile
--- imap-2006k.orig/src/dmail/Makefile  2007-09-10 17:56:35.000000000 -0600
+++ imap-2006k/src/dmail/Makefile       2007-12-10 13:26:01.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
diff -ruN imap-2006k.orig/src/imapd/Makefile imap-2006k/src/imapd/Makefile
--- imap-2006k.orig/src/imapd/Makefile  2006-08-30 18:10:44.000000000 -0600
+++ imap-2006k/src/imapd/Makefile       2007-12-10 13:25:11.000000000 -0700
@@ -43,12 +43,13 @@
 # Get local definitions from c-client directory
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
+
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \
        -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \
        -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\"
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = `cat $C/LDFLAGS`
 
 all:   imapd
 
diff -ruN imap-2006k.orig/src/ipopd/Makefile imap-2006k/src/ipopd/Makefile
--- imap-2006k.orig/src/ipopd/Makefile  2006-08-30 18:17:30.000000000 -0600
+++ imap-2006k/src/ipopd/Makefile       2007-12-10 13:25:21.000000000 -0700
@@ -26,14 +26,14 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = $C/`cat $C/ARCHIVENAME`
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
 
 CC = `cat $C/CCTYPE`
 CFLAGS = -I$C `cat $C/CFLAGS`
-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
+LDFLAGS = `cat $C/LDFLAGS`
 
 ipopd: ipop2d ipop3d
 
diff -ruN imap-2006k.orig/src/mailutil/Makefile imap-2006k/src/mailutil/Makefile
--- imap-2006k.orig/src/mailutil/Makefile       2006-08-30 18:21:20.000000000 
-0600
+++ imap-2006k/src/mailutil/Makefile    2007-12-10 13:25:45.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
diff -ruN imap-2006k.orig/src/mtest/Makefile imap-2006k/src/mtest/Makefile
--- imap-2006k.orig/src/mtest/Makefile  2006-08-30 18:25:07.000000000 -0600
+++ imap-2006k/src/mtest/Makefile       2007-12-10 13:25:33.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory
diff -ruN imap-2006k.orig/src/osdep/unix/Makefile 
imap-2006k/src/osdep/unix/Makefile
--- imap-2006k.orig/src/osdep/unix/Makefile     2007-06-17 09:37:44.000000000 
-0600
+++ imap-2006k/src/osdep/unix/Makefile  2007-12-10 13:57:39.000000000 -0700
@@ -144,7 +144,11 @@
 
 # Normally no need to change any of these
 
-ARCHIVE=c-client.a
+ARCHIVE=libc-client.a
+SHARED-C-CLIENT=c-client
+MAJOR=1
+SHLIBEXT=dylib
+
 BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o utf8aux.o siglocal.o 
\
  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
@@ -577,9 +581,19 @@
 osx:   # Mac OS X
        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
         CRXTYPE=nfs \
-        SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+        [EMAIL PROTECTED]@/var/spool [EMAIL PROTECTED]@/var/mail \
         RSHPATH=/usr/bin/rsh \
-        BASECFLAGS="$(GCC4CFLAGS)"
+        BASECFLAGS="$(GCC4CFLAGS)" \
+        BASELDFLAGS="-L../c-client -l$(SHARED-C-CLIENT)" \
+        RANLIB=true \
+        CC=gcc
+
+osxshared: $(BINARIES) $(SHARED-C-CLIENT).$(SHLIBEXT)
+
+$(SHARED-C-CLIENT).$(SHLIBEXT):
+       $(CC) -dynamiclib -undefined dynamic_lookup -install_name 
@FINKPREFIX@/lib/lib$(SHARED-C-CLIENT).$(MAJOR).$(SHLIBEXT) 
-compatibility_version 2.0 -current_version 2.0 -o 
lib$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) $(BINARIES) `cat EXTRALDFLAGS`
+       ln -s lib$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) 
$(SHARED-C-CLIENT).$(MAJOR).$(SHLIBEXT)
+       ln -s lib$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) 
$(SHARED-C-CLIENT).$(SHLIBEXT)
 
 ptx:   # PTX
        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -840,7 +854,7 @@
 
 # Build it!
 
-build: clean once $(ARCHIVE)
+build: clean once $(ARCHIVE) osxshared
 
 all:   $(ARCHIVE)
 
@@ -856,7 +870,7 @@
 # Cleanup
 
 clean:
-       sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c 
osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+       sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c 
osdep*.[ch] *.o ARCHIVE ARCHIVENAME EXTRALDFLAGS SHARED-C-CLIENT *FLAGS *TYPE 
$(ARCHIVE) $(SHARED-C-CLIENT).$(SHLIBEXT) 
$(SHARED-C-CLIENT).$(MAJOR).$(SHLIBEXT) 
$(SHARED-C-CLIENT).$(MAJOR).0.0.$(SHLIBEXT) || true'
 
 
 # Dependencies
@@ -949,7 +963,12 @@
 
 # Once-only environment setup
 
-once:  onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
+once:  onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) secondenv osdep.c
+
+secondenv:
+       @echo Second-only environment setup...
+       mv LDFLAGS EXTRALDFLAGS
+       echo $(BASELDFLAGS) `cat EXTRALDFLAGS` > LDFLAGS
 
 onceenv:
        @echo Once-only environment setup...
@@ -960,8 +979,12 @@
         -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
         -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
         -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
-       echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+       echo $(EXTRALDFLAGS) > LDFLAGS
        echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+       echo $(ARCHIVE) > ARCHIVENAME
+       echo $(SHARED-C-CLIENT) > SHARED-C-CLIENT
+       echo $(MAJOR) > MAJOR
+       echo $(SHLIBEXT) > SHLIBEXT
        echo $(OS) > OSTYPE
        ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
        ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff -ruN imap-2006k.orig/src/tmail/Makefile imap-2006k/src/tmail/Makefile
--- imap-2006k.orig/src/tmail/Makefile  2007-09-10 17:44:27.000000000 -0600
+++ imap-2006k/src/tmail/Makefile       2007-12-10 13:25:56.000000000 -0700
@@ -26,7 +26,7 @@
 
 
 C = ../c-client
-CCLIENTLIB = $C/c-client.a
+CCLIENTLIB = 
 SHELL = /bin/sh
 
 # Get local definitions from c-client directory


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to