[pkgsrc/trunk]: pkgsrc/mail/qpopper Move qpopper specific definition from Mak...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be11db8f402f
branches:  trunk
changeset: 495543:be11db8f402f
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Jun 13 16:53:47 2005 +0000

description:
Move qpopper specific definition from Makefile.common to Makefile
to avoid accidently sharing options.mk between poppassd and qpopper.

No functional change to qpopper pkgsrc itself.

diffstat:

 mail/qpopper/Makefile        |  22 ++++++++++++++++++++--
 mail/qpopper/Makefile.common |  33 +++++++--------------------------
 2 files changed, 27 insertions(+), 28 deletions(-)

diffs (88 lines):

diff -r 8ca316d83a33 -r be11db8f402f mail/qpopper/Makefile
--- a/mail/qpopper/Makefile     Mon Jun 13 12:37:52 2005 +0000
+++ b/mail/qpopper/Makefile     Mon Jun 13 16:53:47 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/06/01 20:55:16 adrianp Exp $
+# $NetBSD: Makefile,v 1.51 2005/06/13 16:53:47 taca Exp $
 #
 
 DISTNAME=              qpopper${VERSION}
@@ -6,14 +6,32 @@
 CATEGORIES=            mail
 MASTER_SITES=          ${QPOPPER_MASTER_SITES}
 
+PATCH_SITES=           ${QPOPPER_PATCHSITES}
+PATCHFILES=            ${QPOPPER_PATCHFILES}
+PATCH_DIST_STRIP=      -p1
+
 MAINTAINER=            mellon%fugue.com@localhost
 HOMEPAGE=              ${QPOPPER_HOMEPAGE}
 COMMENT=               Qualcomm's POP server for Eudora
 
 .include "Makefile.common"
 
+CONFIGURE_ARGS+=       --enable-apop=${QPOPPER_APOP_AUTH} \
+                       --enable-popuid=${QPOPPER_USER} \
+                       --disable-update-abort --without-gdbm
+
+.include "options.mk"
+
+QPOPPER_USER?=         pop
+QPOPPER_GROUP?=                mail
+QPOPPER_APOP_AUTH?=    ${PKG_SYSCONFDIR}/apop.auth
+DB_SUFFIX?=            db
+
+.if defined(QPOPPER_SPOOL_DIR)
+CONFIGURE_ARGS+=       --enable-spool-dir=${QPOPPER_SPOOL_DIR}
+.endif
+
 USE_PKGINSTALL=                yes
-
 RCD_SCRIPTS=           qpopper
 MESSAGE_SUBST+=                RCD_SCRIPTS=${RCD_SCRIPTS} \
                        RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
diff -r 8ca316d83a33 -r be11db8f402f mail/qpopper/Makefile.common
--- a/mail/qpopper/Makefile.common      Mon Jun 13 12:37:52 2005 +0000
+++ b/mail/qpopper/Makefile.common      Mon Jun 13 16:53:47 2005 +0000
@@ -1,34 +1,15 @@
-# $NetBSD: Makefile.common,v 1.16 2005/06/01 21:12:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/06/13 16:53:47 taca Exp $
 
-QPOPPER_MASTER_SITES=  ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
+QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
                        http://core.ring.gr.jp/archives/net/mail/qpopper/
 QPOPPER_HOMEPAGE=      http://www.eudora.com/products/unsupported/qpopper/
-
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --libexecdir=${LOCALBASE}/libexec \
-                       --sysconfdir=${LOCALBASE}/etc \
-                       --enable-apop=${QPOPPER_APOP_AUTH} \
-                       --enable-popuid=${QPOPPER_USER} \
-                       --enable-log-facility=LOG_${QPOPPER_FAC} \
-                       --disable-update-abort --without-gdbm
+QPOPPER_PATCHSITES+=   http://www.imasy.or.jp/~ume/ipv6/
+QPOPPER_PATCHFILES=    qpopper4.0.8-ipv6-20050515.diff.gz
 
 VERSION=               4.0.8
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-QPOPPER_USER?=         pop
-QPOPPER_GROUP?=                mail
 QPOPPER_FAC?=          LOCAL1
-QPOPPER_APOP_AUTH?=    ${PKG_SYSCONFDIR}/apop.auth
-DB_SUFFIX?=            db
 
-PATCH_SITES=           http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=            qpopper4.0.8-ipv6-20050515.diff.gz
-PATCH_DIST_STRIP=      -p1
-
-.if defined(QPOPPER_SPOOL_DIR)
-CONFIGURE_ARGS+=       --enable-spool-dir=${QPOPPER_SPOOL_DIR}
-.endif
-
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR} \
+                       --enable-log-facility=LOG_${QPOPPER_FAC}
 LIBS+=                 ${LDFLAGS}