summaryrefslogtreecommitdiff
path: root/mail/pine
diff options
context:
space:
mode:
authortv <tv>2001-11-06 20:04:46 +0000
committertv <tv>2001-11-06 20:04:46 +0000
commit532a0792ca516cdb21021e51223c598667dfc66f (patch)
treef1fe21f0b2fc5089a72710d84efb3da38416cad2 /mail/pine
parent968d491875c3e99481de821064cf0fb90258a72c (diff)
downloadpkgsrc-532a0792ca516cdb21021e51223c598667dfc66f.tar.gz
* Set default debug level to 0 (it can still be turned on voluntarily)
* Don't use libtool; it's not necessary here (and increases compile time) * Obey ${CC} and ${CFLAGS}.
Diffstat (limited to 'mail/pine')
-rw-r--r--mail/pine/Makefile15
-rw-r--r--mail/pine/distinfo8
-rw-r--r--mail/pine/patches/patch-aa7
-rw-r--r--mail/pine/patches/patch-ac14
-rw-r--r--mail/pine/patches/patch-al11
5 files changed, 20 insertions, 35 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index a8698748873..f9a2f3946b6 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2001/10/26 15:17:38 kleink Exp $
+# $NetBSD: Makefile,v 1.53 2001/11/06 20:04:46 tv Exp $
# FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
#
@@ -28,10 +28,7 @@ LDAPCFLAGS= LDAPCFLAGS="-DENABLE_LDAP"
LDAPLIBS= LDAPLIBS="-lldap -llber"
.endif
-USE_LIBTOOL= yes
USE_SSL= yes
-CONFIGURE_ENV+= LT=${LIBTOOL}
-MAKE_ENV+= LT=${LIBTOOL}
pre-patch:
# Make sure the imap lib that comes with pine isn't
@@ -39,18 +36,20 @@ pre-patch:
${RM} -fr ${WRKSRC}/imap
do-configure:
- ${CP} -f ${WRKSRC}/pine/osdep/os-neb.h ${WRKSRC}/pine/osdep/os-neb.h.orig
+ ${CP} -f ${WRKSRC}/pine/osdep/os-${BUILDNAME}.h ${WRKSRC}/pine/osdep/os-${BUILDNAME}.h.orig
${SED} \
-e 's@/usr/local/lib/@${PREFIX}/etc/@' \
- <${WRKSRC}/pine/osdep/os-neb.h.orig >${WRKSRC}/pine/osdep/os-neb.h
+ -e 's@DEFAULT_DEBUG.*2@DEFAULT_DEBUG 0@' \
+ <${WRKSRC}/pine/osdep/os-${BUILDNAME}.h.orig >${WRKSRC}/pine/osdep/os-${BUILDNAME}.h
@${RM} -rf ${WRKSRC}/pico
@${LN} -sf ${LOCALBASE}/include/pico ${WRKSRC}/pico
do-build:
- cd ${WRKSRC} && ./build ${BUILDNAME} ${LDAPCFLAGS} ${LDAPLIBS} PREFIX=${PREFIX}
+ cd ${WRKSRC} && ./build ${BUILDNAME} ${LDAPCFLAGS} ${LDAPLIBS} PREFIX=${PREFIX} \
+ CC="${CC} ${CFLAGS}"
do-install:
- ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/pine/pine ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/pine/pine ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/
${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index 5a0502cc759..a17b6a0ed8e 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/10/11 15:35:01 martti Exp $
+$NetBSD: distinfo,v 1.4 2001/11/06 20:04:46 tv Exp $
SHA1 (pine4.40.tar.gz) = 90ed30803e6b25add43bf53ec260cdf313cfb77b
Size (pine4.40.tar.gz) = 3435886 bytes
-SHA1 (patch-aa) = db9b6abab00be4b4e2970790afe12cea34a12742
-SHA1 (patch-ac) = 1a88e5d1ec71add7ecab85f2ffa5e5a00e583df9
-SHA1 (patch-al) = 9dc539ba5895b56af3b3fbd6d7055fa3f1c82ea4
+SHA1 (patch-aa) = 6bd983ef7f2e0d0b61b5f996bdc0a6ec06c29523
+SHA1 (patch-ac) = 150bedf4815db8261808c42400560ed9c0da22be
+SHA1 (patch-al) = 103428685f7808ed86b97b90908b3e8b2057cb4f
SHA1 (patch-ao) = 0d8ba903d643147ae5771a7a053ab9be1e849766
diff --git a/mail/pine/patches/patch-aa b/mail/pine/patches/patch-aa
index b3836600bcd..3f600b705c0 100644
--- a/mail/pine/patches/patch-aa
+++ b/mail/pine/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2001/10/11 15:35:01 martti Exp $
+$NetBSD: patch-aa,v 1.12 2001/11/06 20:04:46 tv Exp $
--- pine/makefile.gs5.orig Tue Jul 3 19:03:55 2001
+++ pine/makefile.gs5 Mon Oct 8 10:04:40 2001
@@ -6,8 +6,7 @@ $NetBSD: patch-aa,v 1.11 2001/10/11 15:35:01 martti Exp $
RM= rm -f
LN= ln -s
MAKE= make
--OPTIMIZE= # -O
-+OPTIMIZE= -O2
+ OPTIMIZE= # -O
PROFILE= # -pg
-DEBUG= -g -DDEBUG
+DEBUG= -DDEBUG # -g # XXX crashes on 'c'ompose w/o -DDEBUG
@@ -23,7 +22,7 @@ $NetBSD: patch-aa,v 1.11 2001/10/11 15:35:01 martti Exp $
-LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
+STDLIBS= -lssl -lcrypto -ltermlib
-+LOCLIBS= -lpico $(CCLIENTDIR)/c-client.a
++LOCLIBS= -lpico -lc-client
+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
+ `cat $(CCLIENTDIR)/LDFLAGS`
diff --git a/mail/pine/patches/patch-ac b/mail/pine/patches/patch-ac
index 901ffc2c503..15ee92088be 100644
--- a/mail/pine/patches/patch-ac
+++ b/mail/pine/patches/patch-ac
@@ -1,19 +1,15 @@
-$NetBSD: patch-ac,v 1.13 2001/10/11 15:35:01 martti Exp $
+$NetBSD: patch-ac,v 1.14 2001/11/06 20:04:46 tv Exp $
--- pine/makefile.neb.orig Tue Jul 3 19:03:58 2001
+++ pine/makefile.neb Mon Oct 8 10:05:52 2001
-@@ -45,11 +45,16 @@
+@@ -45,11 +45,13 @@
RM= rm -f
LN= ln -s
MAKE= make
--OPTIMIZE= # -O
-+.if (${MACHINE_ARCH} != "arm32")
-+# XXX broken arm32 compiler can't optimize several of these source files
-+OPTIMIZE= -O
-+.endif
+ OPTIMIZE= # -O
PROFILE= # -pg
-DEBUG= -g -DDEBUG
-+DEBUG= -DDEBUG # -g -DDEBUG # crashes on 'c'ompose w/o -DDEBUG
++DEBUG= -DDEBUG # -g # XXX crashes on 'c'ompose w/o -DDEBUG
-CCLIENTDIR= ../c-client
+CCLIENTDIR= ${LOCALBASE}
@@ -31,7 +27,7 @@ $NetBSD: patch-ac,v 1.13 2001/10/11 15:35:01 martti Exp $
-LIBS= $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
+STDLIBS= -ltermlib -lssl -lcrypto -lcrypt
-+LOCLIBS= -lpico $(CCLIENTLIB)/libimapuw.la
++LOCLIBS= -lpico -lc-client
+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
STDCFLAGS= -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
diff --git a/mail/pine/patches/patch-al b/mail/pine/patches/patch-al
index ef5d074db7b..49bc9d2779d 100644
--- a/mail/pine/patches/patch-al
+++ b/mail/pine/patches/patch-al
@@ -1,16 +1,7 @@
-$NetBSD: patch-al,v 1.10 2001/10/11 15:35:01 martti Exp $
+$NetBSD: patch-al,v 1.11 2001/11/06 20:04:47 tv Exp $
--- build.orig Thu Aug 2 03:35:02 2001
+++ build Mon Oct 8 10:11:41 2001
-@@ -209,7 +209,7 @@
- bs3) makeargs="CC=shlicc $makeargs" ;;
- nto) makeargs="CC=qcc $makeargs" ;;
- lyn) [ -f /CYGNUS.bash ] && . /CYGNUS.bash; makeargs="CC=gcc $makeargs" ;;
-- *) makeargs="CC=cc $makeargs" ;;
-+ *) makeargs="CC=${LT}\ cc\ -g $makeargs" ;;
- esac
- fi
-
@@ -344,27 +344,6 @@
esac
echo "Including SSL functionality"