diff options
Diffstat (limited to 'mail/qpopper/patches/patch-am')
| -rw-r--r-- | mail/qpopper/patches/patch-am | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am index 22312d98e30..82c5c76fc43 100644 --- a/mail/qpopper/patches/patch-am +++ b/mail/qpopper/patches/patch-am @@ -1,8 +1,16 @@ -$NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $ +$NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $ ---- popper/Makefile.in.orig 2005-05-13 19:20:11.000000000 +0000 +--- popper/Makefile.in.orig 2006-03-09 22:32:37.000000000 +0000 +++ popper/Makefile.in -@@ -96,6 +96,8 @@ VPATH = @srcdir@ +@@ -86,6 +86,7 @@ CC = @CC@ + GPERF = @GPERF@ + MAKEFILE = Makefile + INSTALL = @INSTALL@ ++DESTDIR = + + @SET_MAKE@ + +@@ -96,6 +97,8 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ installdir = @sbindir@ @@ -11,7 +19,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $ popper_srcdir = ${top_srcdir}/popper qd_srcdir = ${top_srcdir}/qd -@@ -114,17 +116,20 @@ password_dir = ${base_dir}/password +@@ -114,17 +117,20 @@ password_dir = ${base_dir}/password OBJS = pop_dele.o pop_dropcopy.o \ @@ -35,7 +43,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $ SRCS = pop_dele.c pop_dropcopy.c \ pop_get_command.c pop_get_subcommand.c pop_init.c \ -@@ -132,7 +137,7 @@ SRCS = pop_dele.c pop_dropc +@@ -132,7 +138,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 +52,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg 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 \ -@@ -181,7 +186,7 @@ USE_PAM = @USE_PAM@ +@@ -181,7 +187,7 @@ USE_PAM = @USE_PAM@ .SUFFIXES: .c .o @@ -53,7 +61,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $ mangler_library: cd ${mmangle_dir} && ${MAKE} all -@@ -189,13 +194,18 @@ mangler_library: +@@ -189,13 +195,18 @@ mangler_library: common_library: cd ${common_dir} && ${MAKE} all @@ -75,7 +83,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $ ${common_dir}/libcommon.a poppassd: common_library -@@ -206,22 +216,35 @@ poppassd: common_library +@@ -206,22 +217,35 @@ poppassd: common_library -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \ ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@ @@ -100,13 +108,13 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $ - if [ "x${poppassd}" != "x" ]; then \ - cd ${password_dir} && ${MAKE} $@ ;\ +install: popper popper-standalone ${pop_auth} -+ ${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper ++ ${BSD_INSTALL_PROGRAM} popper ${DESTDIR}${libexecdir}/qpopper + echo "Installed popper as ${libexecdir}/qpopper" -+ ${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper ++ ${BSD_INSTALL_PROGRAM} popper-standalone ${DESTDIR}${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}; \ ++ ${BSD_INSTALL_PROGRAM} ${pop_auth} \ ++ ${DESTDIR}${sbindir}/q${pop_auth}; \ + echo "Installed popauth as ${sbindir}/q${pop_auth} " \ + "with uid ${apop_uid}"; \ fi |