Attachment #42686 for bug #66517

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




#

PORTNAME=	cclient
PORTVERSION=	2004
PORTEPOCH=	1
CATEGORIES=	mail devel
MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \

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 flockcyg.h flocksim.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

PORTREV_H=	${WRKDIR}/portrevision.h

post-build:

Lines 1-2 Link Here

(-)cclient/distinfo (-2 / +2 lines)
1	MD5 (imap-2002d.tar.Z) = 64e82a195d21481fc4c54c4ed9fe0527	1	MD5 (imap-2004.tar.Z) = ec3dafeeae320457a1d098157e9bf969
2	SIZE (imap-2002d.tar.Z) = 2155224	2	SIZE (imap-2004.tar.Z) = 2220333




--- src/osdep/unix/Makefile.orig	Fri Apr 30 04:08:48 2004
+++ src/osdep/unix/Makefile	Tue May 11 08:34:26 2004
@@ -22,20 +22,20 @@
 
 EXTRAAUTHENTICATORS=
 EXTRADRIVERS=mbox
-PASSWDTYPE=std
-SSLTYPE=nopwd
-IP=4
+PASSWDTYPE=pam
+SSLTYPE=unix.nopwd
+IP=6
 
 
 # Extended flags needed for SSL.  You may need to modify.
 
-SSLDIR=/usr/local/ssl
-SSLCERTS=$(SSLDIR)/certs
-SSLINCLUDE=$(SSLDIR)/include
-SSLLIB=$(SSLDIR)/lib
+SSLDIR=$(OPENSSLBASE)
+SSLCERTS=$(PREFIX)/certs
 SSLKEYS=$(SSLCERTS)
-SSLINCLUDE=$(SSLDIR)/include
-SSLLIB=$(SSLDIR)/lib
+SSLINCLUDE=$(OPENSSLINC)
+SSLLIB=$(OPENSSLLIB)
 

 
 # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
 # to use this instead
@@ -62,7 +62,7 @@
 # AFSLDFLAGS may also need -L/usr/ucblib -lucb
 DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
 DCELDFLAGS= -ldce

 
 
 # Build parameters normally set by the individual port
@@ -99,7 +99,7 @@
 # Commands possibly overriden by the individual port
 
 ARRC=ar rc

 LN=ln -s
 RANLIB=ranlib
 
@@ -117,7 +117,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+=-g $(BASECFLAGS) $(EXTRACFLAGS)
 
 CAT=cat
 MAKE=make
@@ -134,6 +134,10 @@
  PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)
 
 

 # Here if no make argument established
 
 missing: osdep.h
@@ -214,13 +218,14 @@
 	 BASECFLAGS="-g -Dconst="
 
 bsf:	# FreeBSD

 
 bsi:	# BSD/i386
 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -786,23 +791,35 @@
 
 # Build it!
 

 
 
 # Dependencies
@@ -835,7 +852,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 flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
@@ -848,12 +865,19 @@
 	write.c sslstdio.c \
 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
 	OSCFLAGS




include/c-client/c-client.h 
include/c-client/dummy.h 
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/mmdf.h
include/c-client/mtx.h
include/c-client/mx.h
include/c-client/netmsg.h
include/c-client/newsrc.h 
include/c-client/nl.h 
include/c-client/nntp.h 
include/c-client/osdep.h 
include/c-client/pseudo.h 
include/c-client/phile.h
include/c-client/pop3.h
include/c-client/pseudo.h
include/c-client/rfc822.h
include/c-client/smtp.h 
include/c-client/sslio.h 
include/c-client/tcp.h 
include/c-client/tcp_unix.h 
include/c-client/unix.h 
include/c-client/unix.h
include/c-client/utf8.h
include/c-client/portrevision.h
lib/%%SHLIBNAME%%

Return to bug 66517

Lines 6-12 Link Here

(-)cclient/Makefile (-5 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= cclient	8	PORTNAME= cclient
9	PORTVERSION= 2002d	9	PORTVERSION= 2004
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= mail devel	11	CATEGORIES= mail devel
12	MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \	12	MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
Lines 56-66 Link Here
56	post-configure:	56	post-configure:
57	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"	57	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
58		58
59	HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flocksim.h \	59	HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h flocksim.h \
60	flstring.h fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h \	60	flstring.h fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h \
61	mbox.h mbx.h mh.h misc.h mmdf.h mtx.h mx.h netmsg.h news.h \	61	mbx.h mh.h misc.h mx.h netmsg.h \
62	newsrc.h nl.h nntp.h osdep.h phile.h pop3.h pseudo.h rfc822.h \	62	newsrc.h nl.h nntp.h osdep.h pseudo.h rfc822.h \
63	smtp.h sslio.h tcp.h tcp_unix.h tenex.h unix.h utf8.h	63	smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h
		64
64	PORTREV_H= ${WRKDIR}/portrevision.h	65	PORTREV_H= ${WRKDIR}/portrevision.h
65		66
66	post-build:	67	post-build:

Lines 1-23 Link Here

(-)cclient/files/patch-ab (-16 / +19 lines)
1	--- src/osdep/unix/Makefile.orig Tue Oct 15 00:45:24 2002	1	--- src/osdep/unix/Makefile.orig Fri Apr 30 04:08:48 2004
2	+++ src/osdep/unix/Makefile Sun Dec 1 15:40:42 2002	2	+++ src/osdep/unix/Makefile Tue May 11 08:34:26 2004
3	@@ -22,18 +22,18 @@	3	@@ -22,20 +22,20 @@
4		4
5	EXTRAAUTHENTICATORS=	5	EXTRAAUTHENTICATORS=
6	EXTRADRIVERS=mbox	6	EXTRADRIVERS=mbox
7	-PASSWDTYPE=std	7	-PASSWDTYPE=std
8	-SSLTYPE=nopwd	8	-SSLTYPE=nopwd
		9	-IP=4
9	+PASSWDTYPE=pam	10	+PASSWDTYPE=pam
10	+SSLTYPE=unix.nopwd	11	+SSLTYPE=unix.nopwd
		12	+IP=6
11		13
12		14
13	# Extended flags needed for SSL. You may need to modify.	15	# Extended flags needed for SSL. You may need to modify.
14		16
15	-SSLDIR=/usr/local/ssl	17	-SSLDIR=/usr/local/ssl
16	-SSLCERTS=$(SSLDIR)/certs	18	-SSLCERTS=$(SSLDIR)/certs
17	-SSLINCLUDE=$(SSLDIR)/include
18	-SSLLIB=$(SSLDIR)/lib
19	+SSLDIR=$(OPENSSLBASE)	19	+SSLDIR=$(OPENSSLBASE)
20	+SSLCERTS=$(PREFIX)/certs	20	+SSLCERTS=$(PREFIX)/certs
		21	SSLKEYS=$(SSLCERTS)
		22	-SSLINCLUDE=$(SSLDIR)/include
		23	-SSLLIB=$(SSLDIR)/lib
21	+SSLINCLUDE=$(OPENSSLINC)	24	+SSLINCLUDE=$(OPENSSLINC)
22	+SSLLIB=$(OPENSSLLIB)	25	+SSLLIB=$(OPENSSLLIB)
23		26
Lines 26-32 Link Here
26		29
27	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need	30	# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
28	# to use this instead	31	# to use this instead
29	@@ -60,7 +60,7 @@	32	@@ -62,7 +62,7 @@
30	# AFSLDFLAGS may also need -L/usr/ucblib -lucb	33	# AFSLDFLAGS may also need -L/usr/ucblib -lucb
31	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"	34	DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
32	DCELDFLAGS= -ldce	35	DCELDFLAGS= -ldce
Lines 35-41 Link Here
35		38
36		39
37	# Build parameters normally set by the individual port	40	# Build parameters normally set by the individual port
38	@@ -97,7 +97,7 @@	41	@@ -99,7 +99,7 @@
39	# Commands possibly overriden by the individual port	42	# Commands possibly overriden by the individual port
40		43
41	ARRC=ar rc	44	ARRC=ar rc
Lines 44-59 Link Here
44	LN=ln -s	47	LN=ln -s
45	RANLIB=ranlib	48	RANLIB=ranlib
46		49
47	@@ -115,7 +115,7 @@	50	@@ -117,7 +117,7 @@
48	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \	51	dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
49	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \	52	rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
50	unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o	53	unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
51	-CFLAGS=-g	54	-CFLAGS=-g
52	+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)	55	+CFLAGS+=-g $(BASECFLAGS) $(EXTRACFLAGS)
53		56
54	CAT=cat	57	CAT=cat
55	MAKE=make	58	MAKE=make
56	@@ -132,6 +132,10 @@	59	@@ -134,6 +134,10 @@
57	PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)	60	PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)
58		61
59		62
Lines 64-70 Link Here
64	# Here if no make argument established	67	# Here if no make argument established
65		68
66	missing: osdep.h	69	missing: osdep.h
67	@@ -212,13 +216,14 @@	70	@@ -214,13 +218,14 @@
68	BASECFLAGS="-g -Dconst="	71	BASECFLAGS="-g -Dconst="
69		72
70	bsf: # FreeBSD	73	bsf: # FreeBSD
Lines 82-88 Link Here
82		85
83	bsi: # BSD/i386	86	bsi: # BSD/i386
84	$(BUILD) `$(CAT) SPECIALS` OS=$@ \	87	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
85	@@ -762,23 +767,35 @@	88	@@ -786,23 +791,35 @@
86		89
87	# Build it!	90	# Build it!
88		91
Lines 121-136 Link Here
121		124
122		125
123	# Dependencies	126	# Dependencies
124	@@ -812,7 +829,7 @@	127	@@ -835,7 +852,7 @@
125		128
126	# OS-dependent	129	# OS-dependent
127		130
128	-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \	131	-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
129	+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \	132	+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
130	osdep.h env_unix.h tcp_unix.h \	133	osdep.h env_unix.h tcp_unix.h \
131	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \	134	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
132	auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \	135	auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
133	@@ -824,12 +841,19 @@	136	@@ -848,12 +865,19 @@
134	write.c sslstdio.c \	137	write.c sslstdio.c \
135	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \	138	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
136	OSCFLAGS	139	OSCFLAGS

Lines 1-39 Link Here

(-)cclient/pkg-plist (-32 / +26 lines)
1	include/c-client/c-client.h	1	include/c-client/c-client.h
2	include/c-client/dummy.h	2	include/c-client/dummy.h
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
6	include/c-client/flocksim.h	7	include/c-client/flocksim.h
7	include/c-client/flstring.h	8	include/c-client/flstring.h
8	include/c-client/fs.h	9	include/c-client/fs.h
9	include/c-client/ftl.h	10	include/c-client/ftl.h
10	include/c-client/imap4r1.h	11	include/c-client/imap4r1.h
11	include/c-client/linkage.c	12	include/c-client/linkage.c
12	include/c-client/linkage.h	13	include/c-client/linkage.h
13	include/c-client/mail.h	14	include/c-client/mail.h
14	include/c-client/mbox.h	15	include/c-client/mbx.h
15	include/c-client/mbx.h	16	include/c-client/mh.h
16	include/c-client/mh.h	17	include/c-client/misc.h
17	include/c-client/misc.h	18	include/c-client/mx.h
18	include/c-client/mmdf.h
19	include/c-client/mtx.h
20	include/c-client/mx.h
21	include/c-client/netmsg.h	19	include/c-client/netmsg.h
22	include/c-client/news.h	20	include/c-client/newsrc.h
23	include/c-client/newsrc.h	21	include/c-client/nl.h
24	include/c-client/nl.h	22	include/c-client/nntp.h
25	include/c-client/nntp.h	23	include/c-client/osdep.h
26	include/c-client/osdep.h	24	include/c-client/pseudo.h
27	include/c-client/phile.h
28	include/c-client/pop3.h
29	include/c-client/pseudo.h
30	include/c-client/rfc822.h	25	include/c-client/rfc822.h
31	include/c-client/smtp.h	26	include/c-client/smtp.h
32	include/c-client/sslio.h	27	include/c-client/sslio.h
33	include/c-client/tcp.h	28	include/c-client/tcp.h
34	include/c-client/tcp_unix.h	29	include/c-client/tcp_unix.h
35	include/c-client/tenex.h	30	include/c-client/unix.h
36	include/c-client/unix.h
37	include/c-client/utf8.h	31	include/c-client/utf8.h
38	include/c-client/portrevision.h	32	include/c-client/portrevision.h
39	lib/%%SHLIBNAME%%	33	lib/%%SHLIBNAME%%