Subject: pkg/18982: Make chat/irssi honor PKG_SYSCONFDIR
To: None <gnats-bugs@gnats.netbsd.org>
From: Julio Merino <jmmv@menta.net>
List: netbsd-bugs
Date: 11/08/2002 23:32:26
>Number: 18982
>Category: pkg
>Synopsis: Make chat/irssi honor PKG_SYSCONFDIR
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Fri Nov 08 14:28:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Julio Merino
>Release: NetBSD 1.6K
>Organization:
HispaBSD
>Environment:
System: NetBSD darkstar.local 1.6K NetBSD 1.6K (DARKSTAR) #130: Thu Nov 7 23:22:44 CET 2002 jmmv@darkstar.local:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
chat/irssi currently installs a file inside PREFIX, which is
etc/irssi.conf. This file should be installed inside PKG_SYSCONFDIR.
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile 2002/09/25 17:26:04 1.14
+++ Makefile 2002/11/08 22:24:53
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.14 2002/09/25 17:26:04 wiz Exp $
DISTNAME= irssi-0.8.5
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/irssi-0.8.5
CATEGORIES= chat
MASTER_SITES= http://real.irssi.org/files/
@@ -18,8 +19,12 @@
CONFIGURE_ARGS+= --with-terminfo \
--enable-ipv6 \
- --without-ncurses
+ --without-ncurses \
+ --sysconfdir=${PKG_SYSCONFDIR}
+EGDIR= ${PREFIX}/share/examples/irssi
+CONF_FILES= ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
+
.include "../../mk/bsd.prefs.mk"
.if defined(IRSSI_USE_PERL) && (${IRSSI_USE_PERL} == "YES")
@@ -37,4 +42,5 @@
.endif
.include "../../devel/glib/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/PLIST,v
retrieving revision 1.3
diff -u -u -r1.3 PLIST
--- PLIST 2002/03/20 00:39:19 1.3
+++ PLIST 2002/11/08 22:24:54
@@ -1,6 +1,5 @@
@comment $NetBSD: PLIST,v 1.3 2002/03/20 00:39:19 hubertf Exp $
bin/irssi
-etc/irssi.conf
share/doc/irssi/botnet.txt
share/doc/irssi/design.txt
share/doc/irssi/faq.html
@@ -12,6 +11,7 @@
share/doc/irssi/special_vars.txt
share/doc/irssi/startup-HOWTO.html
share/doc/irssi/startup-HOWTO.txt
+share/examples/irssi/irssi.conf
share/irssi/help/action
share/irssi/help/admin
share/irssi/help/alias
@@ -147,4 +147,5 @@
@dirrm share/irssi/scripts
@dirrm share/irssi/help
@dirrm share/irssi
+@dirrm share/examples/irssi
@dirrm share/doc/irssi
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/irssi/distinfo,v
retrieving revision 1.10
diff -u -u -r1.10 distinfo
--- distinfo 2002/06/20 03:29:29 1.10
+++ distinfo 2002/11/08 22:24:54
@@ -3,3 +3,4 @@
SHA1 (irssi-0.8.5.tar.bz2) = c36ed600d2bb2d7593f0f6c11672dffe061fa5d6
Size (irssi-0.8.5.tar.bz2) = 738657 bytes
SHA1 (patch-aa) = 45d8161733f58ab3733022c823933bb1cc93a8e2
+SHA1 (patch-ab) = 08ad1c6655ea86b0869927c365dbc736fe90b8c0
And add this new patch as patches/patch-ab:
$NetBSD$
--- Makefile.in.orig Wed Jun 19 19:09:53 2002
+++ Makefile.in
@@ -113,7 +113,7 @@ sedpath = @sedpath@
SUBDIRS = src $(SERVERTEST) docs scripts
-confdir = $(sysconfdir)
+confdir = $(datadir)/examples/@PACKAGE@
conf_DATA = irssi.conf
themedir = $(datadir)/irssi/themes
>Release-Note:
>Audit-Trail:
>Unformatted: