pkgsrc/mail/pine/patches/patch-af
2004-05-20 07:56:34 +00:00

73 lines
2.7 KiB
Text

$NetBSD: patch-af,v 1.10 2004/05/20 07:56:34 adam Exp $
--- pine/makefile.osx.orig 2003-12-17 22:12:52.000000000 +0000
+++ pine/makefile.osx
@@ -50,7 +50,9 @@ OPTIMIZE= # -O
PROFILE= # -pg
DEBUG= -g -DDEBUG -DDEBUGJOURNAL
-CCLIENTDIR= ../c-client
+CCLIENTDIR= ${PREFIX}
+CCLIENTINC= ${CCLIENTDIR}/include/c-client
+CCLIENTLIB= ${CCLIENTDIR}/lib
PICODIR= ../pico
# Only need to uncomment next two lines if you run make from this directory
@@ -61,16 +63,14 @@ PICODIR= ../pico
LDAPOFILES= addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
mailview.o other.o pine.o strings.o takeaddr.o
-STDLIBS= -lncurses
-LOCLIBS= $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
-LIBS= $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- -framework Carbon -framework ApplicationServices \
- `cat $(CCLIENTDIR)/LDFLAGS`
+STDLIBS= -lssl -lcrypto -lcurses -framework Carbon
+LOCLIBS= -lpico -lc-client
+LIBS= -L$(PREFIX)/lib $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
# Use BSDDEF instead of BSD because other systems use BSD internally.
STDCFLAGS= -Dconst= -DSYSTYPE=\"OSX\"
CFLAGS= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
- $(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 \
@@ -82,20 +82,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 \
- $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
- $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
+ $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
+ $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
all: pine rpload rpdump
-pine: $(OFILES) $(LOCLIBS)
+pine: $(OFILES)
echo "char datestamp[]="\"`date`\"";" > date.c
echo "char hoststamp[]="\"`hostname`\"";" >> date.c
$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
-rpload: rpload.o $(CCLIENTDIR)/c-client.a
+rpload: rpload.o $(CCLIENTLIB)/libc-client.a
$(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
-rpdump: rpdump.o $(CCLIENTDIR)/c-client.a
+rpdump: rpdump.o $(CCLIENTLIB)/libc-client.a
$(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
pine-use: pine-use.c
@@ -115,8 +115,8 @@ os.c: osdep/os-osx.c
$(OFILES): $(HFILES)
addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
-context.o: $(CCLIENTDIR)/misc.h
-send.o: $(CCLIENTDIR)/smtp.h
+context.o: $(CCLIENTINC)/misc.h
+send.o: $(CCLIENTINC)/smtp.h
#$(LDAPOFILES): $(LDAPLIBS)
helptext.c: pine.hlp