pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/qpopper Fixed pkglint warnings and made the packa...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3af590a53e9c
branches:  trunk
changeset: 520553:3af590a53e9c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Oct 23 08:14:02 2006 +0000

description:
Fixed pkglint warnings and made the package work for unprivileged users.

diffstat:

 mail/qpopper/Makefile        |  19 +++++++++++++------
 mail/qpopper/Makefile.common |   3 ++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 0e652a65e7fa -r 3af590a53e9c mail/qpopper/Makefile
--- a/mail/qpopper/Makefile     Mon Oct 23 07:47:15 2006 +0000
+++ b/mail/qpopper/Makefile     Mon Oct 23 08:14:02 2006 +0000
@@ -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 @@
 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 @@
 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 -r 0e652a65e7fa -r 3af590a53e9c mail/qpopper/Makefile.common
--- a/mail/qpopper/Makefile.common      Mon Oct 23 07:47:15 2006 +0000
+++ b/mail/qpopper/Makefile.common      Mon Oct 23 08:14:02 2006 +0000
@@ -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 @@
 
 VERSION=               4.0.9
 QPOPPER_FAC?=          LOCAL1
+BUILD_DEFS+=           QPOPPER_FAC
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q} \



Home | Main Index | Thread Index | Old Index