From c0a4b57682638c0ceb754aae697b6437193a2333 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 22 Mar 2004 17:29:02 +0000
Subject: Fix the installation of udunits using perl58 by including module.mk
 (to note that this package installs a Perl module).  While I'm here, bl3ify
 the package.

---
 math/udunits/Makefile      | 10 ++++++----
 math/udunits/PLIST         | 11 +----------
 math/udunits/buildlink3.mk | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 math/udunits/buildlink3.mk

(limited to 'math/udunits')

diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index 396e75dc76b..90348d24229 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 02:01:53 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/22 17:29:02 jlam Exp $
 
 DISTNAME=		udunits
 PKGNAME=		udunits-1.12.1
@@ -13,12 +13,14 @@ COMMENT=		Library and program for manipulating units of physical quantities
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
 CPPFLAGS+=		-Df2cFortran -Dunix
+PERL5_CONFIGURE=	no
 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
@@ -26,5 +28,5 @@ CONF_FILES=		${EGDIR}/udunits.dat ${PKG_SYSCONFDIR}/udunits.dat
 post-install:
 	${RM} -rf ${WRKSRC}/perl/blib/lib
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/udunits/PLIST b/math/udunits/PLIST
index a835732fd4b..fbca36255d3 100644
--- a/math/udunits/PLIST
+++ b/math/udunits/PLIST
@@ -1,15 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/24 02:01:53 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/03/22 17:29:02 jlam Exp $
 bin/udunits
-etc/udunits.dat
 include/udunits.h
 include/udunits.inc
 lib/libudport.a
 lib/libudunits.a
-lib/perl5/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/perllocal.pod
-lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/UDUNITS/.packlist
-lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/UDUNITS/UDUNITS.bs
-lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/UDUNITS/UDUNITS.so
-lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/UDUNITS/autosplit.ix
 man/man1/udunits.1
 man/man1/udunitsperl.1
 man/man3/udunits.3
@@ -18,6 +12,3 @@ man/man3f/udunits.3f
 share/examples/udunits/udunits.dat
 @dirrm share/examples/udunits
 @dirrm man/man3f
-@dirrm lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/UDUNITS
-@dirrm lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/auto
-@dirrm lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}
diff --git a/math/udunits/buildlink3.mk b/math/udunits/buildlink3.mk
new file mode 100644
index 00000000000..f4b4c5cea9c
--- /dev/null
+++ b/math/udunits/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/22 17:29:02 jlam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+UDUNITS_BUILDLINK3_MK:=	${UDUNITS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	udunits
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nudunits}
+BUILDLINK_PACKAGES+=	udunits
+
+.if !empty(UDUNITS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.udunits+=	udunits>=1.11.7
+BUILDLINK_PKGSRCDIR.udunits?=	../../math/udunits
+BUILDLINK_DEPMETHOD.udunits?=	build
+BUILDLINK_FILES.udunits=	include/udunits.inc
+.endif	# UDUNITS_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
-- 
cgit v1.2.3