diff options
| author | rillig <rillig> | 2006-10-23 08:14:02 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-10-23 08:14:02 +0000 |
| commit | 678538fe9ac567b37b0733fac81c3586e74a42c2 (patch) | |
| tree | 25df9d9bcfa29272e5d6ffd54b6fe5e92e8e939e | |
| parent | 6f59cca8c4e0c71dce4cacc59d51b9bf9b385bb2 (diff) | |
| download | pkgsrc-678538fe9ac567b37b0733fac81c3586e74a42c2.tar.gz | |
Fixed pkglint warnings and made the package work for unprivileged users.
| -rw-r--r-- | mail/qpopper/Makefile | 19 | ||||
| -rw-r--r-- | mail/qpopper/Makefile.common | 3 |
2 files changed, 15 insertions, 7 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index caee0e5884f..7736a0b6e6d 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2006/05/05 02:51:35 taca Exp $ +# $NetBSD: Makefile,v 1.57 2006/10/23 08:14:02 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -25,7 +25,9 @@ CONFIGURE_ARGS+= --enable-apop=${QPOPPER_APOP_AUTH:Q} \ QPOPPER_USER?= pop QPOPPER_GROUP?= mail QPOPPER_APOP_AUTH?= ${PKG_SYSCONFDIR}/apop.auth -DB_SUFFIX?= db + +BUILD_DEFS+= QPOPPER_USER QPOPPER_GROUP +BUILD_DEFS+= QPOPPER_APOP_AUTH .if defined(QPOPPER_SPOOL_DIR) CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR:Q} @@ -38,10 +40,15 @@ MESSAGE_SUBST+= RCD_SCRIPTS=${RCD_SCRIPTS} \ PKG_USERS?= ${QPOPPER_USER}:${QPOPPER_GROUP} MAKE_ENV+= BINGRP=${BINGRP:Q} -pre-build: - ${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 +SUBST_CLASSES+= root +SUBST_STAGE.root= pre-configure +SUBST_FILES.root= Makefile.in */Makefile.in +SUBST_SED.root= -e 's,-o root,-o ${ROOT_USER},g' + +SUBST_CLASSES+= libexec +SUBST_STAGE.libexec= pre-configure +SUBST_FILES.libexec= man/popper.8 +SUBST_SED.libexec= -e "s|/usr/local/lib|${PREFIX}/libexec|g" post-install: ${INSTALL_DATA} ${WRKSRC}/License.txt \ diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common index f34fe209591..ae91cbbc7fe 100644 --- a/mail/qpopper/Makefile.common +++ b/mail/qpopper/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2006/05/05 02:51:35 taca Exp $ +# $NetBSD: Makefile.common,v 1.20 2006/10/23 08:14:02 rillig Exp $ QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \ http://core.ring.gr.jp/archives/net/mail/qpopper/ @@ -8,6 +8,7 @@ QPOPPER_PATCHFILES= qpopper4.0.8-ipv6-20050515.diff.gz VERSION= 4.0.9 QPOPPER_FAC?= LOCAL1 +BUILD_DEFS+= QPOPPER_FAC GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ |