diff options
Diffstat (limited to 'mail/qpopper/patches/patch-am')
| -rw-r--r-- | mail/qpopper/patches/patch-am | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am index 0414c68c0e1..67c05b33855 100644 --- a/mail/qpopper/patches/patch-am +++ b/mail/qpopper/patches/patch-am @@ -1,17 +1,17 @@ -$NetBSD: patch-am,v 1.3 2004/05/06 13:46:23 taca Exp $ +$NetBSD: patch-am,v 1.3.8.1 2005/06/05 18:35:25 salo Exp $ ---- popper/Makefile.in.orig Thu Mar 13 11:06:36 2003 +--- popper/Makefile.in.orig 2005-05-13 20:20:11.000000000 +0100 +++ popper/Makefile.in -@@ -90,6 +90,8 @@ VPATH = @srcdir@ +@@ -96,6 +96,8 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ installdir = @sbindir@ +libexecdir = @libexecdir@ -+sbindir = @sbindir@ ++sbindir = @sbindir@ popper_srcdir = ${top_srcdir}/popper qd_srcdir = ${top_srcdir}/qd -@@ -108,17 +110,20 @@ password_dir = ${base_dir}/password +@@ -114,17 +116,20 @@ password_dir = ${base_dir}/password OBJS = pop_dele.o pop_dropcopy.o \ @@ -27,15 +27,15 @@ $NetBSD: patch-am,v 1.3 2004/05/06 13:46:23 taca Exp $ pop_extend.o scram.o hmac.o base64.o pop_util.o \ get_sub_opt.o msg_ptr.o drac.o pop_config.o pop_tls.o \ pop_tls_openssl.o pop_tls_sslplus.o sslplus_utils.o \ -- main.o pop_cache.o genpath.o -+ pop_cache.o genpath.o +- main.o pop_cache.o genpath.o ++ pop_cache.o genpath.o + +INETDOBJ = main.o pop_init.o +STANDOBJ = main-stand.o pop_init-stand.o SRCS = pop_dele.c pop_dropcopy.c \ pop_get_command.c pop_get_subcommand.c pop_init.c \ -@@ -126,7 +131,7 @@ SRCS = pop_dele.c pop_dropc +@@ -132,7 +137,7 @@ SRCS = pop_dele.c pop_dropc pop_msg.c pop_parse.c pop_pass.c pop_quit.c \ pop_rset.c pop_send.c pop_stat.c pop_updt.c \ pop_user.c pop_xtnd.c pop_xmit.c popper.c \ @@ -44,7 +44,7 @@ $NetBSD: patch-am,v 1.3 2004/05/06 13:46:23 taca Exp $ pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \ pop_extend.c scram.c hmac.c base64.c pop_util.c \ get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \ -@@ -174,7 +179,7 @@ SSL_INC = @SSL_DIR_INC@ +@@ -181,7 +186,7 @@ USE_PAM = @USE_PAM@ .SUFFIXES: .c .o @@ -53,7 +53,7 @@ $NetBSD: patch-am,v 1.3 2004/05/06 13:46:23 taca Exp $ mangler_library: cd ${mmangle_dir} && ${MAKE} all -@@ -182,13 +187,18 @@ mangler_library: +@@ -189,13 +194,18 @@ mangler_library: common_library: cd ${common_dir} && ${MAKE} all @@ -75,20 +75,20 @@ $NetBSD: patch-am,v 1.3 2004/05/06 13:46:23 taca Exp $ ${common_dir}/libcommon.a poppassd: common_library -@@ -199,21 +209,32 @@ poppassd: common_library +@@ -206,22 +216,36 @@ poppassd: common_library -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@ +main-stand.o: main.c + ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \ -+ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \ -+ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \ ++ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \ ++ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \ + -o $@ main.c + +pop_init-stand.o: pop_init.c + ${CC} -c -I${base_dir} -I${top_srcdir} -I${srcdir} \ -+ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \ -+ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \ ++ -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \ ++ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} -DSTANDALONE \ + -o $@ pop_init.c + ${SRCS}: @@ -99,23 +99,27 @@ $NetBSD: patch-am,v 1.3 2004/05/06 13:46:23 taca Exp $ - echo "Installed popper as ${installdir}/popper" - if [ "x${poppassd}" != "x" ]; then \ - cd ${password_dir} && ${MAKE} $@ ;\ -- fi -- if [ "x${pop_auth}" != "x" ]; then \ -- ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \ -- ${installdir}/${pop_auth}; \ -- echo "Installed popauth as ${installdir}/${pop_auth} " \ +install: popper popper-standalone ${pop_auth} + ${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper -+ @echo "Installed popper as ${libexecdir}/qpopper" ++ echo "Installed popper as ${libexecdir}/qpopper" + ${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper + @echo "Installed standalone popper as ${sbindir}/qpopper" + @if [ "x${pop_auth}" != "x" ]; then \ -+ ${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \ -+ ${sbindir}/q${pop_auth}; \ -+ echo "Installed popauth as ${sbindir}/q${pop_auth} " \ - "with uid ${apop_uid}"; \ ++ ${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \ ++ ${sbindir}/q${pop_auth}; \ ++ echo "Installed popauth as ${sbindir}/q${pop_auth} " \ ++ "with uid ${apop_uid}"; \ ++ ${sbindir}/q${pop_auth} -init -safe; \ + fi + +- if [ "x${pop_auth}" != "x" ]; then \ +- ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \ +- ${installdir}/${pop_auth}; \ +- echo "Installed popauth as ${installdir}/${pop_auth} " \ +- "with uid ${apop_uid}"; \ - ${installdir}/${pop_auth} -init -safe; \ -+ ${sbindir}/q${pop_auth} -init -safe; \ ++ if [ "x${poppassd}" != "x" ]; then \ ++ cd ${password_dir} && ${MAKE} $@ ;\ fi - clean: + if [ "x${USE_PAM}" != "x" ]; then \ |