From 59da6c89d89015f3e9f5132e557490c7a32f53fe Mon Sep 17 00:00:00 2001
From: spz <spz@pkgsrc.org>
Date: Tue, 2 Nov 2010 08:01:08 +0000
Subject: one change to PKG_SYSCONFDIR too few, fixed

---
 mail/majordomo/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'mail/majordomo')

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 4c49bf86332..368a680bcd3 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/10/30 23:48:36 spz Exp $
+# $NetBSD: Makefile,v 1.37 2010/11/02 08:01:08 spz Exp $
 
 DISTNAME=		majordomo-1.94.5
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.sgi.com/other/majordomo/1.94.5/ \
 			ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/
@@ -30,9 +30,13 @@ MAKE_FILE=		Makefile.netbsd
 
 .include "../../mk/bsd.prefs.mk"
 
+PKG_SYSCONFSUBDIR=	majordomo
+CONF_FILES+=		${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR}/aliases
+CONF_FILES+=		${EXAMPLEDIR}/majordomo.cf ${PKG_SYSCONFDIR}/majordomo.cf
+
 MAJORDOMO_HOMEDIR?=	${VARBASE}/majordomo
 MAJORDOMO_TMPDIR?=	${VARBASE}/majordomo/tmp
-MAJORDOMO_CF?=		${PREFIX}/etc/majordomo/majordomo.cf
+MAJORDOMO_CF?=		${PKG_SYSCONFDIR}/majordomo.cf
 MAJORDOMO_USER?=	majordom
 MAJORDOMO_GROUP?=	majordom
 
@@ -42,10 +46,6 @@ PKG_HOME.${MAJORDOMO_USER}=	${MAJORDOMO_HOMEDIR}
 PKG_GROUPS_VARS+=	MAJORDOMO_GROUP
 PKG_USERS_VARS+=	MAJORDOMO_USER
 
-PKG_SYSCONFSUBDIR=	majordomo
-CONF_FILES+=		${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR}/aliases
-CONF_FILES+=		${EXAMPLEDIR}/majordomo.cf ${PKG_SYSCONFDIR}/majordomo.cf
-
 MESSAGE_SUBST+=		HOME=${MAJORDOMO_HOMEDIR}			\
 			MAJORDOMO_CF=${MAJORDOMO_CF}		\
 			MAJORDOMO_USER=${MAJORDOMO_USER}		\
-- 
cgit v1.2.3