mail/pine/patches/patch-ac

   1 $NetBSD$
   2
   3 --- pine/makefile.neb.orig      2003-11-25 06:47:56.000000000 +0000
   4 +++ pine/makefile.neb
   5 @@ -47,9 +47,11 @@ LN=          ln -s
   6  MAKE=        make
   7  OPTIMIZE=    # -O
   8  PROFILE=     # -pg
   9 -DEBUG=       -g -DDEBUG -DDEBUGJOURNAL
  10 +DEBUG=       -DDEBUG -DDEBUGJOURNAL # -g
  11
  12 -CCLIENTDIR=  ../c-client
  13 +CCLIENTDIR=  ${PREFIX}
  14 +CCLIENTINC=  ${CCLIENTDIR}/include/c-client
  15 +CCLIENTLIB=  ${CCLIENTDIR}/lib
  16  PICODIR=     ../pico
  17
  18  # Only need to uncomment next two lines if you run make from this directory
  19 @@ -60,14 +62,13 @@ PICODIR=     ../pico
  20  LDAPOFILES=   addrbook.o adrbkcmd.o args.o bldaddr.o init.o \
  21               mailview.o other.o pine.o strings.o takeaddr.o
  22
  23 -STDLIBS=     -ltermlib
  24 -LOCLIBS=     $(PICODIR)/libpico.a $(CCLIENTDIR)/c-client.a
  25 -LIBS=        $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
  26 -             `cat $(CCLIENTDIR)/LDFLAGS`
  27 +STDLIBS=     -ltermlib -lssl -lcrypto -lcrypt
  28 +LOCLIBS=     -lpico -lc-client
  29 +LIBS=        -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib/ $(EXTRALIBES) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)
  30
  31  STDCFLAGS=   -DNETBSD -DSYSTYPE=\"NEB\" -DMOUSE
  32  CFLAGS=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(LDAPCFLAGS) \
  33 -            $(LOCALPINECFLAGS) $(STDCFLAGS)
  34 +            $(LOCALPINECFLAGS) $(STDCFLAGS) -I${CCLIENTINC}
  35
  36  OFILES=        addrbook.o adrbkcmd.o adrbklib.o args.o bldaddr.o context.o filter.o \
  37         folder.o help.o helptext.o imap.o init.o mailcap.o mailcmd.o \
  38 @@ -79,20 +80,20 @@ HFILES=     headers.h os.h pine.h context.h
  39         $(PICODIR)/headers.h $(PICODIR)/estruct.h \
  40         $(PICODIR)/edef.h $(PICODIR)/efunc.h \
  41         $(PICODIR)/pico.h $(PICODIR)/os.h \
  42 -       $(CCLIENTDIR)/mail.h $(CCLIENTDIR)/osdep.h \
  43 -       $(CCLIENTDIR)/rfc822.h $(CCLIENTDIR)/misc.h
  44 +       $(CCLIENTINC)/mail.h $(CCLIENTINC)/osdep.h \
  45 +       $(CCLIENTINC)/rfc822.h $(CCLIENTINC)/misc.h
  46
  47  all:   pine rpload rpdump
  48
  49 -pine:  $(OFILES) $(LOCLIBS)
  50 +pine:  $(OFILES)
  51         echo "char datestamp[]="\"`date`\"";" > date.c
  52         echo "char hoststamp[]="\"`hostname`\"";" >> date.c
  53         $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(OFILES) date.c $(LIBS)
  54
  55 -rpload:        rpload.o $(CCLIENTDIR)/c-client.a
  56 +rpload:        rpload.o $(CCLIENTLIB)/libc-client.a
  57         $(CC) $(LDFLAGS) $(CFLAGS) -o rpload rpload.o $(LIBS)
  58
  59 -rpdump:        rpdump.o $(CCLIENTDIR)/c-client.a
  60 +rpdump:        rpdump.o $(CCLIENTLIB)/libc-client.a
  61         $(CC) $(LDFLAGS) $(CFLAGS) -o rpdump rpdump.o $(LIBS)
  62
  63  pine-use:      pine-use.c
  64 @@ -112,8 +113,8 @@ os.c:       osdep/os-neb.c
  65
  66  $(OFILES):                                             $(HFILES)
  67  addrbook.o adrbkcmd.o adrbklib.o bldaddr.o takeaddr.o: adrbklib.h
  68 -context.o:                                             $(CCLIENTDIR)/misc.h
  69 -send.o:                                                        $(CCLIENTDIR)/smtp.h
  70 +context.o:                                             $(CCLIENTINC)/misc.h
  71 +send.o:                                                        $(CCLIENTINC)/smtp.h
  72  #$(LDAPOFILES):                                                $(LDAPLIBS)
  73
  74  helptext.c:    pine.hlp