Fix the package configuration of the following packages so that they

will install Perl modules into the "vendor" directories:

	chat/vicq		math/udunits
	databases/rrdtool	mbone/beacon
	devel/p5-subversion

Bump their PKGREVISIONs.

13 files changed, 65 insertions, 20 deletions

diff --git a/chat/vicq/Makefile b/chat/vicq/Makefile
index 7f2b58f40b0..cb632a0dcbd 100644
--- a/chat/vicq/Makefile
+++ b/chat/vicq/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/08/06 06:19:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/08 18:13:13 jlam Exp $
 
 DISTNAME=	vicq-0.4.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	chat
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/vicq/distinfo b/chat/vicq/distinfo
index 20d88424b90..ea62098f373 100644
--- a/chat/vicq/distinfo
+++ b/chat/vicq/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 15:59:14 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/08/08 18:13:13 jlam Exp $
 
 SHA1 (vicq-0.4.1.tar.bz2) = 824f49adb0f17d3f8c1593517db80fed5c70353c
 RMD160 (vicq-0.4.1.tar.bz2) = 4c1e24baf2ae3aa8206eb9cd611ba6dfed9efce5
 Size (vicq-0.4.1.tar.bz2) = 54292 bytes
 SHA1 (patch-aa) = 66c5203a16013952584ed20b88be26f75c7dda0f
 SHA1 (patch-ab) = 92592ab9aa43d33546a6ab77ebd3a59d76366a7c
+SHA1 (patch-ac) = ef9fba66af10197d8975076c3caaf310c8549175
diff --git a/chat/vicq/patches/patch-ac b/chat/vicq/patches/patch-ac
new file mode 100644
index 00000000000..c11e982843f
--- /dev/null
+++ b/chat/vicq/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2005/08/08 18:13:13 jlam Exp $
+
+--- Net/vICQ/install.sh.orig	2002-04-09 12:32:33.000000000 -0400
++++ Net/vICQ/install.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-output=`perl Makefile.PL 2>&1`;
++output=`perl Makefile.PL INSTALLDIRS=vendor 2>&1`;
+ if [ $? != 0 ]; then
+ 	echo  "Command: [perl Makefile.PL]"
+ 	echo  "$output";
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 0394c0211e1..4e4423a9932 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2005/08/06 06:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/08 18:13:13 jlam Exp $
 #
 
 DISTNAME=	rrdtool-1.2.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -19,7 +19,8 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 
-CONFIGURE_ARGS= --enable-shared --enable-perl-site-install
+CONFIGURE_ARGS=		--enable-shared
+CONFIGURE_ARGS+=	--with-perl-options=${MAKE_PARAMS:Q}
 
 PERL5_CONFIGURE=	NO
 PERL5_PACKLIST+= 	auto/RRDp/.packlist
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 6a3f8763fe5..4e9f6d4678e 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/08/06 06:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/08 18:13:13 jlam Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Perl bindings for Subversion
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index b29710ebc85..5369e28e684 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.46 2005/07/30 22:05:53 rillig Exp $
+$NetBSD: distinfo,v 1.47 2005/08/08 18:13:13 jlam Exp $
 
 SHA1 (subversion-1.2.1.tar.gz) = 88d3dd6e8c191933c8966faa5c69dc4ee84411cf
 RMD160 (subversion-1.2.1.tar.gz) = 7768a29ad96746285cb4ed9b32fc54c07f97f4f4
 Size (subversion-1.2.1.tar.gz) = 8847778 bytes
-SHA1 (patch-ad) = b2975d9b9aebd045cc7db22f79e03b2efbbbe285
+SHA1 (patch-ad) = 38bc62998284e5c7393fdc450aee4801176a0693
 SHA1 (patch-ag) = faa890d811ca2d5d0240647fac6d115e714dc2a3
 SHA1 (patch-ah) = 195aeabc711b229cb402312357cad143c19d7b53
 SHA1 (patch-ai) = 9b209d2d436a5ed3ac2ca02a2dac80c8cad0e98c
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
index bb7d1c062d9..5182f3e47f3 100644
--- a/devel/subversion/patches/patch-ad
+++ b/devel/subversion/patches/patch-ad
@@ -1,10 +1,13 @@
-$NetBSD: patch-ad,v 1.10 2005/05/23 22:58:26 epg Exp $
+$NetBSD: patch-ad,v 1.11 2005/08/08 18:13:13 jlam Exp $
 
---- Makefile.in.orig	2005-04-11 08:57:22.000000000 -0400
+--- Makefile.in.orig	2005-05-09 01:56:09.000000000 -0400
 +++ Makefile.in
-@@ -577,7 +577,7 @@ install-swig-rb: install-swig-rb-lib
+@@ -575,9 +575,9 @@ install-swig-py: install-swig-py-lib
+ install-swig-rb: install-swig-rb-lib
+ 
  $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
+-	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
++	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
  
 -swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
 +swig-pl_DEPS = libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index a184a0a97ce..e58262523b0 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/08/06 06:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/08 18:13:13 jlam Exp $
 
 DISTNAME=		udunits
 PKGNAME=		udunits-1.12.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		math devel
 MASTER_SITES=		http://www.unidata.ucar.edu/packages/udunits/
 EXTRACT_SUFX=		.tar.Z
diff --git a/math/udunits/distinfo b/math/udunits/distinfo
index ccb4c2974b6..b5b05b82e7f 100644
--- a/math/udunits/distinfo
+++ b/math/udunits/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 12:06:58 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/08/08 18:13:13 jlam Exp $
 
 SHA1 (udunits-1.12.1/udunits.tar.Z) = ee37ca61eb1dcf34165b7573cc1645824bd6968d
 RMD160 (udunits-1.12.1/udunits.tar.Z) = fb2f0442673ca47d302782c84ce37b8da1e16535
@@ -6,3 +6,4 @@ Size (udunits-1.12.1/udunits.tar.Z) = 365873 bytes
 SHA1 (patch-aa) = 0998141196898a7bc168fe45c5019586645167f2
 SHA1 (patch-ab) = 9a98e048499d38f8dedba6fb1a169e178dbd77ba
 SHA1 (patch-ac) = 508fafdc724f9b95543dd16c2bd2f0242eb892a8
+SHA1 (patch-ad) = d48978bd66d9ef691cd9c70b057a7e5d8a802fb6
diff --git a/math/udunits/patches/patch-ad b/math/udunits/patches/patch-ad
new file mode 100644
index 00000000000..f771e9bd0a1
--- /dev/null
+++ b/math/udunits/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/08/08 18:13:13 jlam Exp $
+
+--- Makefile.in.orig	2003-08-29 14:27:07.000000000 -0400
++++ Makefile.in
+@@ -68,7 +68,7 @@ $(MANUALS) dummy:
+ @PERL_DISTCLEAN@ dummy:	perl/Makefile
+ 
+ perl/Makefile:		perl/Makefile.PL
+-	-cd perl && $(PERL) Makefile.PL
++	-cd perl && $(PERL) Makefile.PL INSTALLDIRS=vendor
+ 
+ install:	whatis
+ 
diff --git a/mbone/beacon/Makefile b/mbone/beacon/Makefile
index c15c00c5097..ff46494a43e 100644
--- a/mbone/beacon/Makefile
+++ b/mbone/beacon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/08 18:13:13 jlam Exp $
 #
 
 DISTNAME=	beacon-1.1-0
 PKGNAME=	beacon-1.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mbone
 MASTER_SITES=	http://dast.nlanr.net/Projects/Beacon/releases/
 
diff --git a/mbone/beacon/distinfo b/mbone/beacon/distinfo
index f4f2b9ce295..a7cd158ec8d 100644
--- a/mbone/beacon/distinfo
+++ b/mbone/beacon/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/22 21:33:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/08/08 18:13:13 jlam Exp $
 
 SHA1 (beacon-1.1-0.tar.gz) = f6d5e88e00d26e53df8c9742e7454b84d72e0911
 RMD160 (beacon-1.1-0.tar.gz) = efa8097288b110572f5e2f0a1bed5ed8532a28bd
 Size (beacon-1.1-0.tar.gz) = 247815 bytes
+SHA1 (patch-aa) = 30e80b4a0f9dedfd7c4149b3d32d820ac17707c8
diff --git a/mbone/beacon/patches/patch-aa b/mbone/beacon/patches/patch-aa
new file mode 100644
index 00000000000..0bdd11f5ae6
--- /dev/null
+++ b/mbone/beacon/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/08/08 18:13:13 jlam Exp $
+
+--- Net-Multicast-Beacon/Makefile.in.orig	2004-07-13 14:56:28.000000000 -0400
++++ Net-Multicast-Beacon/Makefile.in
+@@ -297,7 +297,7 @@ uninstall-am: uninstall-info-am
+ 	touch $@
+ 
+ Makefile.perl: Makefile.PL
+-	$(PERL) Makefile.PL MAKEFILE=$@
++	$(PERL) Makefile.PL INSTALLDIRS=vendor MAKEFILE=$@
+ 
+ install-data-local:
+ 	$(MAKE) -fMakefile.perl install