diff options
author | ache <ache@FreeBSD.org> | 1997-01-13 01:35:07 +0800 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 1997-01-13 01:35:07 +0800 |
commit | 1765cfa388cdf9c9ac86251b9c0a67542012ff7d (patch) | |
tree | df409fac942f1c06c9898f4a61b62e86ff1e6dd2 /mail | |
parent | f6ee4056f1f85dd8aad6429ac167217cb8859299 (diff) | |
download | freebsd-ports-gnome-1765cfa388cdf9c9ac86251b9c0a67542012ff7d.tar.gz freebsd-ports-gnome-1765cfa388cdf9c9ac86251b9c0a67542012ff7d.tar.zst freebsd-ports-gnome-1765cfa388cdf9c9ac86251b9c0a67542012ff7d.zip |
Don't build/install shared c-client library, because it is obsoleted
with imapd port and used only for pine
Don't build/install mtest, already done in imapd port now
Add missing -lcrypt for pine build
Diffstat (limited to 'mail')
-rw-r--r-- | mail/pine4/files/patch-af | 106 | ||||
-rw-r--r-- | mail/pine4/files/patch-ai | 41 | ||||
-rw-r--r-- | mail/pine4/files/patch-aj | 41 | ||||
-rw-r--r-- | mail/pine4/files/patch-al | 54 | ||||
-rw-r--r-- | mail/pine4/files/patch-an | 15 | ||||
-rw-r--r-- | mail/pine4/pkg-plist | 2 |
6 files changed, 47 insertions, 212 deletions
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af index 06aea0334a92..7fbd6dc999e0 100644 --- a/mail/pine4/files/patch-af +++ b/mail/pine4/files/patch-af @@ -1,121 +1,37 @@ *** imap/ANSI/c-client/Makefile.orig Sat Jun 22 01:25:45 1996 ---- imap/ANSI/c-client/Makefile Tue Dec 3 16:30:45 1996 +--- imap/ANSI/c-client/Makefile Sun Jan 12 19:41:38 1997 *************** -*** 32,43 **** - - - ARCHIVE=c-client.a - ARRC=ar rc +*** 36,43 **** BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \ news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \ osdep.o sm_unix.o newsrc.o - CC=cc +! CC=cc ! CFLAGS=$(EXTRACFLAGS) DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy LN=ln -s MAKE=make ---- 32,45 ---- - - - ARCHIVE=c-client.a -+ SHLIB=libc-client.so.1.3 - ARRC=ar rc +--- 36,43 ---- BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \ news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \ osdep.o sm_unix.o newsrc.o -+ SOFILES= ${BINARIES:.o=.so} - CC=cc +! #CC=cc ! #CFLAGS=$(EXTRACFLAGS) DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy LN=ln -s MAKE=make *************** -*** 48,53 **** ---- 50,58 ---- - RSHPATH=/usr/ucb/rsh - SHELL=/bin/sh - -+ # Need this for the shared library rule to work correctly -+ .SUFFIXES: .o .so -+ - missing: - @echo "You must specify what type of system" - @false -*************** -*** 119,124 **** ---- 124,136 ---- +*** 118,123 **** +--- 118,130 ---- + STDPROTO=bezerkproto MAILSPOOL=/var/mail \ ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \ RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" - ++ + bsf: # FreeBSD -+ $(MAKE) mtest OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \ ++ $(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \ + STDPROTO=bezerkproto MAILSPOOL=/var/mail \ + ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \ + RSHPATH=/usr/bin/rsh CFLAGS="${CFLAGS} -DNFSKLUDGE $(EXTRACFLAGS)" \ + LDFLAGS="-lcrypt" -+ + cvx: # Convex $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ - STDPROTO=bezerkproto MAILSPOOL=/usr/spool/mail \ -*************** -*** 394,402 **** - # From here on down is OS-independent - - clean: -! $(RM) *.o linkage.[ch] mtest $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS - -! mtest: $(ARCHIVE) mtest.o - $(CC) $(CFLAGS) -o mtest mtest.o $(ARCHIVE) $(LDFLAGS) - - $(ARCHIVE): $(BINARIES) ---- 406,414 ---- - # From here on down is OS-independent - - clean: -! $(RM) *.o *.so linkage.[ch] mtest $(SHLIB) $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS - -! mtest: $(ARCHIVE) $(SHLIB) mtest.o - $(CC) $(CFLAGS) -o mtest mtest.o $(ARCHIVE) $(LDFLAGS) - - $(ARCHIVE): $(BINARIES) -*************** -*** 404,409 **** ---- 416,428 ---- - $(ARRC) $(ARCHIVE) $(BINARIES) - $(RANLIB) $(ARCHIVE) - -+ $(SHLIB): $(SOFILES) -+ ld -Bshareable -o $(SHLIB) $(SOFILES) -+ strip $(SHLIB) -+ -+ .c.so: osdep.h -+ $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@ -+ - # Dependencies - - bezerk.o: mail.h bezerk.h rfc822.h misc.h osdep.h -*************** -*** 444,449 **** ---- 463,484 ---- - -DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \ - $(EXTRAOSDEFS) -c os_$(OS).c - $(MV) os_$(OS).o osdep.o -+ -+ osdep.so: mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ -+ osdep.h env_unix.h tcp_unix.h \ -+ os_$(OS).c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ -+ log_std.c log_sv4.c log_ssn.c log_ult.c \ -+ gr_wait.c gr_wait4.c gr_waitp.c \ -+ flock.c ingroups.c opendir.c scandir.c \ -+ memmove.c memmove2.c memset.c \ -+ write.c writev.c writevs.c \ -+ tz_bsd.c tz_nul.c tz_sv4.c \ -+ strerror.c strpbrk.c strstr.c strtok.c strtol.c strtoul.c -+ $(CC) -fpic -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \ -+ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ -+ -DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \ -+ $(EXTRAOSDEFS) -c os_$(OS).c -o os_$(OS).so -+ $(MV) os_$(OS).so osdep.so - - osdep.h: os_$(OS).h linkage - $(RM) CCTYPE CFLAGS LDFLAGS osdep.h diff --git a/mail/pine4/files/patch-ai b/mail/pine4/files/patch-ai deleted file mode 100644 index d5647c91cb6f..000000000000 --- a/mail/pine4/files/patch-ai +++ /dev/null @@ -1,41 +0,0 @@ -*** imap/ANSI/ipopd/Makefile.orig Thu Mar 14 15:20:20 1996 ---- imap/ANSI/ipopd/Makefile Fri Jun 14 00:13:07 1996 -*************** -*** 33,37 **** - - C = ../c-client -! CCLIENTLIB = $C/c-client.a - SHELL = /bin/sh - ---- 33,37 ---- - - C = ../c-client -! CCLIENTLIB = $C/libc-client.so.1.3 - SHELL = /bin/sh - -*************** -*** 40,44 **** - CC = `cat $C/CCTYPE` - CFLAGS = -I$C `cat $C/CFLAGS` -! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - ipopd: ipop2d ipop3d ---- 40,44 ---- - CC = `cat $C/CCTYPE` - CFLAGS = -I$C `cat $C/CFLAGS` -! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS` - - ipopd: ipop2d ipop3d -*************** -*** 55,59 **** - - $(CCLIENTLIB): -! cd $C;make - - clean: ---- 55,59 ---- - - $(CCLIENTLIB): -! cd $C;make $(OS) - - clean: diff --git a/mail/pine4/files/patch-aj b/mail/pine4/files/patch-aj deleted file mode 100644 index d824539dabd9..000000000000 --- a/mail/pine4/files/patch-aj +++ /dev/null @@ -1,41 +0,0 @@ -*** imap/ANSI/imapd/Makefile.orig Thu Mar 14 15:20:52 1996 ---- imap/ANSI/imapd/Makefile Fri Jun 14 00:13:00 1996 -*************** -*** 33,37 **** - - C = ../c-client -! CCLIENTLIB = $C/c-client.a - SHELL = /bin/sh - ---- 33,37 ---- - - C = ../c-client -! CCLIENTLIB = $C/libc-client.so.1.3 - SHELL = /bin/sh - -*************** -*** 40,44 **** - CC = `cat $C/CCTYPE` - CFLAGS = -I$C `cat $C/CFLAGS` -! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - imapd: $(CCLIENTLIB) imapd.o ---- 40,44 ---- - CC = `cat $C/CCTYPE` - CFLAGS = -I$C `cat $C/CFLAGS` -! LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS` - - imapd: $(CCLIENTLIB) imapd.o -*************** -*** 48,52 **** - - $(CCLIENTLIB): -! cd $C;make - - clean: ---- 48,52 ---- - - $(CCLIENTLIB): -! cd $C;make $(OS) - - clean: diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al index 1ab82cfcedb3..2c6d35ba6a4d 100644 --- a/mail/pine4/files/patch-al +++ b/mail/pine4/files/patch-al @@ -1,28 +1,25 @@ -*** build.orig Tue May 14 14:22:47 1996 ---- build Fri Jun 14 00:09:03 1996 +*** build.orig Tue May 14 23:22:47 1996 +--- build Sun Jan 12 20:18:50 1997 *************** -*** 169,179 **** +*** 167,180 **** + cd $PHOME/bin + rm -f pine mtest imapd pico pilot if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi - if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi - if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi +- if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi +- if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi cd $PHOME echo '' echo "Links to executables are in bin directory:" -! size bin/pine bin/mtest bin/imapd bin/pico bin/pilot +- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot echo "Done" ;; ---- 169,189 ---- + +--- 167,179 ---- + cd $PHOME/bin + rm -f pine mtest imapd pico pilot if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi - if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi -+ if [ -s ../c-client/libc-client.so.1.3 ] ; -+ then ln ../c-client/libc-client.so.1.3 libc-client.so.1.3 ; fi - if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi -+ if [ -s ../imap/systype/ipopd/ipop2d ] ; -+ then ln ../imap/systype/ipopd/ipop2d ipop2d ; fi -+ if [ -s ../imap/systype/ipopd/ipop3d ] ; -+ then ln ../imap/systype/ipopd/ipop3d ipop3d ; fi if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi + if [ -s ../pico/libpico.so.1.3 ] ; @@ -30,8 +27,29 @@ cd $PHOME echo '' echo "Links to executables are in bin directory:" -! size bin/pine bin/mtest bin/imapd bin/pico bin/pilot \ -! bin/ipop2d bin/ipop3d \ -! bin/libc-client.so.1.3 bin/libpico.so.1.3 echo "Done" ;; + +*************** +*** 185,194 **** + make clean + echo "Cleaning Pine" + cd $PHOME/pine +! make -f makefile.ult clean + echo "Cleaning pico" + cd $PHOME/pico +! make $makeargs -f makefile.ult clean + echo "Done" + cd $PHOME + ;; +--- 184,193 ---- + make clean + echo "Cleaning Pine" + cd $PHOME/pine +! make -f makefile.bsf clean + echo "Cleaning pico" + cd $PHOME/pico +! make $makeargs -f makefile.bsf clean + echo "Done" + cd $PHOME + ;; diff --git a/mail/pine4/files/patch-an b/mail/pine4/files/patch-an deleted file mode 100644 index 77cf2a7b4d30..000000000000 --- a/mail/pine4/files/patch-an +++ /dev/null @@ -1,15 +0,0 @@ ---- build.old Fri Aug 9 15:37:20 1996 -+++ build Fri Aug 9 15:53:55 1996 -@@ -195,10 +195,10 @@ - make clean - echo "Cleaning Pine" - cd $PHOME/pine -- make -f makefile.ult clean -+ make -f makefile.bsf clean - echo "Cleaning pico" - cd $PHOME/pico -- make $makeargs -f makefile.ult clean -+ make $makeargs -f makefile.bsf clean - echo "Done" - cd $PHOME - ;; diff --git a/mail/pine4/pkg-plist b/mail/pine4/pkg-plist index 600ee1cbb0e3..ba52291c7913 100644 --- a/mail/pine4/pkg-plist +++ b/mail/pine4/pkg-plist @@ -1,8 +1,6 @@ -bin/mboxtest bin/pico bin/pilot bin/pine -lib/libc-client.so.1.3 lib/libpico.so.1.3 @exec /sbin/ldconfig -m %B bin/pgpencrypt |