mail/qpopper/patches/patch-am

   1 $NetBSD$
   2
   3 --- popper/Makefile.in.orig     2005-05-13 20:20:11.000000000 +0100
   4 +++ popper/Makefile.in
   5 @@ -96,6 +96,8 @@ VPATH           =   @srcdir@
   6  prefix          =   @prefix@
   7  exec_prefix     =   @exec_prefix@
   8  installdir      =   @sbindir@
   9 +libexecdir     =   @libexecdir@
  10 +sbindir         =   @sbindir@
  11
  12  popper_srcdir   =   ${top_srcdir}/popper
  13  qd_srcdir       =   ${top_srcdir}/qd
  14 @@ -114,17 +116,20 @@ password_dir    =   ${base_dir}/password
  15
  16
  17  OBJS            =   pop_dele.o pop_dropcopy.o \
  18 -                    pop_get_command.o pop_get_subcommand.o pop_init.o \
  19 +                    pop_get_command.o pop_get_subcommand.o \
  20                      pop_last.o pop_list.o pop_log.o pop_lower.o \
  21                      pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
  22                      pop_rset.o pop_send.o pop_stat.o pop_updt.o \
  23                      pop_user.o pop_xtnd.o pop_xmit.o popper.o \
  24 -                    pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o \
  25 +                    pop_bull.o xtnd_xlst.o pop_uidl.o \
  26                      pop_rpop.o pop_apop.o md5.o pop_auth.o pop_pope.o \
  27                      pop_extend.o scram.o hmac.o base64.o pop_util.o \
  28                      get_sub_opt.o msg_ptr.o drac.o pop_config.o pop_tls.o \
  29                      pop_tls_openssl.o pop_tls_sslplus.o sslplus_utils.o \
  30 -                    main.o pop_cache.o genpath.o
  31 +                    pop_cache.o genpath.o
  32 +
  33 +INETDOBJ       =   main.o pop_init.o
  34 +STANDOBJ       =   main-stand.o pop_init-stand.o
  35
  36  SRCS            =   pop_dele.c pop_dropcopy.c \
  37                      pop_get_command.c pop_get_subcommand.c pop_init.c \
  38 @@ -132,7 +137,7 @@ SRCS            =   pop_dele.c pop_dropc
  39                      pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
  40                      pop_rset.c pop_send.c pop_stat.c pop_updt.c \
  41                      pop_user.c pop_xtnd.c pop_xmit.c popper.c \
  42 -                    pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c \
  43 +                    pop_bull.c xtnd_xlst.c pop_uidl.c \
  44                      pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \
  45                      pop_extend.c scram.c hmac.c base64.c pop_util.c \
  46                      get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \
  47 @@ -181,7 +186,7 @@ USE_PAM         =   @USE_PAM@
  48
  49  .SUFFIXES: .c .o
  50
  51 -all: popper ${pop_auth} mangler_library common_library ${poppassd}
  52 +all: mangler_library common_library popper popper-standalone ${pop_auth} ${poppassd}
  53
  54  mangler_library:
  55         cd ${mmangle_dir} && ${MAKE} all
  56 @@ -189,13 +194,18 @@ mangler_library:
  57  common_library:
  58         cd ${common_dir} && ${MAKE} all
  59
  60 -popper: ${OBJS} mangler_library common_library
  61 -       ${CC}   ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
  62 +popper: ${INETDOBJ} ${OBJS} mangler_library common_library
  63 +       ${CC}   ${INETDOBJ} ${OBJS} -o popper ${mmangle_dir}/libmangle.a \
  64                 -I${common_srcdir} ${common_dir}/libcommon.a \
  65                 ${LIBS} ${LDFLAGS}
  66
  67 +popper-standalone: ${STANDOBJ} ${OBJS} mangler_library common_library
  68 +       ${CC}   ${STANDOBJ} ${OBJS} -o popper-standalone \
  69 +               ${mmangle_dir}/libmangle.a -I${common_srcdir} \
  70 +               ${common_dir}/libcommon.a ${LIBS}
  71 +
  72  popauth: ${POPAUTHOBJS}
  73 -       ${CC}  -o popauth ${POPAUTHOBJS} ${NETWORK_LIBS} ${DBM_LIBS} \
  74 +       ${CC}  -o popauth ${POPAUTHOBJS} ${LIBS} ${NETWORK_LIBS} ${DBM_LIBS} \
  75                 ${common_dir}/libcommon.a
  76
  77  poppassd: common_library
  78 @@ -206,22 +216,36 @@ poppassd: common_library
  79                 -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
  80                 ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@
  81
  82 +main-stand.o: main.c
  83 +       ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \
  84 +               -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
  85 +               ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \
  86 +               -o $@ main.c
  87 +
  88 +pop_init-stand.o: pop_init.c
  89 +       ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \
  90 +               -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
  91 +               ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \
  92 +               -o $@ pop_init.c
  93 +
  94  ${SRCS}:
  95  ${POPAUTHSRCS}:
  96
  97 -install: popper ${pop_auth}
  98 -       ${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
  99 -       echo "Installed popper as ${installdir}/popper"
 100 -       if [ "x${poppassd}" != "x" ]; then \
 101 -           cd ${password_dir} && ${MAKE} $@ ;\
 102 +install: popper popper-standalone ${pop_auth}
 103 +       ${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
 104 +       echo "Installed popper as ${libexecdir}/qpopper"
 105 +       ${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper
 106 +       @echo "Installed standalone popper as ${sbindir}/qpopper"
 107 +       @if [ "x${pop_auth}" != "x" ]; then \
 108 +               ${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \
 109 +                       ${sbindir}/q${pop_auth}; \
 110 +               echo "Installed popauth as ${sbindir}/q${pop_auth} " \
 111 +                       "with uid ${apop_uid}"; \
 112 +               ${sbindir}/q${pop_auth} -init -safe; \
 113         fi
 114
 115 -       if [ "x${pop_auth}" != "x" ]; then \
 116 -           ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
 117 -                      ${installdir}/${pop_auth}; \
 118 -           echo "Installed popauth as ${installdir}/${pop_auth} " \
 119 -                "with uid ${apop_uid}"; \
 120 -           ${installdir}/${pop_auth} -init -safe; \
 121 +       if [ "x${poppassd}" != "x" ]; then \
 122 +           cd ${password_dir} && ${MAKE} $@ ;\
 123         fi
 124
 125         if [ "x${USE_PAM}" != "x" ]; then     \