Override some directory paths at installation time via the make command

line rather than patching their values directly in the Makefiles.

5 files changed, 8 insertions, 49 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 17bd7dbae3a..7375ad82e11 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/03/14 14:09:35 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/06 02:41:44 jlam Exp $
 
 DISTNAME=		arla-0.41
 PKGREVISION=		3
@@ -48,8 +48,11 @@ SUBST_FILES.paths=	${WRKDIR}/lkm.conf
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_STAGE.paths=	post-patch
 
-EGDIR=		${PREFIX}/share/examples/arla
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
+INSTALL_MAKE_FLAGS+=	lkmdir=${PREFIX:Q}/lkm
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR:Q}
 
+EGDIR=		${PREFIX}/share/examples/arla
 EGFILES=	CellServDB DynRootDB SuidCells ThisCell arla.conf
 
 .for f in ${EGFILES}
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 34d52287ca0..37a68be630f 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.20 2006/03/13 04:29:16 rillig Exp $
+$NetBSD: distinfo,v 1.21 2006/04/06 02:41:44 jlam Exp $
 
 SHA1 (arla-0.41.tar.gz) = ee343833649924d829f547a6fddc88da4f3a3c83
 RMD160 (arla-0.41.tar.gz) = a4c7cdc17559d900b6ac2ede5f0f3cb29fa08b23
 Size (arla-0.41.tar.gz) = 2200301 bytes
 SHA1 (patch-ac) = abee32015e06033a22eebcd914463a3776db7127
-SHA1 (patch-af) = d5a897fbdf2326940fc42a1330f8f712960e9de2
-SHA1 (patch-ah) = d3b9a28d336a2f148613bc1f40cd3c568d4c40ce
+SHA1 (patch-ah) = b2929d05940aa54d4544ea7ae8d95ef5cd5472a1
 SHA1 (patch-ak) = 7cf6a36acc9107458c8165a4c5ff4821fc8a946f
 SHA1 (patch-al) = 6d7af2b8fe990232a5aa684c039dfc565ecebdf8
-SHA1 (patch-at) = 94566c0016e686d29bc65a29b5047654759dec70
 SHA1 (patch-aw) = 0d93bece3c221590b1ca2fb3133128266b460820
 SHA1 (patch-az) = 072c2d9c8a2fea61fc04bff5d0d9fb211bbb67d6
 SHA1 (patch-bi) = 2e8201964c64b128025a752ee7354f0cc8305b1b
diff --git a/net/arla/patches/patch-af b/net/arla/patches/patch-af
deleted file mode 100644
index b9c1a2e2583..00000000000
--- a/net/arla/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.5 2005/12/15 21:28:47 wennmach Exp $
-
-Use correct defaults for pkgsrc.
-
---- conf/Makefile.in.orig	2005-10-28 16:33:38.000000000 +0200
-+++ conf/Makefile.in	2005-12-14 09:49:20.000000000 +0100
-@@ -14,7 +14,8 @@
- CHMOD		= @chmod@
- 
- prefix 		= @prefix@
--sysconfdir	= @sysconfdir@
-+exampledir	= $(prefix)/share/examples/arla
-+sysconfdir	= $(exampledir)
- 
- CONF_FILES	= CellServDB ThisCell SuidCells DynRootDB
- 
- 
diff --git a/net/arla/patches/patch-ah b/net/arla/patches/patch-ah
index 3b10b0c82f9..cb975da1f07 100644
--- a/net/arla/patches/patch-ah
+++ b/net/arla/patches/patch-ah
@@ -1,6 +1,5 @@
-$NetBSD: patch-ah,v 1.5 2005/12/15 21:28:47 wennmach Exp $
+$NetBSD: patch-ah,v 1.6 2006/04/06 02:41:44 jlam Exp $
 
-Install nnpfs_mod.o into $(lkmdir), not $(bindir).
 Don't strip  nnpfs_mod.o while installing.
 
 --- nnpfs/bsd/Makefile.in.orig	2005-11-22 17:53:54.000000000 +0100
@@ -14,12 +13,3 @@ Don't strip  nnpfs_mod.o while installing.
  INSTALL_DATA	= @INSTALL_DATA@
  MKINSTALLDIRS 	= @top_srcdir@/mkinstalldirs
  
-@@ -28,7 +28,7 @@
- libdir 		= @libdir@
- libexecdir 	= @libexecdir@
- bindir 		= @bindir@
--lkmdir 		= @bindir@
-+lkmdir		= $(exec_prefix)/lkm
- transform	= @program_transform_name@
- EXECSUFFIX	= @EXECSUFFIX@
- VARDB		= /var/db
diff --git a/net/arla/patches/patch-at b/net/arla/patches/patch-at
deleted file mode 100644
index 38a9c192f6f..00000000000
--- a/net/arla/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Set up proper path to the LKM for startarla.
-
---- nnpfs/bsd/bin/Makefile.in.orig	2002-09-17 14:54:49.000000000 -0400
-+++ nnpfs/bsd/bin/Makefile.in	2004-12-22 20:39:04.000000000 -0500
-@@ -21,7 +21,7 @@
- libexecdir 	= @libexecdir@
- bindir 		= @bindir@
- sbindir 	= @sbindir@
--lkmdir		= @bindir@
-+lkmdir		= @prefix@/lkm
- mandir		= @mandir@
- transform	= @program_transform_name@
- ARLACACHEDIR	= @ARLACACHEDIR@