* buildlink1 --> buildlink2.

* Pass the LDFLAGS through to the build process so that the final binaries
  are built with the appropriate -Wl,-R flags.  This should fix pkg/18054.
* Use ROOT_{USER,GROUP} instead of hardcoding "root" and "wheel" when
  installing poppassd.

5 files changed, 33 insertions, 26 deletions

diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index 76379caaa39..4b43eccfa11 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/07/16 15:01:49 taca Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/09 19:25:26 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -15,21 +15,25 @@ MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's password change server mainly for Eudora
 
-USE_BUILDLINK_ONLY=	# defined
+.include "../qpopper/Makefile.common"
+
+USE_BUILDLINK2=		# defined
 CONFIGURE_ARGS+=	--enable-poppassd
 CONFIGURE_ENV+=	CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
-
-.include "../qpopper/Makefile.common"
+MAKE_ENV+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 
 do-build:
-	cd ${WRKSRC}/common; ${MAKE} ${ALL_TARGET}
-	cd ${WRKSRC}/password; ${MAKE} ${ALL_TARGET}
+.for DIR in common password
+	cd ${WRKSRC}/${DIR}; ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
+.endfor
 
 # popper makefile doesn't have an install target...
 do-install:
-	cd ${WRKSRC}/password; ${MAKE} ${INSTALL_TARGET}
-	${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${LOCALBASE}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/License.txt \
-		${LOCALBASE}/share/doc/poppassd.License;
+	cd ${WRKSRC}/password; ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
+	${INSTALL_MAN} ${WRKSRC}/man/poppassd.8 ${PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/License.txt				\
+		${PREFIX}/share/doc/poppassd.License;
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/poppassd/distinfo b/mail/poppassd/distinfo
index 0ee5712ba15..6b3cd2b6161 100644
--- a/mail/poppassd/distinfo
+++ b/mail/poppassd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/07/16 15:01:49 taca Exp $
+$NetBSD: distinfo,v 1.4 2002/09/09 19:25:27 jlam Exp $
 
 SHA1 (qpopper4.0.4.tar.gz) = c8b35bfa79000e3f1d67574c93d8d8ef580cd57c
 Size (qpopper4.0.4.tar.gz) = 2261992 bytes
 SHA1 (qpopper4.0.4-ipv6-20020502.diff.gz) = 7af76478f249684ebc02938d9a4a8cc728a52b91
 Size (qpopper4.0.4-ipv6-20020502.diff.gz) = 21535 bytes
 SHA1 (patch-aa) = 3dfad411477bae676ec4ea3dadf1d47d53ce1383
-SHA1 (patch-ab) = 2ab7597bacf172a7c2405f2d1f0c9040dbab66b8
+SHA1 (patch-ab) = c1c241b5bb3c00b14f68d0c691e6b0fd94984e90
 SHA1 (patch-ac) = b4edaa15f478914a2d2c273871915d53e498ff7c
diff --git a/mail/poppassd/patches/patch-ab b/mail/poppassd/patches/patch-ab
index cf231b8f2c4..bac7f4081a4 100644
--- a/mail/poppassd/patches/patch-ab
+++ b/mail/poppassd/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/05/02 16:16:56 martti Exp $
+$NetBSD: patch-ab,v 1.3 2002/09/09 19:25:29 jlam Exp $
 
 --- password/Makefile.in.orig	Fri Apr  5 04:38:33 2002
 +++ password/Makefile.in	Thu May  2 14:22:07 2002
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 2002/05/02 16:16:56 martti Exp $
  
  install:
 -	${INSTALL} -m 4755 -o root -g 0 poppassd ${installdir}/poppassd; \
-+	${INSTALL} -m 4755 -o root -g wheel poppassd ${installdir}/poppassd; \
++	${INSTALL} -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} poppassd ${installdir}/poppassd; \
  	echo "Installed poppassd as ${installdir}/poppassd" 
  
  poppassd: ${OBJS} ${common_dir}/libcommon.a
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 9f38a084e78..9aa87cc0080 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/05/04 05:59:04 taca Exp $
+# $NetBSD: Makefile,v 1.34 2002/09/09 19:25:30 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -15,22 +15,25 @@ MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		http://www.eudora.com/qpopper/
 COMMENT=		Qualcomm's POP server for Eudora
 
-USE_BUILDLINK_ONLY=	# defined
-
 .include "Makefile.common"
 
+USE_BUILDLINK2=		# defined
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+
 PKG_USERS?=		${QPOPPER_USER}
 
 pre-build:
-	${SED} 's"/usr/local/lib"${LOCALBASE}/libexec"' \
-		${WRKSRC}/man/popper.8 > ${WRKSRC}/man/popper.8.$$ && \
+	${SED}	-e "s|/usr/local/lib|${PREFIX}/libexec|g"		\
+		${WRKSRC}/man/popper.8 > ${WRKSRC}/man/popper.8.$$ &&	\
 	${MV} -f ${WRKSRC}/man/popper.8.$$ ${WRKSRC}/man/popper.8
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/License.txt ${LOCALBASE}/share/doc/qpopper.License
-	${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
-		 ${LOCALBASE}/share/examples
+	${INSTALL_DATA} ${WRKSRC}/License.txt				\
+		${PREFIX}/share/doc/qpopper.License
+	${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config		\
+		 ${PREFIX}/share/examples
+
+.include "../../security/openssl/buildlink2.mk"
 
-.include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index 7ea374a90d2..bd63a46bf02 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2002/06/15 21:20:02 cjep Exp $
+# $NetBSD: Makefile.common,v 1.7 2002/09/09 19:25:30 jlam Exp $
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
@@ -17,8 +17,6 @@ VERSION=		4.0.4
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
-
 .if defined(KERBEROS)
 PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--enable-kerberos
@@ -32,3 +30,5 @@ CONFIGURE_ARGS+=	--enable-servermode
 .if defined(USE_INET6) && ${USE_INET6} == YES
 CONFIGURE_ENV+=		O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
 .endif
+
+LIBS+=			${LDFLAGS}