Subject: Re: anyone use comms/xisp package?
To: Manuel Bouyer <bouyer@antioche.eu.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: pkgsrc-users
Date: 10/05/2006 17:50:01
> > Anyone available to test a fix for comms/xisp so it has a "dialer" group?
> 
> I can, I'm still using it

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 othert 
packages too later. This is for PR 19566.

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.

(On my system it has another problem both libforms and xisp don't set 
RPATH for the X libraries. This needs to be fixed, but maybe not needed 
for you.)

Index: mk/defaults/mk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/mk.conf,v
retrieving revision 1.131
diff -u -r1.131 mk.conf
--- mk/defaults/mk.conf	27 Sep 2006 15:18:15 -0000	1.131
+++ mk/defaults/mk.conf	5 Oct 2006 22:46:05 -0000
@@ -687,6 +687,13 @@
 # Possible:  /dev/your_favorite_serial_device
 # Default: defaults for various machine_archs are set in mk/platform/${OPSYS}.mk
 
+DIALER_GROUP?= dialer
+# Used in the xisp package to specify the default group for the
+# xisp binaries. Also the modem device and pppd and chat should
+# have access permissions by this group.
+# Possible: dialer, dip, uucp, root, dialout, or any other group.
+# Default: dialer  
+
 DT_LAYOUT?= US
 # Used by dt package to specify the keyboard layout.
 # Possible: US, FI, FR, GER, DV
Index: comms/xisp/MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/MESSAGE,v
retrieving revision 1.1
diff -u -r1.1 MESSAGE
--- comms/xisp/MESSAGE	31 Oct 2001 20:44:44 -0000	1.1
+++ comms/xisp/MESSAGE	5 Oct 2006 22:46:05 -0000
@@ -11,7 +11,7 @@
         ${X11BASE}/share/examples/xisp/peers/xisp_modem   to /etc/ppp/peers
         ${X11BASE}/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.
 
 ===========================================================================
Index: comms/xisp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- comms/xisp/Makefile	4 Mar 2006 21:29:05 -0000	1.25
+++ comms/xisp/Makefile	5 Oct 2006 22:46:05 -0000
@@ -2,7 +2,7 @@
 #
 
 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 @@
 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/
Index: comms/xisp/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- comms/xisp/distinfo	22 Feb 2006 16:13:48 -0000	1.8
+++ comms/xisp/distinfo	5 Oct 2006 22:46:05 -0000
@@ -3,6 +3,6 @@
 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
Index: comms/xisp/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/patches/patch-aa,v
retrieving revision 1.9
diff -u -r1.9 patch-aa
--- comms/xisp/patches/patch-aa	22 Feb 2006 16:13:48 -0000	1.9
+++ comms/xisp/patches/patch-aa	5 Oct 2006 22:46:05 -0000
@@ -81,9 +81,9 @@
 +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 @@
 -#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"
Index: comms/xisp/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/comms/xisp/patches/patch-ac,v
retrieving revision 1.3
diff -u -r1.3 patch-ac
--- comms/xisp/patches/patch-ac	22 Feb 2006 16:13:48 -0000	1.3
+++ comms/xisp/patches/patch-ac	5 Oct 2006 22:46:05 -0000
@@ -1,13 +1,13 @@
 $NetBSD: patch-ac,v 1.3 2006/02/22 16:13:48 joerg 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();