DESTDIR support. Fix varbase handling. Bump revision.

3 files changed, 36 insertions, 18 deletions

diff --git a/chat/inspircd12/Makefile b/chat/inspircd12/Makefile
index b94ed95e0a6..96ff5d55ee5 100644
--- a/chat/inspircd12/Makefile
+++ b/chat/inspircd12/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/03/20 21:32:40 adrianp Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/25 21:38:44 joerg Exp $
 #
 
 DISTNAME=	InspIRCd-1.2.0
 PKGNAME=	${DISTNAME:S/InspIRCd/inspircd/}
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://www.inspircd.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.inspircd.org/
 COMMENT=	Modular C++ IRC Daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	inspircd<1.2.0
 
 USE_TOOLS+=		perl:build gmake pkg-config
@@ -117,19 +120,16 @@ post-build:
 .  endfor
 .endif
 
+INSTALLATION_DIRS+=	bin ${EGDIR}/aliases ${EGDIR}/sql
+
+CONF_FILES_PERMS+=	/dev/null ${VARBASE}/log/inspircd.log \
+			${INSPIRCD_USER} ${INSPIRCD_GROUP} 0640
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}/sql
-	${INSTALL_DATA_DIR} ${EGDIR}/aliases
-
-	${INSTALL_DATA} ${WRKSRC}/conf/inspircd.* ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/modules.* ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/aliases/*.example ${EGDIR}/aliases
-	${INSTALL_DATA} ${WRKSRC}/conf/inspircd.conf.example ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/extras/m_*.sql ${EGDIR}/sql
-
-	${TOUCH} ${VARBASE}/log/inspircd.log
-	${CHOWN} ${INSPIRCD_USER}:${INSPIRCD_GROUP} ${VARBASE}/log/inspircd.log
-	${CHMOD} 0640 ${VARBASE}/log/inspircd.log
+	${INSTALL_DATA} ${WRKSRC}/conf/inspircd.* ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/modules.* ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/aliases/*.example ${DESTDIR}${EGDIR}/aliases
+	${INSTALL_DATA} ${WRKSRC}/conf/inspircd.conf.example ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/extras/m_*.sql ${DESTDIR}${EGDIR}/sql
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/inspircd12/distinfo b/chat/inspircd12/distinfo
index d08b4f76977..16b3990ee1e 100644
--- a/chat/inspircd12/distinfo
+++ b/chat/inspircd12/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2009/08/29 22:42:46 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2010/06/25 21:38:44 joerg Exp $
 
 SHA1 (InspIRCd-1.2.0.tar.bz2) = 2973dc7e83dc2334c18e7fcd6d95a22da44b256e
 RMD160 (InspIRCd-1.2.0.tar.bz2) = 1f74336bf5e30b89e0baa306c22f0b37fbf339bd
 Size (InspIRCd-1.2.0.tar.bz2) = 635384 bytes
 SHA1 (patch-aa) = 16c092692872173dede40925be51c4a391491a03
-SHA1 (patch-ab) = 4c69874702dc6bacbb4eb86fd2ea3a15dacd74ae
+SHA1 (patch-ab) = 9548488202c5c6dd725c3eba28921961b67dd15b
 SHA1 (patch-ac) = af385c0640ca7101afb8aefbeea3860b3f3bb970
 SHA1 (patch-ad) = 8dd2a589ab639d9d4ecfc4477aa5fb3f613761e7
diff --git a/chat/inspircd12/patches/patch-ab b/chat/inspircd12/patches/patch-ab
index d5797a17916..3daa4d087bf 100644
--- a/chat/inspircd12/patches/patch-ab
+++ b/chat/inspircd12/patches/patch-ab
@@ -1,7 +1,25 @@
-$NetBSD: patch-ab,v 1.2 2009/08/04 22:17:36 adrianp Exp $
+$NetBSD: patch-ab,v 1.3 2010/06/25 21:38:44 joerg Exp $
 
---- .Makefile.inc.orig	2009-06-07 03:58:07.000000000 +0100
+--- .Makefile.inc.orig	2009-06-07 02:58:07.000000000 +0000
 +++ .Makefile.inc
+@@ -22,12 +22,12 @@ NICEFLAGS += -I$(COMPILE_ROOT)/include
+ CC = @CC@
+ FLAGS = $(NICEFLAGS) -pedantic
+ LDLIBS = @LDLIBS@
+-BASE = "@BASE_DIR@"
+-CONPATH = "@CONFIG_DIR@"
+-MODPATH = "@MODULE_DIR@"
+-BINPATH = "@BINARY_DIR@"
++BASE = "${DESTDIR}@BASE_DIR@"
++CONPATH = "${DESTDIR}@CONFIG_DIR@"
++MODPATH = "${DESTDIR}@MODULE_DIR@"
++BINPATH = "${DESTDIR}@BINARY_DIR@"
+ LAUNCHDPATH = "/System/Library/LaunchDaemons"
+-LIBPATH = "@LIBRARY_DIR@"
++LIBPATH = "${DESTDIR}@LIBRARY_DIR@"
+ MODULES = @MODULES@
+ INSTMODE = 0755
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
 @@ -96,7 +96,6 @@ finishmessage: ircd mods
  install: ircd mods@EXTRA_DIR@
  	@-install -d -m $(INSTMODE) $(BASE)