Attachment #79991 for bug #114833

View | Details | Raw Unified | Return to bug 114833
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-6 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= cclient	8	PORTNAME= cclient
9	PORTVERSION= 2004g	9	PORTVERSION= 2006j
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= mail devel ipv6	11	CATEGORIES= mail devel ipv6
12	MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \	12	MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
Lines 16-21 Link Here
16	MASTER_SITE_SUBDIR= . old	16	MASTER_SITE_SUBDIR= . old
17	DISTNAME= imap-${PORTVERSION}	17	DISTNAME= imap-${PORTVERSION}
18	EXTRACT_SUFX= .tar.Z	18	EXTRACT_SUFX= .tar.Z
		19	DISTVERSIONSUFFIX= 2
		20	DISTFILES= ${DISTNAME}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
19		21
20	MAINTAINER= anders@FreeBSD.org	22	MAINTAINER= anders@FreeBSD.org
21	COMMENT= Mark Crispin's C-client mail access routines	23	COMMENT= Mark Crispin's C-client mail access routines
Lines 43-49 Link Here
43	WRKSRC= ${WRKDIR}/${DISTNAME}	45	WRKSRC= ${WRKDIR}/${DISTNAME}
44		46
45	SHLIBBASE= c-client4	47	SHLIBBASE= c-client4
46	SHLIBMAJ= 8	48	SHLIBMAJ= 9
47	SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}	49	SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}
48	MAKE_ENV= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}	50	MAKE_ENV= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
49	PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}	51	PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
Lines 66-75 Link Here
66	post-configure:	68	post-configure:
67	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"	69	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
68		70
69	HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flstring.h \	71	HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h \
70	fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h mbx.h mh.h \	72	flocksim.h flstring.h fs.h ftl.h imap4r1.h linkage.h mail.h \
71	misc.h mx.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \	73	misc.h netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \
72	rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h	74	rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h \
		75	utf8aux.h
73	PORTREV_H= ${WRKDIR}/portrevision.h	76	PORTREV_H= ${WRKDIR}/portrevision.h
74		77
75	post-build:	78	post-build:

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020	1	MD5 (imap-2006j2.tar.Z) = d7900691c415bcc725c1bf2b15e4fb99
2	SHA256 (imap-2004g.tar.Z) = 958ab8a6a8b5a1a53167793141fe5bf1fbafc012be1d3f70a21f5f2f493ffa6d	2	SHA256 (imap-2006j2.tar.Z) = 5b2ed247fd98f81c7a2d23d0822f602d49b742c19761a9c2dad6753f5f3e806e
3	SIZE (imap-2004g.tar.Z) = 2246713	3	SIZE (imap-2006j2.tar.Z) = 2686745




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
include/c-client/imap4r1.h
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

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
lib/%%SHLIBNAME%%
lib/libc-client4.a




*** 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




*** 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'

Return to bug 114833

Lines 3-19 Link Here

(-)pkg-plist (-4 / +3 lines)
3	include/c-client/env.h	3	include/c-client/env.h
4	include/c-client/env_unix.h	4	include/c-client/env_unix.h
5	include/c-client/fdstring.h	5	include/c-client/fdstring.h
		6	include/c-client/flockcyg.h
		7	include/c-client/flocksim.h
6	include/c-client/flstring.h	8	include/c-client/flstring.h
7	include/c-client/fs.h	9	include/c-client/fs.h
8	include/c-client/ftl.h	10	include/c-client/ftl.h
9	include/c-client/imap4r1.h	11	include/c-client/imap4r1.h
10	include/c-client/linkage.c
11	include/c-client/linkage.h	12	include/c-client/linkage.h
12	include/c-client/mail.h	13	include/c-client/mail.h
13	include/c-client/mbx.h
14	include/c-client/mh.h
15	include/c-client/misc.h	14	include/c-client/misc.h
16	include/c-client/mx.h
17	include/c-client/netmsg.h	15	include/c-client/netmsg.h
18	include/c-client/newsrc.h	16	include/c-client/newsrc.h
19	include/c-client/nl.h	17	include/c-client/nl.h
Lines 27-32 Link Here
27	include/c-client/tcp_unix.h	25	include/c-client/tcp_unix.h
28	include/c-client/unix.h	26	include/c-client/unix.h
29	include/c-client/utf8.h	27	include/c-client/utf8.h
		28	include/c-client/utf8aux.h
30	include/c-client/portrevision.h	29	include/c-client/portrevision.h
31	lib/%%SHLIBNAME%%	30	lib/%%SHLIBNAME%%
32	lib/libc-client4.a	31	lib/libc-client4.a

Lines 1-151 Link Here

(-)files/patch-ab (-151 / +254 lines)
1	--- src/osdep/unix/Makefile.orig Sat Apr 30 22:51:13 2005	1	*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007
2	+++ src/osdep/unix/Makefile Sun Jul 1 22:29:26 2007	2	--- src/osdep/unix/Makefile Mon Jul 23 16:30:12 2007
3	@@ -22,8 +22,8 @@	3	***************
4		4	* 28,36 **
5	EXTRAAUTHENTICATORS=	5
6	EXTRADRIVERS=mbox	6	EXTRAAUTHENTICATORS=
7	-PASSWDTYPE=std	7	EXTRADRIVERS=mbox
8	-SSLTYPE=nopwd	8	! PASSWDTYPE=std
9	+PASSWDTYPE=pam	9	! SSLTYPE=nopwd
10	+SSLTYPE=unix.nopwd	10	! IP=4
11	IP=4	11
12		12
13		13	# The optimization level here for GCC ports is set here for a reason. It's
14	@@ -41,13 +41,13 @@	14	--- 28,36 ----
15		15
16	# Extended flags needed for SSL. You may need to modify.	16	EXTRAAUTHENTICATORS=
17		17	EXTRADRIVERS=mbox
18	-SSLDIR=/usr/local/ssl	18	! PASSWDTYPE=pam
19	-SSLCERTS=$(SSLDIR)/certs	19	! SSLTYPE=unix.nopwd
20	+#SSLDIR=/usr/local/ssl	20	! IP=6
21	+SSLCERTS=$(PREFIX)/certs	21
22	SSLKEYS=$(SSLCERTS)	22
23	SSLINCLUDE=$(SSLDIR)/include	23	# The optimization level here for GCC ports is set here for a reason. It's
24	SSLLIB=$(SSLDIR)/lib	24	***************
25		25	* 54,66 **
26	-SSLCRYPTO=-lcrypto	26
27	+SSLCRYPTO=-lcrypto -lcrypt	27	# Extended flags needed for SSL. You may need to modify.
28		28
29	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need	29	! SSLDIR=/usr/local/ssl
30	# to use this instead	30	! SSLCERTS=$(SSLDIR)/certs
31	@@ -74,7 +74,7 @@	31	SSLKEYS=$(SSLCERTS)
32	# AFSLDFLAGS may also need -L/usr/ucblib -lucb	32	SSLINCLUDE=$(SSLDIR)/include
33	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"	33	SSLLIB=$(SSLDIR)/lib
34	DCELDFLAGS= -ldce	34
35	-PAMLDFLAGS= -lpam -ldl	35	! SSLCRYPTO=-lcrypto
36	+PAMLDFLAGS= # -lpam -lcrypt	36
37		37	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
38		38	# to use this instead
39	# Build parameters normally set by the individual port	39	--- 54,66 ----
40	@@ -111,7 +111,7 @@	40
41	# Commands possibly overriden by the individual port	41	# Extended flags needed for SSL. You may need to modify.
42		42
43	ARRC=ar rc	43	! #SSLDIR=/usr/local/ssl
44	-CC=cc	44	! SSLCERTS=$(PREFIX)/certs
45	+#CC=cc	45	SSLKEYS=$(SSLCERTS)
46	LN=ln -s	46	SSLINCLUDE=$(SSLDIR)/include
47	RANLIB=ranlib	47	SSLLIB=$(SSLDIR)/lib
48		48
49	@@ -129,7 +129,7 @@	49	! SSLCRYPTO=-lcrypto -lcrypt
50	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \	50
51	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \	51	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
52	unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o	52	# to use this instead
53	-CFLAGS=-g	53	***************
54	+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)	54	* 87,93 **
55		55	# AFSLDFLAGS may also need -L/usr/ucblib -lucb
56	CAT=cat	56	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
57	MAKE=make	57	DCELDFLAGS= -ldce
58	@@ -146,6 +146,10 @@	58	! PAMLDFLAGS= -lpam -ldl
59	PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)	59
60		60
61		61	# Build parameters normally set by the individual port
62	+# Need this for the shared library rule to work correctly	62	--- 87,93 ----
63	+.SUFFIXES: .o .so	63	# AFSLDFLAGS may also need -L/usr/ucblib -lucb
64	+SOFILES=${BINARIES:.o=.so}	64	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
65	+	65	DCELDFLAGS= -ldce
66	# Here if no make argument established	66	! PAMLDFLAGS= # -lpam -lcrypt
67		67
68	missing: osdep.h	68
69	@@ -226,13 +230,14 @@	69	# Build parameters normally set by the individual port
70	BASECFLAGS="-g -Dconst="	70	***************
71		71	* 125,131 **
72	bsf: # FreeBSD	72	# Commands possibly overriden by the individual port
73	- $(BUILD) `$(CAT) SPECIALS` OS=$@ \	73
74	+ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \	74	ARRC=ar rc
75	SIGTYPE=psx CRXTYPE=nfs \	75	! CC=cc
76	SPOOLDIR=/var \	76	LN=ln -s
77	ACTIVEFILE=/usr/local/news/lib/active \	77	RANLIB=ranlib
78	RSHPATH=/usr/bin/rsh \	78
79	- BASECFLAGS="-g -O -pipe" \	79	--- 125,131 ----
80	- BASELDFLAGS="-lcrypt"	80	# Commands possibly overriden by the individual port
81	+ LOCKPGM=$(PREFIX)/libexec/mlock \	81
82	+ BASECFLAGS="-DNFSKLUDGE" \	82	ARRC=ar rc
83	+ BASELDFLAGS="-lpam"	83	! #CC=cc
84		84	LN=ln -s
85	bsi: # BSD/i386	85	RANLIB=ranlib
86	$(BUILD) `$(CAT) SPECIALS` OS=$@ \	86
87	@@ -801,23 +806,31 @@	87	***************
88		88	* 149,155 **
89	# Build it!	89	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
90		90	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
91	-build: clean once $(ARCHIVE)	91	unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
92	+build: clean once $(ARCHIVE) $(SHLIBNAME)	92	! CFLAGS=-g
93		93
94	-all: $(ARCHIVE)	94	CAT=cat
95	+all: $(ARCHIVE) $(SHLIBNAME)	95	MAKE=make
96		96	--- 149,155 ----
97	$(ARCHIVE): $(BINARIES)	97	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
98	sh -c '$(RM) $(ARCHIVE) \|\| true'	98	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
99	@$(CAT) ARCHIVE	99	unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
100	@$(SH) ARCHIVE	100	! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
101		101
102	+$(SHLIBNAME): $(SOFILES)	102	CAT=cat
103	+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`	103	MAKE=make
104	+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so	104	***************
105	+	105	* 166,171 **
106	+.c.so: osdep.h	106	--- 166,175 ----
107	+ $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@	107	PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
108	+	108
109	.c.o:	109
110	- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c	110	+ # Need this for the shared library rule to work correctly
111	+ $(CC) -c $(CFLAGS) $*.c	111	+ .SUFFIXES: .o .so
112		112	+ SOFILES=${BINARIES:.o=.so}
113		113	+
114	# Cleanup	114	# Here if no make argument established
115		115
116	clean:	116	missing: osdep.h
117	sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep.[ch] .o ARCHIVE FLAGS TYPE $(ARCHIVE) \|\| true'	117	***************
118	+ sh -c '$(RM) *.so $(SHLIBNAME)'	118	* 246,258 **
119		119	BASECFLAGS="-g -Dconst="
120		120
121	# Dependencies	121	bsf: # FreeBSD
122	@@ -850,7 +863,7 @@	122	! $(BUILD) `$(CAT) SPECIALS` OS=$@ \
123		123	SIGTYPE=psx CRXTYPE=nfs \
124	# OS-dependent	124	SPOOLDIR=/var \
125		125	ACTIVEFILE=/usr/local/news/lib/active \
126	-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \	126	RSHPATH=/usr/bin/rsh \
127	+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \	127	BASECFLAGS="$(GCCCFLAGS)" \
128	osdep.h env_unix.h tcp_unix.h \	128	! BASELDFLAGS="-lcrypt"
129	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\	129
130	auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c nfstest.c fsync.c \	130	bsi: # BSD/i386
131	@@ -864,12 +877,19 @@	131	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
132	write.c sslstdio.c \	132	--- 250,263 ----
133	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \	133	BASECFLAGS="-g -Dconst="
134	OSCFLAGS	134
135	+	135	bsf: # FreeBSD
136	+osdep.o: $(OSDEPS)	136	! $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
137	+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c	137	SIGTYPE=psx CRXTYPE=nfs \
138	+ @echo ========================================================================	138	SPOOLDIR=/var \
139	@echo Building OS-dependent module	139	ACTIVEFILE=/usr/local/news/lib/active \
140	@echo If you get No such file error messages for files x509.h, ssl.h,	140	RSHPATH=/usr/bin/rsh \
141	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL	141	+ LOCKPGM=$(PREFIX)/libexec/mlock \
142	@echo is not installed on your system. Either install OpenSSL first	142	BASECFLAGS="$(GCCCFLAGS)" \
143	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none	143	! BASELDFLAGS="-lpam"
144	- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c	144
145	+ @echo ========================================================================	145	bsi: # BSD/i386
146	+	146	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
147	+osdep.so: $(OSDEPS)	147	***************
148	+ $(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@	148	* 840,862 **
149		149
150	osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c	150	# Build it!
151	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c	151
		152	! build: clean once $(ARCHIVE)
		153
		154	! all: $(ARCHIVE)
		155
		156	$(ARCHIVE): $(BINARIES)
		157	sh -c '$(RM) $(ARCHIVE) \|\| true'
		158	@$(CAT) ARCHIVE
		159	@$(SH) ARCHIVE
		160
		161	.c.o:
		162	! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
		163
		164
		165	# Cleanup
		166
		167	clean:
		168	sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep.[ch] .o ARCHIVE FLAGS TYPE $(ARCHIVE) \|\| true'
		169
		170
		171	# Dependencies
		172	--- 845,875 ----
		173
		174	# Build it!
		175
		176	! build: clean once $(ARCHIVE) $(SHLIBNAME)
		177
		178	! all: $(ARCHIVE) $(SHLIBNAME)
		179
		180	$(ARCHIVE): $(BINARIES)
		181	sh -c '$(RM) $(ARCHIVE) \|\| true'
		182	@$(CAT) ARCHIVE
		183	@$(SH) ARCHIVE
		184
		185	+ $(SHLIBNAME): $(SOFILES)
		186	+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
		187	+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
		188	+
		189	+ .c.so: osdep.h
		190	+ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@
		191	+
		192	.c.o:
		193	! $(CC) -c `cat CFLAGS` $*.c
		194
		195
		196	# Cleanup
		197
		198	clean:
		199	sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep.[ch] .o ARCHIVE FLAGS TYPE $(ARCHIVE) \|\| true'
		200	+ sh -c '$(RM) *.so $(SHLIBNAME)'
		201
		202
		203	# Dependencies
		204	***************
		205	* 891,897 **
		206
		207	# OS-dependent
		208
		209	! osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
		210	osdep.h env_unix.h tcp_unix.h \
		211	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
		212	auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
		213	--- 904,910 ----
		214
		215	# OS-dependent
216
217	! OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
218	osdep.h env_unix.h tcp_unix.h \
219	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
220	auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c fsync.c \
221	***************
222	* 905,916 **
223	write.c sslstdio.c \
224	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
225	OSCFLAGS
226	@echo Building OS-dependent module
227	@echo If you get No such file error messages for files x509.h, ssl.h,
228	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
229	@echo is not installed on your system. Either install OpenSSL first
230	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
231	! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
232
233	osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
234	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
235	--- 918,936 ----
236	write.c sslstdio.c \
237	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
238	OSCFLAGS
239	+
240	+ osdep.o: $(OSDEPS)
241	+ $(CC) `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
242	+ @echo ========================================================================
243	@echo Building OS-dependent module
244	@echo If you get No such file error messages for files x509.h, ssl.h,
245	@echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
246	@echo is not installed on your system. Either install OpenSSL first
247	@echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
248	! @echo ========================================================================
249	!
250	! osdep.so: $(OSDEPS)
251	! $(CC) -fPIC -DPIC -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c -o $@
252
253	osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
254	$(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c

Lines 1-50 Link Here

(-)files/patch-ac (-50 / +78 lines)
1	--- Makefile.orig Tue Nov 5 01:19:13 2002	1	*** Makefile.orig Wed May 9 00:50:45 2007
2	+++ Makefile Wed Nov 27 00:59:07 2002	2	--- Makefile Mon Jul 23 16:02:26 2007
3	@@ -256,7 +256,7 @@	3	***************
4		4	* 294,300 **
5	# Make the IMAP Toolkit	5
6		6	# Make the IMAP Toolkit
7	-all: SPECIALS c-client rebuild bundled	7
8	+all: SPECIALS c-client rebuild	8	! all: c-client SPECIALS rebuild bundled
9		9
10	c-client:	10	c-client:
11	@echo Not processed yet. In a first-time build, you must specify	11	@echo Not processed yet. In a first-time build, you must specify
12	@@ -396,9 +396,6 @@	12	--- 294,300 ----
13	@echo + In order to rectify this problem, you MUST build with:	13
14	@echo ++ SSLTYPE=$(SSLTYPE).nopwd	14	# Make the IMAP Toolkit
15	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++	15
16	- @echo	16	! all: c-client SPECIALS rebuild
17	- @echo Do you want to continue this build anyway? Type y or n please:	17
18	- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'	18	c-client:
19		19	@echo Not processed yet. In a first-time build, you must specify
20	sslnone:	20	***************
21	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++	21	* 559,567 **
22	@@ -411,9 +408,6 @@	22	@echo + In order to rectify this problem, you MUST build with:
23	@echo ++ SSLTYPE=nopwd	23	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
24	@echo + You must also have OpenSSL or equivalent installed.	24	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
25	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++	25	- @echo
26	- @echo	26	- @echo Do you want to continue this build anyway? Type y or n please:
27	- @echo Do you want to continue this build anyway? Type y or n please:	27	- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac'
28	- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac'	28
29		29	nounenc:
30		30	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
31	# C compiler types	31	--- 559,564 ----
32	@@ -434,7 +428,7 @@	32	***************
33	$(TOOLS)/$@ "$(LN)" src/tmail tmail	33	* 582,590 **
34	$(LN) $(TOOLS)/$@ .	34	@echo ++ SSLTYPE=nopwd
35		35	@echo + You must also have OpenSSL or equivalent installed.
36	-build: OSTYPE rebuild rebuildclean bundled	36	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
37	+build: OSTYPE rebuild rebuildclean	37	- @echo
38		38	- @echo Do you want to continue this build anyway? Type y or n please:
39	OSTYPE:	39	- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nonossl;exit 1);; esac'
40	@echo Building c-client for $(BUILDTYPE)...	40
41	@@ -453,8 +447,7 @@	41	nonossl:
42	@$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) \|\| (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'	42	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
43	@echo Rebuilding c-client for `$(CAT) OSTYPE`...	43	--- 579,584 ----
44	@$(TOUCH) SPECIALS	44	***************
45	- $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \	45	* 659,665 **
46	- CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`	46	$(TOOLS)/$@ "$(LN)" src/tmail tmail
47	+ $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`	47	$(LN) $(TOOLS)/$@ .
48		48
49	rebuildclean:	49	! build: OSTYPE rebuild rebuildclean bundled
50	$(SH) -c '$(RM) rebuild \|\| true'	50
		51	OSTYPE:
		52	@$(MAKE) ip$(IP)
		53	--- 653,659 ----
		54	$(TOOLS)/$@ "$(LN)" src/tmail tmail
		55	$(LN) $(TOOLS)/$@ .
		56
		57	! build: OSTYPE rebuild rebuildclean
		58
		59	OSTYPE:
		60	@$(MAKE) ip$(IP)
		61	***************
		62	* 679,686 **
		63	@$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) \|\| (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
		64	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
		65	@$(TOUCH) SPECIALS
		66	! $(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
		67	! CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
		68
		69	rebuildclean:
		70	$(SH) -c '$(RM) rebuild \|\| true'
		71	--- 673,679 ----
		72	@$(SH) -c '(test $(BUILDTYPE) = rebuild -o $(BUILDTYPE) = `$(CAT) OSTYPE`) \|\| (echo Already built for `$(CAT) OSTYPE` -- you must do \"make clean\" first && exit 1)'
		73	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
		74	@$(TOUCH) SPECIALS
		75	! $(CD) c-client;$(MAKE) all CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
		76
		77	rebuildclean:
		78	$(SH) -c '$(RM) rebuild \|\| true'