ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/mports/trunk/mail/cclient/files/patch-ab
(Generate patch)

Comparing trunk/mail/cclient/files/patch-ab (file contents):
Revision 739 by wintellect, Sat Jan 20 16:09:40 2007 UTC vs.
Revision 3324 by laffer1, Mon Oct 29 18:53:10 2007 UTC

# Line 1 | Line 1
1 < --- src/osdep/unix/Makefile.orig        Thu Apr 21 00:48:34 2005
2 < +++ src/osdep/unix/Makefile     Mon May 30 19:08:25 2005
3 < @@ -22,8 +22,8 @@
4 <
5 < EXTRAAUTHENTICATORS=
6 < EXTRADRIVERS=mbox
7 < -PASSWDTYPE=std
8 < -SSLTYPE=nopwd
9 < +PASSWDTYPE=pam
10 < +SSLTYPE=unix.nopwd
11 < IP=4
12 <
13 <
14 < @@ -41,13 +41,13 @@
15 <
16 < # Extended flags needed for SSL.  You may need to modify.
17 <
18 < -SSLDIR=/usr/local/ssl
19 < -SSLCERTS=$(SSLDIR)/certs
20 < +SSLDIR=$(OPENSSLBASE)
21 < +SSLCERTS=$(PREFIX)/certs
22 < SSLKEYS=$(SSLCERTS)
23 < -SSLINCLUDE=$(SSLDIR)/include
24 < -SSLLIB=$(SSLDIR)/lib
25 < +SSLINCLUDE=$(OPENSSLINC)
26 < +SSLLIB=$(OPENSSLLIB)
27 <
28 < -SSLCRYPTO=-lcrypto
29 < +SSLCRYPTO=-lcrypto -lcrypt
30 <
31 < # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
32 < # to use this instead
33 < @@ -74,7 +74,7 @@
34 < # AFSLDFLAGS may also need -L/usr/ucblib -lucb
35 < DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
36 < DCELDFLAGS= -ldce
37 < -PAMLDFLAGS= -lpam -ldl
38 < +PAMLDFLAGS= # -lpam -lcrypt
39 <
40 <
41 < # Build parameters normally set by the individual port
42 < @@ -111,7 +111,7 @@
43 < # Commands possibly overriden by the individual port
44 <
45 < ARRC=ar rc
46 < -CC=cc
47 < +#CC=cc
48 < LN=ln -s
49 < RANLIB=ranlib
50 <
51 < @@ -129,7 +129,7 @@
52 <  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
53 <  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
54 <  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
55 < -CFLAGS=-g
56 < +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
57 <
58 < CAT=cat
59 < MAKE=make
60 < @@ -146,6 +146,10 @@
61 <  PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
62 <
63 <
64 < +# Need this for the shared library rule to work correctly
65 < +.SUFFIXES: .o .so
66 < +SOFILES=${BINARIES:.o=.so}
67 < +
68 < # Here if no make argument established
69 <
70 < missing: osdep.h
71 < @@ -226,13 +230,14 @@
72 <         BASECFLAGS="-g -Dconst="
73 <
74 < bsf:   # FreeBSD
75 < -       $(BUILD) `$(CAT) SPECIALS` OS=$@ \
76 < +       $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
77 <         SIGTYPE=psx CRXTYPE=nfs \
78 <         SPOOLDIR=/var \
79 <         ACTIVEFILE=/usr/local/news/lib/active \
80 <         RSHPATH=/usr/bin/rsh \
81 < -        BASECFLAGS="-g -O -pipe" \
82 < -        BASELDFLAGS="-lcrypt"
83 < +        LOCKPGM=$(PREFIX)/libexec/mlock \
84 < +        BASECFLAGS="-DNFSKLUDGE" \
85 < +        BASELDFLAGS="-lpam"
86 <
87 < bsi:   # BSD/i386
88 <        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
89 < @@ -801,23 +806,35 @@
90 <
91 < # Build it!
92 <
93 < -build: clean once $(ARCHIVE)
94 < +build: clean once $(ARCHIVE) $(SHLIBNAME)
95 <
96 < -all:   $(ARCHIVE)
97 < +all:   $(ARCHIVE) $(SHLIBNAME)
98 <
99 < $(ARCHIVE): $(BINARIES)
100 <        sh -c '$(RM) $(ARCHIVE) || true'
101 <        @$(CAT) ARCHIVE
102 <        @$(SH) ARCHIVE
103 <
104 < +$(SHLIBNAME): $(SOFILES)
105 < +.if $(PORTOBJFORMAT) == "elf"
106 < +       ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
107 < +.else
108 < +       ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
109 < +.endif
110 < +       ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
111 < +
112 < +.c.so: osdep.h
113 < +       $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
114 < +
115 < .c.o:
116 < -       `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
117 < +       $(CC) -c $(CFLAGS) $*.c
118 <
119 <
120 < # Cleanup
121 <
122 < clean:
123 <        sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
124 < +       sh -c '$(RM) *.so $(SHLIBNAME)'
125 <
126 <
127 < # Dependencies
128 < @@ -850,7 +867,7 @@
129 <
130 < # OS-dependent
131 <
132 < -osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
133 < +OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
134 <        osdep.h env_unix.h tcp_unix.h \
135 <        osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
136 <        auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c nfstest.c fsync.c \
137 < @@ -864,12 +881,19 @@
138 <        write.c sslstdio.c \
139 <        strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
140 <        OSCFLAGS
141 < +
142 < +osdep.o: $(OSDEPS)
143 < +       $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
144 < +       @echo ========================================================================
145 <        @echo Building OS-dependent module
146 <        @echo If you get No such file error messages for files x509.h, ssl.h,
147 <        @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
148 <        @echo is not installed on your system.  Either install OpenSSL first
149 <        @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
150 < -       `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
151 < +       @echo ========================================================================
152 < +
153 < +osdep.so: $(OSDEPS)
154 < +       $(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
155 <
156 < osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
157 <        $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
1 > *** src/osdep/unix/Makefile.orig        Sun Jun 17 17:37:44 2007
2 > --- src/osdep/unix/Makefile     Mon Jul 23 16:30:12 2007
3 > ***************
4 > *** 28,36 ****
5 >  
6 >  EXTRAAUTHENTICATORS=
7 >  EXTRADRIVERS=mbox
8 > ! PASSWDTYPE=std
9 > ! SSLTYPE=nopwd
10 > ! IP=4
11 >  
12 >  
13 >  # The optimization level here for GCC ports is set here for a reason.  It's
14 > --- 28,36 ----
15 >  
16 >  EXTRAAUTHENTICATORS=
17 >  EXTRADRIVERS=mbox
18 > ! PASSWDTYPE=pam
19 > ! SSLTYPE=unix.nopwd
20 > ! IP=6
21 >  
22 >  
23 >  # The optimization level here for GCC ports is set here for a reason.  It's
24 > ***************
25 > *** 54,66 ****
26 >  
27 >  # Extended flags needed for SSL.  You may need to modify.
28 >  
29 > ! SSLDIR=/usr/local/ssl
30 > ! SSLCERTS=$(SSLDIR)/certs
31 >  SSLKEYS=$(SSLCERTS)
32 >  SSLINCLUDE=$(SSLDIR)/include
33 >  SSLLIB=$(SSLDIR)/lib
34 >  
35 > ! SSLCRYPTO=-lcrypto
36 >  
37 >  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
38 >  # to use this instead
39 > --- 54,66 ----
40 >  
41 >  # Extended flags needed for SSL.  You may need to modify.
42 >  
43 > ! #SSLDIR=/usr/local/ssl
44 > ! SSLCERTS=$(PREFIX)/certs
45 >  SSLKEYS=$(SSLCERTS)
46 >  SSLINCLUDE=$(SSLDIR)/include
47 >  SSLLIB=$(SSLDIR)/lib
48 >  
49 > ! SSLCRYPTO=-lcrypto -lcrypt
50 >  
51 >  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
52 >  # to use this instead
53 > ***************
54 > *** 87,93 ****
55 >  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
56 >  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
57 >  DCELDFLAGS= -ldce
58 > ! PAMLDFLAGS= -lpam -ldl
59 >  
60 >  
61 >  # Build parameters normally set by the individual port
62 > --- 87,93 ----
63 >  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
64 >  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
65 >  DCELDFLAGS= -ldce
66 > ! PAMLDFLAGS= # -lpam -lcrypt
67 >  
68 >  
69 >  # Build parameters normally set by the individual port
70 > ***************
71 > *** 125,131 ****
72 >  # Commands possibly overriden by the individual port
73 >  
74 >  ARRC=ar rc
75 > ! CC=cc
76 >  LN=ln -s
77 >  RANLIB=ranlib
78 >  
79 > --- 125,131 ----
80 >  # Commands possibly overriden by the individual port
81 >  
82 >  ARRC=ar rc
83 > ! #CC=cc
84 >  LN=ln -s
85 >  RANLIB=ranlib
86 >  
87 > ***************
88 > *** 149,155 ****
89 >   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
90 >   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
91 >   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
92 > ! CFLAGS=-g
93 >  
94 >  CAT=cat
95 >  MAKE=make
96 > --- 149,155 ----
97 >   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
98 >   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
99 >   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
100 > ! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
101 >  
102 >  CAT=cat
103 >  MAKE=make
104 > ***************
105 > *** 166,171 ****
106 > --- 166,175 ----
107 >   PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP)
108 >  
109 >  
110 > + # Need this for the shared library rule to work correctly
111 > + .SUFFIXES: .o .so
112 > + SOFILES=${BINARIES:.o=.so}
113 > +
114 >  # Here if no make argument established
115 >  
116 >  missing: osdep.h
117 > ***************
118 > *** 246,258 ****
119 >         BASECFLAGS="-g -Dconst="
120 >  
121 >  bsf:  # FreeBSD
122 > !       $(BUILD) `$(CAT) SPECIALS` OS=$@ \
123 >         SIGTYPE=psx CRXTYPE=nfs \
124 >         SPOOLDIR=/var \
125 >         ACTIVEFILE=/usr/local/news/lib/active \
126 >         RSHPATH=/usr/bin/rsh \
127 >         BASECFLAGS="$(GCCCFLAGS)" \
128 > !        BASELDFLAGS="-lcrypt"
129 >  
130 >  bsi:  # BSD/i386
131 >        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
132 > --- 250,263 ----
133 >         BASECFLAGS="-g -Dconst="
134 >  
135 >  bsf:  # FreeBSD
136 > !       $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
137 >         SIGTYPE=psx CRXTYPE=nfs \
138 >         SPOOLDIR=/var \
139 >         ACTIVEFILE=/usr/local/news/lib/active \
140 >         RSHPATH=/usr/bin/rsh \
141 > +        LOCKPGM=$(PREFIX)/libexec/mlock \
142 >         BASECFLAGS="$(GCCCFLAGS)" \
143 > !        BASELDFLAGS="-lpam"
144 >  
145 >  bsi:  # BSD/i386
146 >        $(BUILD) `$(CAT) SPECIALS` OS=$@ \
147 > ***************
148 > *** 840,862 ****
149 >  
150 >  # Build it!
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

Comparing trunk/mail/cclient/files/patch-ab (property cvs2svn:cvs-rev):
Revision 739 by wintellect, Sat Jan 20 16:09:40 2007 UTC vs.
Revision 3324 by laffer1, Mon Oct 29 18:53:10 2007 UTC

# Line 1 | Line 1
1 < 1.1
1 > 1.2

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines