diff options
Diffstat (limited to 'mail/pine4')
-rw-r--r-- | mail/pine4/Makefile | 14 | ||||
-rw-r--r-- | mail/pine4/distinfo | 3 | ||||
-rw-r--r-- | mail/pine4/files/patch-al | 54 | ||||
-rw-r--r-- | mail/pine4/files/patch-ax | 77 |
4 files changed, 67 insertions, 81 deletions
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile index 2dc7b5e441c6..ef8fe69f75da 100644 --- a/mail/pine4/Makefile +++ b/mail/pine4/Makefile @@ -6,17 +6,11 @@ # PORTNAME= pine -PORTVERSION= 4.40 +PORTVERSION= 4.43 CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ DISTNAME= ${PORTNAME}${PORTVERSION} -.if defined(WITH_MAILDIR) -PATCH_SITES+= http://www.qmail.org/ -PATCHFILES+= pine-maildir-4.33 -PATCH_DIST_STRIP=-p1 -.endif - MAINTAINER= DougB@FreeBSD.org LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient @@ -38,12 +32,6 @@ EXTRA_OPTS= SSL_LINK="-L${OPENSSLLIB} -lssl -lcrypto" MAN1= pine.1 pico.1 pilot.1 pre-fetch: -.if !defined(WITH_MAILDIR) - @${ECHO_MSG} "" - @${ECHO_MSG} "WITH_MAILDIR=yes enables support of Maildir" - @${ECHO_MSG} "" -.endif - .if !defined(BATCH) && !defined(PACKAGE_BUILDING) ${SH} pkg-install ${SH} pkg-libwarning diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo index 23cfd9168cbf..ece3466cecf0 100644 --- a/mail/pine4/distinfo +++ b/mail/pine4/distinfo @@ -1,2 +1 @@ -MD5 (pine4.40.tar.gz) = 5173fecdd0cc7c3b7da7394817ae869f -MD5 (pine-maildir-4.33) = e81b7754b07c3b2fc4493783a80447a9 +MD5 (pine4.43.tar.gz) = 9395df6346b9c0748a93163df83e6150 diff --git a/mail/pine4/files/patch-al b/mail/pine4/files/patch-al index ceb7df18d738..1eaa76fc85b4 100644 --- a/mail/pine4/files/patch-al +++ b/mail/pine4/files/patch-al @@ -1,27 +1,7 @@ -*** build.orig Wed Aug 1 18:35:02 2001 ---- build Thu Sep 27 23:55:58 2001 +*** build.orig Wed Oct 31 16:01:04 2001 +--- build Sun Dec 2 23:17:05 2001 *************** -*** 103,110 **** - pine The Pine mailer. Once compiled this should work just fine on - your system with no other files than this binary, and no - modifications to your system. Optionally you may create two -! configuration files, /usr/local/lib/pine.conf and -! /usr/local/lib/pine.info. See the documentation for details. - - pico The standalone editor similar to the Pine message composer. - This is a very simple straight forward text editor. ---- 103,111 ---- - pine The Pine mailer. Once compiled this should work just fine on - your system with no other files than this binary, and no - modifications to your system. Optionally you may create two -! configuration files, /usr/local/etc/pine.conf and -! /usr/local/etc/pine.info. See the documentation for details. -! - - pico The standalone editor similar to the Pine message composer. - This is a very simple straight forward text editor. -*************** -*** 345,363 **** +*** 332,351 **** echo "Including SSL functionality" fi @@ -33,15 +13,16 @@ ! ln -s imap/imapd imapd ! if [ -s ipopd ] ; then rm -f ipopd ; fi ! ln -s imap/ipopd ipopd -! echo "Making c-client library, mtest and imapd" -! eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg +! echo "Making c-client library, imapd, and ipopd" +! echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS ! cd $PHOME/imap -! eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg +! eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg +! eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg ! echo '' echo "Making Pico and Pilot" cd $PHOME/pico ---- 346,364 ---- +--- 332,351 ---- echo "Including SSL functionality" fi @@ -53,16 +34,17 @@ ! # ln -s imap/imapd imapd ! # if [ -s ipopd ] ; then rm -f ipopd ; fi ! # ln -s imap/ipopd ipopd -! # echo "Making c-client library, mtest and imapd" -! # eval echo make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg +! # echo "Making c-client library, imapd, and ipopd" +! # echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS ! # cd $PHOME/imap -! # eval make "$makeargs" "$SSL" "$K1" "$K2" $ccltarg +! # eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg +! # eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg ! # echo '' echo "Making Pico and Pilot" cd $PHOME/pico *************** -*** 374,391 **** +*** 362,379 **** cd $PHOME/bin rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi @@ -81,7 +63,7 @@ case $maketarg in mnt) echo "Fixing stacksizes ..." fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot ---- 375,392 ---- +--- 362,379 ---- cd $PHOME/bin rm -f pine mtest imapd pico pilot rpload rpdump ipop2d ipop3d if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi @@ -101,10 +83,10 @@ mnt) echo "Fixing stacksizes ..." fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot *************** -*** 421,435 **** - +*** 410,424 **** clean) # This only sort of works + rm -f c-client mtest imapd ipopd ! echo "Cleaning c-client and imapd" ! cd $PHOME/imap ! make clean @@ -117,10 +99,10 @@ echo "Done" cd $PHOME ;; ---- 422,436 ---- - +--- 410,424 ---- clean) # This only sort of works + rm -f c-client mtest imapd ipopd ! # echo "Cleaning c-client and imapd" ! # cd $PHOME/imap ! # make clean diff --git a/mail/pine4/files/patch-ax b/mail/pine4/files/patch-ax index 3f630fe8fe74..e7dcafd55da5 100644 --- a/mail/pine4/files/patch-ax +++ b/mail/pine4/files/patch-ax @@ -1,30 +1,47 @@ ---- pine/makefile.bsf.orig Tue Jul 3 10:03:52 2001 -+++ pine/makefile.bsf Fri Sep 28 01:07:34 2001 -@@ -50,7 +50,7 @@ - PROFILE= # -pg - DEBUG= -DDEBUG # -g - --CCLIENTDIR= ../c-client -+CCLIENTDIR= $(PREFIX)/include/c-client - PICODIR= ../pico - - # Only need to uncomment next two lines if you run make from this directory -@@ -61,13 +61,12 @@ - LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \ - mailview.o other.o pine.o strings.o takeaddr.o - --STDLIBS= -ltermlib --LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a --LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \ -- `cat $(CCLIENTDIR)/LDFLAGS` -+STDLIBS= -ltermlib -lpam -L$(PREFIX)/lib -lc-client4 $(SSL_LINK) -+LOCLIBS= $(PICODIR)/libpico.a -+LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) - --STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE --CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \ -+STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include -+CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \ - $(STDCFLAGS) - - OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \ +*** pine/makefile.bsf.orig Tue Oct 23 15:24:45 2001 +--- pine/makefile.bsf Sun Dec 2 23:20:33 2001 +*************** +*** 50,56 **** + PROFILE= # -pg + DEBUG= -DDEBUG # -g + +! CCLIENTDIR= ../c-client + PICODIR= ../pico + + # Only need to uncomment next two lines if you run make from this directory +--- 50,56 ---- + PROFILE= # -pg + DEBUG= -DDEBUG # -g + +! CCLIENTDIR= $(PREFIX)/include/c-client + PICODIR= ../pico + + # Only need to uncomment next two lines if you run make from this directory +*************** +*** 61,73 **** + LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \ + mailview.o other.o pine.o strings.o takeaddr.o + +! STDLIBS= -ltermlib +! LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a +! LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \ +! `cat $(CCLIENTDIR)/LDFLAGS` + +! STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE +! CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \ + $(STDCFLAGS) + + OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \ +--- 61,72 ---- + LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \ + mailview.o other.o pine.o strings.o takeaddr.o + +! STDLIBS= -ltermlib -lpam -L$(PREFIX)/lib -lc-client4 $(SSL_LINK) +! LOCLIBS= $(PICODIR)/libpico.a +! LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) + +! STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include +! CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \ + $(STDCFLAGS) + + OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \ |