[Midnightbsd-cvs] mports: mail/cclient: Update cclient to 2006j
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Oct 29 14:53:12 EDT 2007
Log Message:
-----------
Update cclient to 2006j
Modified Files:
--------------
mports/mail/cclient:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/mail/cclient/files:
patch-ab (r1.1 -> r1.2)
patch-ac (r1.1 -> r1.2)
Removed Files:
-------------
mports/mail/cclient/files:
pkg-message
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/mail/cclient/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/cclient/pkg-plist -Lmail/cclient/pkg-plist -u -r1.1 -r1.2
--- mail/cclient/pkg-plist
+++ mail/cclient/pkg-plist
@@ -3,6 +3,8 @@
include/c-client/env.h
include/c-client/env_unix.h
include/c-client/fdstring.h
+include/c-client/flockcyg.h
+include/c-client/flocksim.h
include/c-client/flstring.h
include/c-client/fs.h
include/c-client/ftl.h
@@ -10,10 +12,7 @@
include/c-client/linkage.c
include/c-client/linkage.h
include/c-client/mail.h
-include/c-client/mbx.h
-include/c-client/mh.h
include/c-client/misc.h
-include/c-client/mx.h
include/c-client/netmsg.h
include/c-client/newsrc.h
include/c-client/nl.h
@@ -27,7 +26,11 @@
include/c-client/tcp_unix.h
include/c-client/unix.h
include/c-client/utf8.h
+include/c-client/utf8aux.h
include/c-client/portrevision.h
+include/c-client/CFLAGS
+include/c-client/LDFLAGS
+include/c-client/OSCFLAGS
lib/%%SHLIBNAME%%
lib/libc-client4.a
lib/libc-client4.so
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/cclient/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/cclient/Makefile -Lmail/cclient/Makefile -u -r1.2 -r1.3
--- mail/cclient/Makefile
+++ mail/cclient/Makefile
@@ -3,11 +3,11 @@
# Whom: Kelly Yancey <kbyanc at FreeBSD.org>
#
# $MidnightBSD$
-# $FreeBSD: ports/mail/cclient/Makefile,v 1.35 2006/05/10 22:36:47 edwin Exp $
+# $FreeBSD: ports/mail/cclient/Makefile,v 1.41 2007/10/01 04:03:01 marcus Exp $
#
PORTNAME= cclient
-PORTVERSION= 2004g
+PORTVERSION= 2006j
PORTEPOCH= 1
CATEGORIES= mail devel ipv6
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
@@ -17,15 +17,23 @@
MASTER_SITE_SUBDIR= . old
DISTNAME= imap-${PORTVERSION}
EXTRACT_SUFX= .tar.Z
+DISTVERSIONSUFFIX= 2
+DISTFILES= ${DISTNAME}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
MAINTAINER= ports at MidnightBSD.org
COMMENT= Mark Crispin's C-client mail access routines
-# '
-USE_LDONFIG= yes
+OPTIONS= SSL "Compile with SSL support" on \
+ SSL_AND_PLAINTEXT "Allow plain text passwords and SSL" off \
+ IPV6 "Support IPv6" on \
+ MBX_DEFAULT "Use MBX as default mailbox format" off
+
+.include <bsd.port.pre.mk>
+
+USE_LDCONFIG= yes
ALL_TARGET= bsf
.if defined(WITHOUT_SSL)
-MAKE_ARGS+= SSLTYPE=none
+MAKE_ARGS+= SSLTYPE=none SSLDIR=${OPENSSLBASE}
.else
USE_OPENSSL= yes
.if defined(WITH_SSL_AND_PLAINTEXT)
@@ -35,24 +43,14 @@
.endif
.endif
-.if !defined(WITHOUT_SSL)
-PKGMESSAGE= ${FILESDIR}/pkg-message
-.endif
-
WRKSRC= ${WRKDIR}/${DISTNAME}
SHLIBBASE= c-client4
-SHLIBMAJ= 8
+SHLIBMAJ= 9
SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}
MAKE_ENV= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}.0
-.endif
-
post-patch:
.for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss
@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file}
@@ -63,14 +61,19 @@
@${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \
${WRKSRC}/src/osdep/unix/Makefile
.endif
+.if defined(WITH_MBX_DEFAULT)
+ @${REINPLACE_CMD} -e "s|^CREATEPROTO=unixproto|CREATEPROTO=mbxproto|" \
+ ${WRKSRC}/src/osdep/unix/Makefile
+.endif
post-configure:
@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
-HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flstring.h \
- fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h mbx.h mh.h \
- misc.h mx.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \
- rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h
+HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h \
+ flocksim.h flstring.h fs.h ftl.h imap4r1.h linkage.c linkage.h \
+ mail.h misc.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \
+ rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h \
+ utf8aux.h
PORTREV_H= ${WRKDIR}/portrevision.h
post-build:
@@ -91,8 +94,18 @@
${LN} -sf ${SHLIBNAME} ${PREFIX}/lib/lib${SHLIBBASE}.so
${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a \
${PREFIX}/lib/lib${SHLIBBASE}.a
+ ${INSTALL_DATA} ${WRKSRC}/c-client/CFLAGS ${PREFIX}/include/c-client
+ ${INSTALL_DATA} ${WRKSRC}/c-client/LDFLAGS ${PREFIX}/include/c-client
+ ${INSTALL_DATA} ${WRKSRC}/c-client/OSCFLAGS ${PREFIX}/include/c-client
post-install:
${INSTALL_DATA} ${PORTREV_H} ${PREFIX}/include/c-client
+.if !defined(WITHOUT_SSL)
+ @${ECHO} "================================================================================"
+ @${ECHO} "Warning: You have chosen to include SSL support. Applications/ports that use"
+ @${ECHO} "the cclient library but do not support SSL may stop working or have problems"
+ @${ECHO} "linking. Linking them explicitly with ssl (-lssl -lcrypto) may or may not help."
+ @${ECHO} "================================================================================"
+.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/cclient/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/cclient/distinfo -Lmail/cclient/distinfo -u -r1.1 -r1.2
--- mail/cclient/distinfo
+++ mail/cclient/distinfo
@@ -1,3 +1,3 @@
-MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020
-SHA256 (imap-2004g.tar.Z) = 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d
-SIZE (imap-2004g.tar.Z) = 2246713
+MD5 (imap-2006j2.tar.Z) = d7900691c415bcc725c1bf2b15e4fb99
+SHA256 (imap-2006j2.tar.Z) = 5b2ed247fd98f81c7a2d23d0822f602d49b742c19761a9c2dad6753f5f3e806e
+SIZE (imap-2006j2.tar.Z) = 2686745
--- mail/cclient/files/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-Warning: You have chosen to include SSL support. Applications/ports that use
-the cclient library but do not support SSL may stop working or have problems
-linking. Linking them explicitly with ssl (-lssl -lcrypto) may or may not help.
Index: patch-ac
===================================================================
RCS file: /home/cvs/mports/mail/cclient/files/patch-ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/cclient/files/patch-ac -Lmail/cclient/files/patch-ac -u -r1.1 -r1.2
--- mail/cclient/files/patch-ac
+++ mail/cclient/files/patch-ac
@@ -1,50 +1,78 @@
---- Makefile.orig Tue Nov 5 01:19:13 2002
-+++ Makefile Wed Nov 27 00:59:07 2002
-@@ -256,7 +256,7 @@
-
- # Make the IMAP Toolkit
-
--all: SPECIALS c-client rebuild bundled
-+all: SPECIALS c-client rebuild
-
- c-client:
- @echo Not processed yet. In a first-time build, you must specify
-@@ -396,9 +396,6 @@
- @echo + In order to rectify this problem, you MUST build with:
- @echo ++ SSLTYPE=$(SSLTYPE).nopwd
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- @echo
-- @echo Do you want to continue this build anyway? Type y or n please:
-- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
-
- sslnone:
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -411,9 +408,6 @@
- @echo ++ SSLTYPE=nopwd
- @echo + You must also have OpenSSL or equivalent installed.
- @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- @echo
-- @echo Do you want to continue this build anyway? Type y or n please:
-- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'
-
-
- # C compiler types
-@@ -434,7 +428,7 @@
- $(TOOLS)/$@ "$(LN)" src/tmail tmail
- $(LN) $(TOOLS)/$@ .
-
--build: OSTYPE rebuild rebuildclean bundled
-+build: OSTYPE rebuild rebuildclean
-
- OSTYPE:
- @echo Building c-client for $(BUILDTYPE)...
-@@ -453,8 +447,7 @@
- @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
- @echo Rebuilding c-client for `$(CAT) OSTYPE`...
- @$(TOUCH) SPECIALS
-- $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
-- CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-+ $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
-
- rebuildclean:
- $(SH) -c '$(RM) rebuild || true'
+*** Makefile.orig Wed May 9 00:50:45 2007
+--- Makefile Mon Jul 23 16:02:26 2007
+***************
+*** 294,300 ****
+
+ # Make the IMAP Toolkit
+
+! all: c-client SPECIALS rebuild bundled
+
+ c-client:
+ @echo Not processed yet. In a first-time build, you must specify
+--- 294,300 ----
+
+ # Make the IMAP Toolkit
+
+! all: c-client SPECIALS rebuild
+
+ c-client:
+ @echo Not processed yet. In a first-time build, you must specify
+***************
+*** 559,567 ****
+ @echo + In order to rectify this problem, you MUST build with:
+ @echo ++ SSLTYPE=$(SSLTYPE).nopwd
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- @echo
+- @echo Do you want to continue this build anyway? Type y or n please:
+- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
+
+ nounenc:
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+--- 559,564 ----
+***************
+*** 582,590 ****
+ @echo ++ SSLTYPE=nopwd
+ @echo + You must also have OpenSSL or equivalent installed.
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+- @echo
+- @echo Do you want to continue this build anyway? Type y or n please:
+- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac'
+
+ nonossl:
+ @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+--- 579,584 ----
+***************
+*** 659,665 ****
+ $(TOOLS)/$@ "$(LN)" src/tmail tmail
+ $(LN) $(TOOLS)/$@ .
+
+! build: OSTYPE rebuild rebuildclean bundled
+
+ OSTYPE:
+ @$(MAKE) ip$(IP)
+--- 653,659 ----
+ $(TOOLS)/$@ "$(LN)" src/tmail tmail
+ $(LN) $(TOOLS)/$@ .
+
+! build: OSTYPE rebuild rebuildclean
+
+ OSTYPE:
+ @$(MAKE) ip$(IP)
+***************
+*** 679,686 ****
+ @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
+ @echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ @$(TOUCH) SPECIALS
+! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
+
+ rebuildclean:
+ $(SH) -c '$(RM) rebuild || true'
+--- 673,679 ----
+ @$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) || (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
+ @echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ @$(TOUCH) SPECIALS
+! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
+
+ rebuildclean:
+ $(SH) -c '$(RM) rebuild || true'
Index: patch-ab
===================================================================
RCS file: /home/cvs/mports/mail/cclient/files/patch-ab,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lmail/cclient/files/patch-ab -Lmail/cclient/files/patch-ab -u -r1.1 -r1.2
--- mail/cclient/files/patch-ab
+++ mail/cclient/files/patch-ab
@@ -1,157 +1,254 @@
---- src/osdep/unix/Makefile.orig Thu Apr 21 00:48:34 2005
-+++ src/osdep/unix/Makefile Mon May 30 19:08:25 2005
-@@ -22,8 +22,8 @@
-
- EXTRAAUTHENTICATORS=
- EXTRADRIVERS=mbox
--PASSWDTYPE=std
--SSLTYPE=nopwd
-+PASSWDTYPE=pam
-+SSLTYPE=unix.nopwd
- IP=4
-
-
-@@ -41,13 +41,13 @@
-
- # Extended flags needed for SSL. You may need to modify.
-
--SSLDIR=/usr/local/ssl
--SSLCERTS=$(SSLDIR)/certs
-+SSLDIR=$(OPENSSLBASE)
-+SSLCERTS=$(PREFIX)/certs
- SSLKEYS=$(SSLCERTS)
--SSLINCLUDE=$(SSLDIR)/include
--SSLLIB=$(SSLDIR)/lib
-+SSLINCLUDE=$(OPENSSLINC)
-+SSLLIB=$(OPENSSLLIB)
-
--SSLCRYPTO=-lcrypto
-+SSLCRYPTO=-lcrypto -lcrypt
-
- # Older versions of MIT Kerberos also have a libcrypto. If so, you may need
- # to use this instead
-@@ -74,7 +74,7 @@
- # AFSLDFLAGS may also need -L/usr/ucblib -lucb
- DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
- DCELDFLAGS= -ldce
--PAMLDFLAGS= -lpam -ldl
-+PAMLDFLAGS= # -lpam -lcrypt
-
-
- # Build parameters normally set by the individual port
-@@ -111,7 +111,7 @@
- # Commands possibly overriden by the individual port
-
- ARRC=ar rc
--CC=cc
-+#CC=cc
- LN=ln -s
- RANLIB=ranlib
-
-@@ -129,7 +129,7 @@
- dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
- rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
--CFLAGS=-g
-+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
-
- CAT=cat
- MAKE=make
-@@ -146,6 +146,10 @@
- PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
-
-
-+# Need this for the shared library rule to work correctly
-+.SUFFIXES: .o .so
-+SOFILES=${BINARIES:.o=.so}
-+
- # Here if no make argument established
-
- missing: osdep.h
-@@ -226,13 +230,14 @@
- BASECFLAGS="-g -Dconst="
-
- bsf: # FreeBSD
-- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-+ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
- SIGTYPE=psx CRXTYPE=nfs \
- SPOOLDIR=/var \
- ACTIVEFILE=/usr/local/news/lib/active \
- RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="-g -O -pipe" \
-- BASELDFLAGS="-lcrypt"
-+ LOCKPGM=$(PREFIX)/libexec/mlock \
-+ BASECFLAGS="-DNFSKLUDGE" \
-+ BASELDFLAGS="-lpam"
-
- bsi: # BSD/i386
- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -801,23 +806,35 @@
-
- # Build it!
-
--build: clean once $(ARCHIVE)
-+build: clean once $(ARCHIVE) $(SHLIBNAME)
-
--all: $(ARCHIVE)
-+all: $(ARCHIVE) $(SHLIBNAME)
-
- $(ARCHIVE): $(BINARIES)
- sh -c '$(RM) $(ARCHIVE) || true'
- @$(CAT) ARCHIVE
- @$(SH) ARCHIVE
-
-+$(SHLIBNAME): $(SOFILES)
-+.if $(PORTOBJFORMAT) == "elf"
-+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
-+.else
-+ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
-+.endif
-+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
-+
-+.c.so: osdep.h
-+ $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
-+
- .c.o:
-- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
-+ $(CC) -c $(CFLAGS) $*.c
-
-
- # Cleanup
-
- clean:
- sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
-+ sh -c '$(RM) *.so $(SHLIBNAME)'
-
-
- # Dependencies
-@@ -850,7 +867,7 @@
-
- # OS-dependent
-
--osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
-+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
- osdep.h env_unix.h tcp_unix.h \
- osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
- auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c nfstest.c fsync.c \
-@@ -864,12 +881,19 @@
- write.c sslstdio.c \
- strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
- OSCFLAGS
-+
-+osdep.o: $(OSDEPS)
-+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
-+ @echo ========================================================================
- @echo Building OS-dependent module
- @echo If you get No such file error messages for files x509.h, ssl.h,
- @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
- @echo is not installed on your system. Either install OpenSSL first
- @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
-- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
-+ @echo ========================================================================
-+
-+osdep.so: $(OSDEPS)
-+ $(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
-
- osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
- $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
+*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007
+--- src/osdep/unix/Makefile Mon Jul 23 16:30:12 2007
+***************
+*** 28,36 ****
+
+ EXTRAAUTHENTICATORS=
+ EXTRADRIVERS=mbox
+! PASSWDTYPE=std
+! SSLTYPE=nopwd
+! IP=4
+
+
+ # The optimization level here for GCC ports is set here for a reason. It's
+--- 28,36 ----
+
+ EXTRAAUTHENTICATORS=
+ EXTRADRIVERS=mbox
+! PASSWDTYPE=pam
+! SSLTYPE=unix.nopwd
+! IP=6
+
+
+ # The optimization level here for GCC ports is set here for a reason. It's
+***************
+*** 54,66 ****
+
+ # Extended flags needed for SSL. You may need to modify.
+
+! SSLDIR=/usr/local/ssl
+! SSLCERTS=$(SSLDIR)/certs
+ SSLKEYS=$(SSLCERTS)
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+
+! SSLCRYPTO=-lcrypto
+
+ # Older versions of MIT Kerberos also have a libcrypto. If so, you may need
+ # to use this instead
+--- 54,66 ----
+
+ # Extended flags needed for SSL. You may need to modify.
+
+! #SSLDIR=/usr/local/ssl
+! SSLCERTS=$(PREFIX)/certs
+ SSLKEYS=$(SSLCERTS)
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
+
+! SSLCRYPTO=-lcrypto -lcrypt
+
+ # Older versions of MIT Kerberos also have a libcrypto. If so, you may need
+ # to use this instead
+***************
+*** 87,93 ****
+ # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+ DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+ DCELDFLAGS= -ldce
+! PAMLDFLAGS= -lpam -ldl
+
+
+ # Build parameters normally set by the individual port
+--- 87,93 ----
+ # AFSLDFLAGS may also need -L/usr/ucblib -lucb
+ DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
+ DCELDFLAGS= -ldce
+! PAMLDFLAGS= # -lpam -lcrypt
+
+
+ # Build parameters normally set by the individual port
+***************
+*** 125,131 ****
+ # Commands possibly overriden by the individual port
+
+ ARRC=ar rc
+! CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+
+--- 125,131 ----
+ # Commands possibly overriden by the individual port
+
+ ARRC=ar rc
+! #CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+
+***************
+*** 149,155 ****
+ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
+! CFLAGS=-g
+
+ CAT=cat
+ MAKE=make
+--- 149,155 ----
+ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
+ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
+ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
+! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+
+ CAT=cat
+ MAKE=make
+***************
+*** 166,171 ****
+--- 166,175 ----
+ PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
+
+
++ # Need this for the shared library rule to work correctly
++ .SUFFIXES: .o .so
++ SOFILES=${BINARIES:.o=.so}
++
+ # Here if no make argument established
+
+ missing: osdep.h
+***************
+*** 246,258 ****
+ BASECFLAGS="-g -Dconst="
+
+ bsf: # FreeBSD
+! $(BUILD) `$(CAT) SPECIALS` OS=$@ \
+ SIGTYPE=psx CRXTYPE=nfs \
+ SPOOLDIR=/var \
+ ACTIVEFILE=/usr/local/news/lib/active \
+ RSHPATH=/usr/bin/rsh \
+ BASECFLAGS="$(GCCCFLAGS)" \
+! BASELDFLAGS="-lcrypt"
+
+ bsi: # BSD/i386
+ $(BUILD) `$(CAT) SPECIALS` OS=$@ \
+--- 250,263 ----
+ BASECFLAGS="-g -Dconst="
+
+ bsf: # FreeBSD
+! $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
+ SIGTYPE=psx CRXTYPE=nfs \
+ SPOOLDIR=/var \
+ ACTIVEFILE=/usr/local/news/lib/active \
+ RSHPATH=/usr/bin/rsh \
++ LOCKPGM=$(PREFIX)/libexec/mlock \
+ BASECFLAGS="$(GCCCFLAGS)" \
+! BASELDFLAGS="-lpam"
+
+ bsi: # BSD/i386
+ $(BUILD) `$(CAT) SPECIALS` OS=$@ \
+***************
+*** 840,862 ****
+
+ # Build it!
+
+! build: clean once $(ARCHIVE)
+
+! all: $(ARCHIVE)
+
+ $(ARCHIVE): $(BINARIES)
+ sh -c '$(RM) $(ARCHIVE) || true'
+ @$(CAT) ARCHIVE
+ @$(SH) ARCHIVE
+
+ .c.o:
+! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
+
+
+ # Cleanup
+
+ clean:
+ sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+
+
+ # Dependencies
+--- 845,875 ----
+
+ # Build it!
+
+! build: clean once $(ARCHIVE) $(SHLIBNAME)
+
+! all: $(ARCHIVE) $(SHLIBNAME)
+
+ $(ARCHIVE): $(BINARIES)
+ sh -c '$(RM) $(ARCHIVE) || true'
+ @$(CAT) ARCHIVE
+ @$(SH) ARCHIVE
+
++ $(SHLIBNAME): $(SOFILES)
++ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
++ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
++
++ .c.so: osdep.h
++ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@
++
+ .c.o:
+! $(CC) -c `cat CFLAGS` $*.c
+
+
+ # 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) *.so $(SHLIBNAME)'
+
+
+ # Dependencies
+***************
+*** 891,897 ****
+
+ # OS-dependent
+
+! osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+ osdep.h env_unix.h tcp_unix.h \
+ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
+ auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
+--- 904,910 ----
+
+ # OS-dependent
+
+! OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
+ osdep.h env_unix.h tcp_unix.h \
+ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
+ auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
+***************
+*** 905,916 ****
+ write.c sslstdio.c \
+ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
+ OSCFLAGS
+ @echo Building OS-dependent module
+ @echo If you get No such file error messages for files x509.h, ssl.h,
+ @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
+ @echo is not installed on your system. Either install OpenSSL first
+ @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
+! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
+
+ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
+ $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
+--- 918,936 ----
+ write.c sslstdio.c \
+ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
+ OSCFLAGS
++
++ osdep.o: $(OSDEPS)
++ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
++ @echo ========================================================================
+ @echo Building OS-dependent module
+ @echo If you get No such file error messages for files x509.h, ssl.h,
+ @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
+ @echo is not installed on your system. Either install OpenSSL first
+ @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
+! @echo ========================================================================
+!
+! osdep.so: $(OSDEPS)
+! $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@
+
+ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
+ $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
More information about the Midnightbsd-cvs
mailing list