From e1c32137863ca21718736a339c3044df97bb13e5 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Sat, 10 Jul 2010 03:00:49 +0000
Subject: [PATCH] Fixes handling of PKG_SYSCONFSUBDIR, PR#43584.

Bump PKGREVISION.
---
 editors/joe/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index cce4fe202595..4b02dc808575 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/06/23 12:52:42 adam Exp $
+# $NetBSD: Makefile,v 1.33 2010/07/10 03:00:49 obache Exp $
 
 DISTNAME=	joe-3.7
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
@@ -12,18 +13,18 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 
-INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/joe
+PKG_SYSCONFSUBDIR=	joe
 
 EGDIR=		${PREFIX}/share/examples/joe
-CONF_FILES=	${EGDIR}/ftyperc ${PKG_SYSCONFDIR}/joe/ftyperc
-CONF_FILES+=	${EGDIR}/jicerc.ru ${PKG_SYSCONFDIR}/joe/jicerc.ru
-CONF_FILES+=	${EGDIR}/jmacsrc ${PKG_SYSCONFDIR}/joe/jmacsrc
-CONF_FILES+=	${EGDIR}/joerc ${PKG_SYSCONFDIR}/joe/joerc
-CONF_FILES+=	${EGDIR}/jpicorc ${PKG_SYSCONFDIR}/joe/jpicorc
-CONF_FILES+=	${EGDIR}/jstarrc ${PKG_SYSCONFDIR}/joe/jstarrc
-CONF_FILES+=	${EGDIR}/rjoerc ${PKG_SYSCONFDIR}/joe/rjoerc
+CONF_FILES=	${EGDIR}/ftyperc ${PKG_SYSCONFDIR}/ftyperc
+CONF_FILES+=	${EGDIR}/jicerc.ru ${PKG_SYSCONFDIR}/jicerc.ru
+CONF_FILES+=	${EGDIR}/jmacsrc ${PKG_SYSCONFDIR}/jmacsrc
+CONF_FILES+=	${EGDIR}/joerc ${PKG_SYSCONFDIR}/joerc
+CONF_FILES+=	${EGDIR}/jpicorc ${PKG_SYSCONFDIR}/jpicorc
+CONF_FILES+=	${EGDIR}/jstarrc ${PKG_SYSCONFDIR}/jstarrc
+CONF_FILES+=	${EGDIR}/rjoerc ${PKG_SYSCONFDIR}/rjoerc
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"