This adds a mk.conf setting for the xisp "dialer" group. I call it

"DIALER_GROUP" instead of "XISP_GROUP" as maybe it can be used for other
packages also later.

This is for PR pkg/19566.

Update MESSAGE to use LOCALBASE instead of X11BASE. (From
Manuel Bouyer)

And update MESSAGE to not hardcode the "group".

This also updates patch-ac because of conflicting types for fprintf and
printf. I don't know how this package built before on NetBSD recently.

Also this patch honors VARBASE and PKGMANDIR.

Thank you Manuel Bouyer for testing this.

5 files changed, 28 insertions, 21 deletions

diff --git a/comms/xisp/MESSAGE b/comms/xisp/MESSAGE
index c0ff46ead77..1717bbcd4f8 100644
--- a/comms/xisp/MESSAGE
+++ b/comms/xisp/MESSAGE
@@ -1,17 +1,17 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 20:44:44 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2006/10/06 22:14:44 reed Exp $
 
 Please make sure the file /etc/ppp/options exists, and there is a symbolic
 link from your modem device to /dev/modem.
 
 You need to install:
 
-        ${X11BASE}/share/examples/xisp/ip-down            to /etc/ppp
-        ${X11BASE}/share/examples/xisp/ip-up              to /etc/ppp
-        ${X11BASE}/share/examples/xisp/peers/xisp_modem   to /etc/ppp/peers
-        ${X11BASE}/share/examples/xisp/peers/xisp_dialer  to /etc/ppp/peers
+        ${LOCALBASE}/share/examples/xisp/ip-down            to /etc/ppp
+        ${LOCALBASE}/share/examples/xisp/ip-up              to /etc/ppp
+        ${LOCALBASE}/share/examples/xisp/peers/xisp_modem   to /etc/ppp/peers
+        ${LOCALBASE}/share/examples/xisp/peers/xisp_dialer  to /etc/ppp/peers
 
-and make sure the file ownerships are set for user "root" and group "dialer"
-to be able to fully use this package.
+and make sure the file ownerships are set for user "root" and group
+"${DIALER_GROUP}" to be able to fully use this package.
 
 ===========================================================================
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index abd9d560685..247a7450e35 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:29:05 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/10/06 22:14:44 reed Exp $
 #
 
 DISTNAME=		xisp-2.7p1
-PKGREVISION=	2
+PKGREVISION=		3
 CATEGORIES=		comms x11
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=system/network/serial/} \
 			http://xisp.hellug.gr/release/ \
@@ -12,6 +12,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://xisp.hellug.gr/
 COMMENT=		User-friendly X11 interface to pppd/chat
 
+PKG_GROUPS=		${DIALER_GROUP}
+BUILD_DEFS+=		DIALER_GROUP
+MAKE_ENV+=		DIALER_GROUP="${DIALER_GROUP}"
+MAKE_ENV+=		VARBASE=${VARBASE:Q}
+MESSAGE_SUBST+=		DIALER_GROUP=${DIALER_GROUP}
+# XXX TODO: maybe do MODEM_DEV also?
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xisp/
diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo
index 3846c369b3c..74c383444e4 100644
--- a/comms/xisp/distinfo
+++ b/comms/xisp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2006/02/22 16:13:48 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/10/06 22:14:44 reed Exp $
 
 SHA1 (xisp-2.7p1.tar.gz) = 158db1ad0f9820da33b5f51fa5110b0a9374ba2f
 RMD160 (xisp-2.7p1.tar.gz) = 47a4c6ebe0c7e5a1971f2934f7371370e7cbdfe2
 Size (xisp-2.7p1.tar.gz) = 294492 bytes
-SHA1 (patch-aa) = d3140e899164e6d47c63b043266d8508db27de1f
+SHA1 (patch-aa) = 827a1e0bdd66d75e20d7526a0b5d68942fec207f
 SHA1 (patch-ab) = 19f3a0ef7fd776108d7796917019ffcc28576c8f
-SHA1 (patch-ac) = 5324b027c6bcc687bce8a91dd5e8d4c7b2acf366
+SHA1 (patch-ac) = 14f251acd447c2502322c55c912fb66561e91555
diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa
index faedcce8aa8..9c908c8e0c8 100644
--- a/comms/xisp/patches/patch-aa
+++ b/comms/xisp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2006/02/22 16:13:48 joerg Exp $
+$NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
 
 --- Makefile.orig	2003-06-28 14:03:03.000000000 +0000
 +++ Makefile
@@ -81,9 +81,9 @@ $NetBSD: patch-aa,v 1.9 2006/02/22 16:13:48 joerg Exp $
 +BINX11     = $(X11PREFIX)/bin
 +USRLOCAL   = $(BINX11)
 +SBINDIR    = /usr/sbin
-+VARRUN     = /var/run
++VARRUN     = $(VARBASE)/run
 +USRLIBPPP  = $(PREFIX)/libexec
-+MANDIR     = $(PREFIX)/man/man1
++MANDIR     = $(PREFIX)/$(PKGMANDIR)/man1
 +ETCPPP     = /etc/ppp
 +OPTSDIR    = $(ETCPPP)
  #INSTPPPDIR = $(ETCPPP)
@@ -98,9 +98,9 @@ $NetBSD: patch-aa,v 1.9 2006/02/22 16:13:48 joerg Exp $
 -#LINKFORMS  = -L$(LIBFORMS) -lforms
 -#INSTALL    = /usr/bin/install
 +INSTPPPDIR = $(PREFIX)/share/examples/xisp
-+PPPDLCKDIR = /var/spool/lock
++PPPDLCKDIR = $(VARBASE)/spool/lock
 +DESTDIR    = 
-+GROUP      = dialer
++GROUP      = $(DIALER_GROUP)
 +CCFLAGS    = -Wall -O
 +EXTRADEFS  = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
 +.if ${OPSYS} == "DragonFly"
diff --git a/comms/xisp/patches/patch-ac b/comms/xisp/patches/patch-ac
index ff8c7dcbc33..83fcd8fa051 100644
--- a/comms/xisp/patches/patch-ac
+++ b/comms/xisp/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2006/02/22 16:13:48 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2006/10/06 22:14:44 reed Exp $
 
---- xispid.c.orig	2006-02-22 16:06:00.000000000 +0000
-+++ xispid.c
+--- xispid.c.orig	2003-06-28 09:03:03.000000000 -0500
++++ xispid.c	2006-10-05 17:22:58.000000000 -0500
 @@ -42,7 +42,7 @@
   #include <limits.h>
  #endif
  
 -#if !defined(__FreeBSD__) && !defined(linux) /* setgrent() is int in FreeBSD */
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(linux) /* setgrent() is int in FreeBSD */
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(linux) /* setgrent() is int in FreeBSD */
  struct passwd *getpwuid();
  struct group *getgrgid(), *getgrent();
  uid_t getuid(), geteuid();