Make udunits install its configuration file under the examples directory

and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR.
Fix this package so that it can be cleaned as a regular user.
Bump PKGREVISION to 1.

5 files changed, 44 insertions, 10 deletions

diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index 285fd4d5992..43aa3bbd20e 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/09/29 06:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/24 17:21:03 jmmv Exp $
 
 DISTNAME=		udunits
 PKGNAME=		udunits-1.11.7
+PKGREVISION=		1
 CATEGORIES=		math devel
 MASTER_SITES=		http://www.unidata.ucar.edu/packages/udunits/
 EXTRACT_SUFX=		.tar.Z
@@ -10,13 +11,22 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.unidata.ucar.edu/packages/udunits/
 COMMENT=		Library and program for manipulating units of physical quantities
 
-WRKSRC=			${WRKDIR}/${PKGNAME}/src
-DIST_SUBDIR=		${PKGNAME}
+UDUNITS_PKGNAME:=	${PKGNAME}
+WRKSRC=			${WRKDIR}/${UDUNITS_PKGNAME}/src
+DIST_SUBDIR=		${UDUNITS_PKGNAME}
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-Df2cFortran -Dunix
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/UDUNITS/.packlist
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+EGDIR=			${PREFIX}/share/examples/udunits
+CONF_FILES=		${EGDIR}/udunits.dat ${PKG_SYSCONFDIR}/udunits.dat
+
+post-install:
+	${RM} -rf ${WRKSRC}/perl/blib/lib
 
 .include "../../lang/perl5/buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/udunits/PLIST b/math/udunits/PLIST
index 217fd590cca..fd9ebb5670b 100644
--- a/math/udunits/PLIST
+++ b/math/udunits/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:34:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/24 17:21:03 jmmv Exp $
 bin/udunits
-etc/udunits.dat
 include/udunits.h
 include/udunits.inc
 lib/libudport.a
@@ -10,3 +9,5 @@ man/man1/udunitsperl.1
 man/man3/udunits.3
 man/man3/udunits.3f
 man/man3f/udunits.3f
+share/examples/udunits/udunits.dat
+@dirrm share/examples/udunits
diff --git a/math/udunits/distinfo b/math/udunits/distinfo
index c36cce6a557..c62969f713f 100644
--- a/math/udunits/distinfo
+++ b/math/udunits/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/04/30 14:51:20 jtb Exp $
+$NetBSD: distinfo,v 1.5 2002/12/24 17:21:03 jmmv Exp $
 
 SHA1 (udunits-1.11.7/udunits.tar.Z) = 2d178bad5d2c8ebe1c16960865ea96ce4ced0e3e
 Size (udunits-1.11.7/udunits.tar.Z) = 352699 bytes
-SHA1 (patch-aa) = 4b4b0979f840a6e7f70bf410784f2ef4b3fb0630
+SHA1 (patch-aa) = 0998141196898a7bc168fe45c5019586645167f2
+SHA1 (patch-ab) = 9a98e048499d38f8dedba6fb1a169e178dbd77ba
diff --git a/math/udunits/patches/patch-aa b/math/udunits/patches/patch-aa
index 784f5889da1..afb64bb9175 100644
--- a/math/udunits/patches/patch-aa
+++ b/math/udunits/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2001/04/28 01:20:35 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/24 17:21:04 jmmv Exp $
 
---- port/master.mk.in.orig	Wed Feb  7 03:58:38 2001
+--- port/master.mk.in.orig	Wed Nov 25 17:26:56 1998
 +++ port/master.mk.in
-@@ -387,7 +387,7 @@
+@@ -351,7 +351,7 @@ dummy_incdir $(INCDIR):
+ ############################################################################
+ # `etc/' files:
+ ############################################################################
+-ETCDIR	= $(prefix)/etc
++ETCDIR	= @datadir@/examples/udunits
+ ETCFILE	= dummy-etcfile		# to silence GNU make(1)
+ 
+ installed_etcfiles:
+@@ -387,7 +387,7 @@ MANUAL		= dummy-manual	# to slience GNU 
  WHATIS		= @WHATIS@
  # The following macro should be empty on systems that don't
  # allow users to create their own manual-page indexes.
diff --git a/math/udunits/patches/patch-ab b/math/udunits/patches/patch-ab
new file mode 100644
index 00000000000..998dca5ccc4
--- /dev/null
+++ b/math/udunits/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/12/24 17:21:04 jmmv Exp $
+
+--- lib/Makefile.in.orig	Wed Apr 30 23:49:58 1997
++++ lib/Makefile.in
+@@ -7,7 +7,7 @@
+ LIBRARY		= udunits
+ 
+ FLEX		= /usr/local/gnu/bin/flex
+-cpp_path	= -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
++cpp_path	= -DUT_DEFAULT_PATH='"@sysconfdir@/udunits.dat"'
+ CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
+ CFLAGS		= @CFLAGS@
+