summaryrefslogtreecommitdiff
path: root/mail/pine
diff options
context:
space:
mode:
Diffstat (limited to 'mail/pine')
-rw-r--r--mail/pine/Makefile11
-rw-r--r--mail/pine/distinfo15
-rw-r--r--mail/pine/patches/patch-ab11
-rw-r--r--mail/pine/patches/patch-ac10
-rw-r--r--mail/pine/patches/patch-af18
-rw-r--r--mail/pine/patches/patch-ah17
-rw-r--r--mail/pine/patches/patch-al82
7 files changed, 96 insertions, 68 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index c8bb7e7899f..f4fd3a1436f 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.65 2002/12/14 04:34:49 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
-#
+# $NetBSD: Makefile,v 1.66 2002/12/14 10:34:43 tron Exp $
-DISTNAME= pine4.44
-PKGNAME= pine-4.44
+DISTNAME= pine4.51
+PKGNAME= pine-4.51
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.fu-berlin.de/unix/mail/pine/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.washington.edu/pine/
@@ -18,7 +17,7 @@ BUILD_DEFS+= PINE_USE_LDAP
.include "../../mk/bsd.prefs.mk"
-USE_BUILDLINK2= # defined
+USE_BUILDLINK2= YES
.if defined(PINE_USE_LDAP) && (${PINE_USE_LDAP} == "YES")
. include "../../databases/openldap/buildlink2.mk"
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index a91d4273177..cefa0d353f4 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.11 2002/12/11 12:22:17 tron Exp $
+$NetBSD: distinfo,v 1.12 2002/12/14 10:34:44 tron Exp $
-SHA1 (pine4.44.tar.gz) = 0657a5bd51cacc300260224320ee114c0b2b26e5
-Size (pine4.44.tar.gz) = 3478476 bytes
+SHA1 (pine4.51.tar.bz2) = 4ab510b03fa6c8685d6bdbb57c9247a7ee52e55f
+Size (pine4.51.tar.bz2) = 2787276 bytes
SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
-SHA1 (patch-ab) = c177e0917522391ec75ceffd8518b9c7b816b734
-SHA1 (patch-ac) = 409cfbcbbbdfa9aff67d52eb7877569dd07c6e9f
+SHA1 (patch-ab) = a50d95f25b0a5b2b994bd08acfe9c0c70c497b17
+SHA1 (patch-ac) = 5179a2f34f161264c8545b9b58ca359dd3304b46
SHA1 (patch-ad) = daca835a9b82fe4041fbfe90b435382ef9a609ce
SHA1 (patch-ae) = 370f46eb2c1868663d9c8c927c89b644d1118ca2
-SHA1 (patch-af) = 7e359f5f91fb93b0544d72ee15d2300b22c0f4d2
+SHA1 (patch-af) = 689a911d7c018003fb50446311a495bdf63edcb5
SHA1 (patch-ag) = 7823df3628374ab633ce3a99c6c2a3bd7255b13f
-SHA1 (patch-ah) = a514d00466f26409237962d194cf79ac2445e890
-SHA1 (patch-al) = 8d0c9ba6cab0794d592e6f0e9d188e062743c7ad
+SHA1 (patch-al) = db18ea904d1585e23efc91f8b896834eec10b4e2
SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
SHA1 (patch-ap) = c6e45964ad8415d78e819af83b38add6055179c6
diff --git a/mail/pine/patches/patch-ab b/mail/pine/patches/patch-ab
index e9c7ffaa8e0..6f7e823106e 100644
--- a/mail/pine/patches/patch-ab
+++ b/mail/pine/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2002/11/26 21:41:09 cjep Exp $
---- pine/makefile.lnx.orig Tue Oct 23 23:24:48 2001
-+++ pine/makefile.lnx Mon Jul 8 16:02:59 2002
+$NetBSD: patch-ab,v 1.9 2002/12/14 10:34:44 tron Exp $
+
+--- pine/makefile.lnx.orig Tue Sep 10 23:34:39 2002
++++ pine/makefile.lnx Sat Dec 14 11:10:00 2002
@@ -47,9 +47,11 @@
MAKE= make
OPTIMIZE= # -O2
PROFILE= # -pg
--DEBUG= -g -DDEBUG
-+DEBUG= -DDEBUG # -g
+-DEBUG= -g -DDEBUG -DDEBUGJOURNAL
++DEBUG= -DDEBUG -DDEBUGJOURNAL # -g
-CCLIENTDIR= ../c-client
+CCLIENTDIR= ${PREFIX}
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index a8b9f95fbc7..58a0e5c3289 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.16 2001/12/15 08:31:38 martti Exp $
+$NetBSD: patch-ac,v 1.17 2002/12/14 10:34:44 tron Exp $
---- pine/makefile.neb.orig Tue Oct 23 22:24:49 2001
-+++ pine/makefile.neb Fri Dec 14 19:25:45 2001
+--- pine/makefile.neb.orig Tue Sep 10 23:39:23 2002
++++ pine/makefile.neb Sat Dec 14 11:13:52 2002
@@ -47,9 +47,11 @@
MAKE= make
OPTIMIZE= # -O
PROFILE= # -pg
--DEBUG= -g -DDEBUG
-+DEBUG= -DDEBUG # -g # XXX crashes on 'c'ompose w/o -DDEBUG
+-DEBUG= -g -DDEBUG -DDEBUGJOURNAL
++DEBUG= -DDEBUG -DDEBUGJOURNAL # -g
-CCLIENTDIR= ../c-client
+CCLIENTDIR= ${PREFIX}
diff --git a/mail/pine/patches/patch-af b/mail/pine/patches/patch-af
index 63d1a596cf2..c2a18578bce 100644
--- a/mail/pine/patches/patch-af
+++ b/mail/pine/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.7 2002/07/28 05:49:29 schmonz Exp $
+$NetBSD: patch-af,v 1.8 2002/12/14 10:34:44 tron Exp $
---- pine/makefile.osx.orig Wed Oct 24 15:42:24 2001
-+++ pine/makefile.osx
-@@ -50,7 +50,9 @@ OPTIMIZE= # -O
+--- pine/makefile.osx.orig Fri Sep 20 20:22:23 2002
++++ pine/makefile.osx Sat Dec 14 11:18:00 2002
+@@ -50,7 +50,9 @@
PROFILE= # -pg
- DEBUG= -g -DDEBUG
+ DEBUG= -g -DDEBUG -DDEBUGJOURNAL
-CCLIENTDIR= ../c-client
+CCLIENTDIR= ${PREFIX}
@@ -13,11 +13,11 @@ $NetBSD: patch-af,v 1.7 2002/07/28 05:49:29 schmonz Exp $
PICODIR= ../pico
# Only need to uncomment next two lines if you run make from this directory
-@@ -61,15 +63,14 @@ PICODIR= ../pico
+@@ -61,15 +63,14 @@
LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
mailview.o other.o pine.o strings.o takeaddr.o
--STDLIBS=
+-STDLIBS= -lncurses
-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
-LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
@@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.7 2002/07/28 05:49:29 schmonz Exp $
OFILES= addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
-@@ -81,20 +82,20 @@ HFILES= headers.h os.h pine.h context.h
+@@ -81,20 +82,20 @@
$(PICODIR)/headers.h $(PICODIR)/estruct.h \
$(PICODIR)/edef.h $(PICODIR)/efunc.h \
$(PICODIR)/pico.h $(PICODIR)/os.h \
@@ -59,7 +59,7 @@ $NetBSD: patch-af,v 1.7 2002/07/28 05:49:29 schmonz Exp $
$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
pine-use: pine-use.c
-@@ -114,8 +115,8 @@ os.c: osdep/os-osx.c
+@@ -114,8 +115,8 @@
$(OFILES): $(HFILES)
addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
diff --git a/mail/pine/patches/patch-ah b/mail/pine/patches/patch-ah
deleted file mode 100644
index 88f6693b9a8..00000000000
--- a/mail/pine/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/12/11 12:22:18 tron Exp $
-
---- pine/pine.c.orig Tue Jan 8 22:15:08 2002
-+++ pine/pine.c Wed Dec 11 13:13:17 2002
-@@ -415,8 +415,12 @@
- * This would normally get set in system-wide config if not needed.
- */
- if(F_ON(F_DISABLE_SHARED_NAMESPACES, ps_global))
-+#ifdef SET_DISABLEAUTOMATICSHAREDNAMESPACES
- mail_parameters(NULL, SET_DISABLEAUTOMATICSHAREDNAMESPACES,
- (void *) TRUE);
-+#else
-+ mail_parameters(NULL, SET_DISABLEAUTOSHAREDNS, (void *) TRUE);
-+#endif
-
- /*------- ... then tune the drivers just installed -------*/
- #ifdef DOS
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index ab230ad1c15..e5d2e03f875 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.12 2001/12/15 08:31:38 martti Exp $
+$NetBSD: patch-al,v 1.13 2002/12/14 10:34:45 tron Exp $
---- build.orig Thu Nov 1 00:01:04 2001
-+++ build Fri Dec 14 19:28:03 2001
-@@ -332,27 +332,6 @@
+--- build.orig Mon Dec 9 18:54:38 2002
++++ build Sat Dec 14 11:22:59 2002
+@@ -362,71 +362,6 @@
echo "Including SSL functionality"
fi
@@ -10,49 +10,95 @@ $NetBSD: patch-al,v 1.12 2001/12/15 08:31:38 martti Exp $
- ln -s imap/c-client c-client
- if [ -s mtest ] ; then rm -f mtest ; fi
- ln -s imap/mtest mtest
+- if [ -s mailutil ] ; then rm -f mailutil ; fi
+- ln -s imap/mailutil mailutil
- if [ -s imapd ] ; then rm -f imapd ; fi
- ln -s imap/imapd imapd
- if [ -s ipopd ] ; then rm -f ipopd ; fi
- ln -s imap/ipopd ipopd
- echo "Making c-client library, imapd, and ipopd"
- echo $S1 $S2 $S3 $S4 $K1 > imap/SPECIALS
-- cd $PHOME/imap
-- eval echo eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
-- eval make "$makeargs" "$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+- cd "$PHOME/imap"
+-# This "touch" tells the IMAP make not to give any warnings about IESG compliance.
+- if [ "$NOSSL" = "1" -o "$SSL" != "none" ] ; then touch ssl$SSL ; fi
+- if [ "$NOSSL" != "1" -a "$SSL" = "none" -a ! -f sslnone ]
+- then
+- echo "+-----------------------------------------------------------+"
+- echo "| It appears that you do not have OpenSSL or equivalent |"
+- echo "| installed on this system. |"
+- echo "| |"
+- echo "| Building PINE without SSL support will possibly introduce |"
+- echo "| problems when communicating with IMAP, POP3, or SMTP |"
+- echo "| servers that require TLS or SSL authentication. |"
+- echo "| In addition, your password may be vulnerable to a |"
+- echo "| snooping attack since it may be sent over the network |"
+- echo "| unencrypted. |"
+- echo "+-----------------------------------------------------------+"
+- echo ""
+- echo "Do you want to continue this build anyway? Type y or n please:"
+- read ans
+- case "$ans" in
+- y) echo "Building without SSL ..."
+- touch sslnone
+- ;;
+-
+- *) echo "Terminating build"
+- exit 1
+- ;;
+- esac
+- fi
+- eval echo eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+- eval make "$makeargs" "SSLTYPE=$SSL" "SPECIALS=`cat SPECIALS`" "$K2" $ccltarg
+- rc=$?
+- if [ $rc != "0" ]
+- then
+- echo "+---------------------------------------------+"
+- echo "| Problems building c-client |"
+- echo "| |"
+- echo "| Please check the output above for a |"
+- echo "| possible explanation for this failure |"
+- echo "+---------------------------------------------+"
+- echo ""
+- exit $rc
+- fi
- echo ''
-
- echo "Making Pico and Pilot"
-- cd $PHOME/pico
+- cd "$PHOME/pico"
- eval echo make "$makeargs" -f makefile.$picotarg
- eval make "$makeargs" -f makefile.$picotarg
+- rc=$?
+- if [ $rc != "0" ] ; then exit $rc ; fi
- echo ''
-
echo "Making Pine and rpload/rpdump".
- cd $PHOME/pine
+ cd "$PHOME/pine"
eval echo make "$makeargs" "$L1" "$L2" -f makefile.$pinetarg
-@@ -372,8 +351,6 @@
+@@ -449,8 +384,6 @@
if [ -s ../pine/rpdump ] ; then ln ../pine/rpdump rpdump ; fi
- cd $PHOME
+ cd "$PHOME"
echo ''
- echo "Links to executables are in bin directory:"
-- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/ipop2d bin/ipop3d
+- size bin/pine bin/mtest bin/imapd bin/pico bin/pilot bin/rpdump bin/rpload bin/mailutil bin/ipop2d bin/ipop3d
case $maketarg in
mnt) echo "Fixing stacksizes ..."
fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot
-@@ -409,16 +386,9 @@
+@@ -476,18 +409,11 @@
clean) # This only sort of works
-- rm -f c-client mtest imapd ipopd
+- rm -f c-client mtest mailutil imapd ipopd
- echo "Cleaning c-client and imapd"
-- cd $PHOME/imap
+- cd "$PHOME/imap"
- make clean
+ # this list of ssl* files matches with imap/Makefile
+ rm -f sslnopwd sslunix.nopwd sslsco.nopwd sslunix sslsco sslnone
echo "Cleaning Pine"
- cd $PHOME/pine
+ cd "$PHOME/pine"
make -f makefile.ult clean
- echo "Cleaning pico"
-- cd $PHOME/pico
+- cd "$PHOME/pico"
- make $makeargs -f makefile.ult clean
echo "Done"
- cd $PHOME
+ cd "$PHOME"
;;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 15:27:36 +0000