Make this more binary package friendly by not sticking stuff into

/etc/ppp, but into share/examples/xtel. Add DESTDIR support.

5 files changed, 66 insertions, 24 deletions

diff --git a/comms/xtel/MESSAGE b/comms/xtel/MESSAGE
index df50f08baf1..5b9aeeab3b7 100644
--- a/comms/xtel/MESSAGE
+++ b/comms/xtel/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/07/15 23:04:38 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2009/02/07 22:06:06 joerg Exp $
 
 Make sure there is a symbolic link from your modem device to /dev/modem.
 You may also have to adjust $X11BASE}/lib/X11/xtel/xtel.lignes for your
@@ -9,5 +9,7 @@ You also have to add:
 to /etc/services and
  xtel            stream  tcp     nowait  root    $X11BASE}/bin/xteld  xteld
 to /etc/inetd.conf
+The default configuration files for iminitel can be found in
+${PREFIX}/share/examples/xtel.
 
 ===========================================================================
diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile
index dc18b9c7810..61206edfa95 100644
--- a/comms/xtel/Makefile
+++ b/comms/xtel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/11/10 17:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/07 22:06:06 joerg Exp $
 #
 
 DISTNAME=	xtel-3.3.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	comms x11
 MASTER_SITES=	http://pficheux.free.fr/xtel/download/
 
@@ -10,12 +10,19 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://pficheux.free.fr/xtel/
 COMMENT=	Minitel(r) emulator
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_IMAKE=	YES
 USE_TOOLS+=	mkfontdir bdftopcf
 
 FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/xtel
 REQD_DIRS=	${PREFIX}/lib/X11/fonts/xtel
 
+INSTALLATION_DIRS=	share/examples/xtel
+INSTALL_MAKE_FLAGS=	PPPDIR=${PREFIX}/share/examples/xtel
+
+SPECIAL_PERMS+=		bin/mdmdetect ${SETUID_ROOT_PERMS}
+
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/comms/xtel/PLIST b/comms/xtel/PLIST
index 5ff23bf573d..2532b02f9be 100644
--- a/comms/xtel/PLIST
+++ b/comms/xtel/PLIST
@@ -1,36 +1,43 @@
-@comment $NetBSD: PLIST,v 1.5 2008/06/11 19:43:38 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/02/07 22:06:06 joerg Exp $
 bin/install_iminitel
 bin/make_xtel_lignes
 bin/mdmdetect
 bin/xtel
 bin/xteld
-lib/X11/xtel/xtel.lignes
-lib/X11/xtel/xtel.services
-lib/X11/xtel/modem.list
-lib/X11/xtel/connect_iminitel
 lib/X11/app-defaults/XTel
 lib/X11/app-defaults/XTel-msg
 lib/X11/fonts/xtel/fonts.alias
 lib/X11/fonts/xtel/fonts.scale
-lib/X11/fonts/xtel/g08x10.pcf.gz
-lib/X11/fonts/xtel/g08x20.pcf.gz
 lib/X11/fonts/xtel/g016x10.pcf.gz
 lib/X11/fonts/xtel/g016x20.pcf.gz
-lib/X11/fonts/xtel/g032x20.pcf.gz
 lib/X11/fonts/xtel/g016x40.pcf.gz
+lib/X11/fonts/xtel/g032x20.pcf.gz
 lib/X11/fonts/xtel/g032x40.pcf.gz
-lib/X11/fonts/xtel/g18x10.pcf.gz
-lib/X11/fonts/xtel/g116x20.pcf.gz
-lib/X11/fonts/xtel/g1s8x10.pcf.gz
-lib/X11/fonts/xtel/g1s16x20.pcf.gz
-lib/X11/fonts/xtel/g0s8x10.pcf.gz
-lib/X11/fonts/xtel/g0s8x20.pcf.gz
+lib/X11/fonts/xtel/g08x10.pcf.gz
+lib/X11/fonts/xtel/g08x20.pcf.gz
 lib/X11/fonts/xtel/g0s16x10.pcf.gz
 lib/X11/fonts/xtel/g0s16x20.pcf.gz
-lib/X11/fonts/xtel/g0s32x20.pcf.gz
 lib/X11/fonts/xtel/g0s16x40.pcf.gz
+lib/X11/fonts/xtel/g0s32x20.pcf.gz
 lib/X11/fonts/xtel/g0s32x40.pcf.gz
+lib/X11/fonts/xtel/g0s8x10.pcf.gz
+lib/X11/fonts/xtel/g0s8x20.pcf.gz
+lib/X11/fonts/xtel/g116x20.pcf.gz
+lib/X11/fonts/xtel/g18x10.pcf.gz
+lib/X11/fonts/xtel/g1s16x20.pcf.gz
+lib/X11/fonts/xtel/g1s8x10.pcf.gz
 lib/X11/fonts/xtel/xteldigit.pcf.gz
-${IMAKE_MAN_DIR}/xtel.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xteld.${IMAKE_MANNEWSUFFIX}
+lib/X11/xtel/connect_iminitel
+lib/X11/xtel/modem.list
+lib/X11/xtel/xtel.lignes
+lib/X11/xtel/xtel.services
+man/cat1/xtel.0
+man/cat1/xteld.0
+share/examples/xtel/chat-iminitel
+share/examples/xtel/ip-down.iminitel
+share/examples/xtel/ip-up.iminitel
+share/examples/xtel/peers/iminitel
+@dirrm share/examples/xtel/peers
+@dirrm share/examples/xtel
 @dirrm lib/X11/xtel
+@dirrm lib/X11/fonts/xtel
diff --git a/comms/xtel/distinfo b/comms/xtel/distinfo
index 945ae1251f0..7b09c0d71c9 100644
--- a/comms/xtel/distinfo
+++ b/comms/xtel/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.5 2007/08/08 16:50:26 joerg Exp $
+$NetBSD: distinfo,v 1.6 2009/02/07 22:06:06 joerg Exp $
 
 SHA1 (xtel-3.3.0.tar.gz) = 7ee5a5afa20bea46e08c346605c53cdd32d69dc9
 RMD160 (xtel-3.3.0.tar.gz) = 0ba51e9129b24db33ac96cff23ffc88d3f13b653
 Size (xtel-3.3.0.tar.gz) = 309426 bytes
 SHA1 (patch-aa) = 648ff6a6a1bffd836a28abed1f0da5e781d61d53
-SHA1 (patch-ab) = 754e2e2cf0931f83d18c737086006e079e6f668d
+SHA1 (patch-ab) = 991cd916bbb4c20c71214d4d74a43736940fd5ce
 SHA1 (patch-ac) = 696f513b24a3b4a36e1f49f7fc72a20f1efd57cb
 SHA1 (patch-ad) = 95cd5a8c3e421d711f9fd0ad502aa33e92273e0f
 SHA1 (patch-ae) = ece76180605a5310044ff06506fd298f3dde3234
 SHA1 (patch-af) = c52f5b39da50c350ac3ce929b3f77eafdce4942c
 SHA1 (patch-ag) = 6addd47ca368ed78011162b0b843124329909fc1
 SHA1 (patch-ah) = 18f454bba7898a4d80f68215e7b6995d2ba26a71
+SHA1 (patch-ai) = 7ee6020f7cbf0f53be43c8aa264958fc1cab6322
diff --git a/comms/xtel/patches/patch-ab b/comms/xtel/patches/patch-ab
index 39e87264b46..fe713f4bbc2 100644
--- a/comms/xtel/patches/patch-ab
+++ b/comms/xtel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2006/01/02 16:17:09 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2009/02/07 22:06:06 joerg Exp $
 
---- Imakefile.orig	2001-02-12 16:33:01.000000000 +0000
+--- Imakefile.orig	2001-02-12 17:33:01.000000000 +0100
 +++ Imakefile
 @@ -26,7 +26,7 @@ NETWORKCFLAGS = -DNO_NETWORK
  #ifdef NO_TERMIO
@@ -29,3 +29,28 @@ $NetBSD: patch-ab,v 1.2 2006/01/02 16:17:09 joerg Exp $
  		  '-DXTEL_LIBDIR="$(LIBDIR)/xtel"'
  
  
+@@ -241,19 +241,12 @@ clean::
+ InstallManPage(xteld,$(MANDIR))
+ 
+ #ifdef INSTALLDEMON
+-InstallProgram(xteld, $(BINDIR))
+-InstallProgramWithFlags(mdmdetect, $(BINDIR), $(INSTUIDFLAGS))
++InstallProgram(xteld,$(BINDIR))
++InstallProgramWithFlags(mdmdetect,$(BINDIR),$(INSTUIDFLAGS))
+ InstallNamedProg(make_xtel_lignes.sh,make_xtel_lignes,$(BINDIR))
+-
+-install::
+-	@if [ -r $(LIBDIR)/xtel/$(XTELLIGNES) ]; then \
+-	cp $(LIBDIR)/xtel/$(XTELLIGNES) $(LIBDIR)/xtel/$(XTELLIGNES).old; fi
+-	@if [ -r $(LIBDIR)/xtel/$(XTELSERVICES) ]; then \
+-	cp $(LIBDIR)/xtel/$(XTELSERVICES) $(LIBDIR)/xtel/$(XTELSERVICES).old; fi
+-
+-InstallNonExecFile($(XTELLIGNES), $(LIBDIR)/xtel)
+-InstallNonExecFile($(XTELSERVICES), $(LIBDIR)/xtel)
+-InstallNonExecFile(modem.list, $(LIBDIR)/xtel)
++InstallNonExecFile($(XTELLIGNES),$(LIBDIR)/xtel)
++InstallNonExecFile($(XTELSERVICES),$(LIBDIR)/xtel)
++InstallNonExecFile(modem.list,$(LIBDIR)/xtel)
+ #endif
+ 
+ SpecialObjectRule(teleinfo.o, teleinfo.c, $(TELE_DEFINES))