From 75f569d1d62aa659732a0c96fdb132f386e8ee9a Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Sat, 23 Nov 2002 17:01:20 +0000
Subject: Make qpopper build on Solaris.

- Remove extra rule line in install target.  (It tried to do make on
  password directory.)
- Solaris's /usr/ucb/install dosen't accept number with -g option.
---
 mail/qpopper/Makefile         |  3 ++-
 mail/qpopper/distinfo         |  4 ++--
 mail/qpopper/patches/patch-am | 23 ++++++++++++-----------
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'mail/qpopper')

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 9aa87cc0080..09057913307 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2002/09/09 19:25:30 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/11/23 17:01:20 taca Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -21,6 +21,7 @@ USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
 PKG_USERS?=		${QPOPPER_USER}
+MAKE_ENV+=		BINGRP=${BINGRP}
 
 pre-build:
 	${SED}	-e "s|/usr/local/lib|${PREFIX}/libexec|g"		\
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index 4ee1741e155..a72767422d8 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/04 05:59:04 taca Exp $
+$NetBSD: distinfo,v 1.7 2002/11/23 17:01:20 taca Exp $
 
 SHA1 (qpopper4.0.4.tar.gz) = c8b35bfa79000e3f1d67574c93d8d8ef580cd57c
 Size (qpopper4.0.4.tar.gz) = 2261992 bytes
@@ -9,5 +9,5 @@ SHA1 (patch-ab) = 67d661adce74d0662cab5b644d2e57bfd1d5e3c7
 SHA1 (patch-ae) = 1e06159f56c78e63a7960d4d9ca80535752099b2
 SHA1 (patch-ag) = 4b187ab978ead4b751290fe483f6d6a6bf959089
 SHA1 (patch-al) = 63fdc28b9c1d292d55464cda13c529ffb2a47b34
-SHA1 (patch-am) = 50f1afde9771af17f77552254372374699caad73
+SHA1 (patch-am) = d9e27e4cb3a7b5de0f3ec080466fcd41f8033f3c
 SHA1 (patch-an) = 43e7c20b9c3cfd978255748236efbcbaf2f929ce
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am
index 2f3c3baf5f4..cbf2fcb24ae 100644
--- a/mail/qpopper/patches/patch-am
+++ b/mail/qpopper/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1 2001/06/10 15:08:41 taca Exp $
+$NetBSD: patch-am,v 1.2 2002/11/23 17:01:21 taca Exp $
 
---- popper/Makefile.in.orig	Mon Apr 23 07:59:15 2001
-+++ popper/Makefile.in
+--- popper/Makefile.in.orig	Mon Apr 23 07:55:27 2001
++++ popper/Makefile.in	Fri Nov 22 15:35:20 2002
 @@ -87,6 +87,8 @@
  prefix          =   @prefix@
  exec_prefix     =   @exec_prefix@
@@ -11,22 +11,23 @@ $NetBSD: patch-am,v 1.1 2001/06/10 15:08:41 taca Exp $
  
  popper_srcdir   =   ${top_srcdir}/popper
  qd_srcdir       =   ${top_srcdir}/qd
-@@ -199,17 +201,17 @@
+@@ -199,17 +201,14 @@
  ${POPAUTHSRCS}:
  
  install: popper ${pop_auth}
 -	${INSTALL} -s -m 0755 -o root popper ${installdir}/popper
 -	echo "Installed popper as ${installdir}/popper"
-+	${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
-+	@echo "Installed popper as ${libexecdir}/qpopper"
- 	if [ "x${poppassd}" != "x" ]; then \
- 	    cd ${password_dir} && ${MAKE} $@ ;\
- 	fi
+-	if [ "x${poppassd}" != "x" ]; then \
+-	    cd ${password_dir} && ${MAKE} $@ ;\
+-	fi
 -	if [ "x${pop_auth}" != "x" ]; then \
-+	@if [ "x${pop_auth}" != "x" ]; then \
- 	    ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
+-	    ${INSTALL} -s -m 4755 -o ${apop_uid} -g 0 ${pop_auth} \
 -	               ${installdir}/${pop_auth}; \
 -	    echo "Installed popauth as ${installdir}/${pop_auth} " \
++	${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
++	@echo "Installed popper as ${libexecdir}/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}"; \
-- 
cgit v1.2.3