summaryrefslogtreecommitdiff
path: root/mail/pine/patches/patch-ap
diff options
context:
space:
mode:
Diffstat (limited to 'mail/pine/patches/patch-ap')
-rw-r--r--mail/pine/patches/patch-ap27
1 files changed, 12 insertions, 15 deletions
diff --git a/mail/pine/patches/patch-ap b/mail/pine/patches/patch-ap
index 15645cfde4b..0a6d465b3df 100644
--- a/mail/pine/patches/patch-ap
+++ b/mail/pine/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
+$NetBSD: patch-ap,v 1.3 2004/05/13 18:29:54 adam Exp $
---- pine/makefile.so5.orig Wed Oct 24 00:24:51 2001
-+++ pine/makefile.so5 Sun Mar 30 16:43:46 2003
-@@ -49,9 +49,11 @@
+--- pine/makefile.so5.orig 2004-04-02 23:16:17.000000000 +0000
++++ pine/makefile.so5
+@@ -49,9 +49,11 @@ LN= ln -s
MAKE= make
OPTIMIZE= # -O
PROFILE= # -pg
@@ -16,13 +16,9 @@ $NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
PICODIR= ../pico
# Only need to uncomment next two lines if you run make from this directory
-@@ -67,16 +69,16 @@
- # it only has /usr/ucb/cc) then change LDCC to the following line and
- # give that a try. This is still using the Solaris compiler but
+@@ -69,14 +71,14 @@ LDAPOFILES= addrbook.o adrbkcmd.o args
# leaving out the UCB compatibility includes and libraries.
--LDCC= $(PICODIR)/cc5.sol
-+#LDCC= $(PICODIR)/cc5.sol
-+LDCC= $(CC)
+ LDCC= $(PICODIR)/cc5.sol
-STDLIBS= -ltermlib
-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
@@ -30,16 +26,17 @@ $NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
- `cat $(CCLIENTDIR)/LDFLAGS`
+STDLIBS= -lssl -lcrypto -lpam -ltermlib
+LOCLIBS= -lpico -lc-client
-+LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) -lnsl -lsocket
++LIBS= -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
++ -lnsl -lsocket
STDCFLAGS= -Dconst= -DSV4 -DSYSTYPE=\"SOL\" -DMOUSE
CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
-- $(STDCFLAGS)
-+ $(STDCFLAGS) -I${CCLIENTINC}
+- $(LOCALPINECFLAGS) $(STDCFLAGS)
++ $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
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 \
-@@ -88,20 +90,20 @@
+@@ -88,20 +90,20 @@ HFILES= headers.h os.h pine.h context.h
$(PICODIR)/headers.h $(PICODIR)/estruct.h \
$(PICODIR)/edef.h $(PICODIR)/efunc.h \
$(PICODIR)/pico.h $(PICODIR)/os.h \
@@ -65,7 +62,7 @@ $NetBSD: patch-ap,v 1.2 2003/03/31 16:23:16 bouyer Exp $
$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
pine-use: pine-use.c
-@@ -121,8 +123,8 @@
+@@ -121,8 +123,8 @@ os.c: osdep/os-so5.c
$(OFILES): $(HFILES)
addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h