diff options
| author | jlam <jlam> | 2002-09-09 19:25:26 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-09-09 19:25:26 +0000 |
| commit | 469c20618061767bc1212e2103829c62a7c80a4c (patch) | |
| tree | a482bee25d2ee486ebc21b8c1d962d6f3e91fc7b /mail/qpopper | |
| parent | af5856a98f7616703e6e9f04d8cb4cb2256cf427 (diff) | |
| download | pkgsrc-469c20618061767bc1212e2103829c62a7c80a4c.tar.gz | |
* 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.
Diffstat (limited to 'mail/qpopper')
| -rw-r--r-- | mail/qpopper/Makefile | 21 | ||||
| -rw-r--r-- | mail/qpopper/Makefile.common | 6 |
2 files changed, 15 insertions, 12 deletions
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} |