* Remove Makefile.common since its only used by perl58/Makefile.

* Rename PERL5_DIST_VERS to PERL5_VERS so that the variable name is more
  accurate.
* Make it easier to test perl5 snapshots using the existing perl5 package
  (just to make my life simpler).  Now we simply define PERL5_SNAPSHOT to
  the perl snapshot version and set PERL5_VERS to the appropriate version
  number for the release candidate for the next release of perl5.

2 files changed, 35 insertions, 34 deletions

diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 6c1c2649f86..4d2fb63900c 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,22 +1,35 @@
-# $NetBSD: Makefile,v 1.15 2003/06/23 07:45:03 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/06/30 10:15:25 jlam Exp $
 
-.include "Makefile.common"
+PERL5_SNAPSHOT=	# empty
+PERL5_VERS=	5.8.0
 
-PKGREVISION=		2
-CATEGORIES+=		lang devel
+.if empty(PERL5_SNAPSHOT)
+DISTNAME=	perl-${PERL5_VERS}
+SNAPSHOT_SITES=	# empty
+.else
+DISTNAME=	perl@${PERL5_SNAPSHOT}
+PKGNAME=	perl-${PERL5_VERS}
+SNAPSHOT_SITES=	http://www.iki.fi/jhi/
+.endif
+
+PKGREVISION=	2
+CATEGORIES=	lang devel perl5
+MASTER_SITES=	${SNAPSHOT_SITES} \
+		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/ \
+		ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/src/
 
-MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://www.perl.com/
-COMMENT=		Practical Extraction and Report Language
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://www.perl.com/
+COMMENT=	Practical Extraction and Report Language
 
-CONFLICTS=		perl-5.00* perl-base-[0-9]* \
-			p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] \
-			p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
-			p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
-			perl-mk-[0-9]*
+CONFLICTS=	perl-5.00* perl-base-[0-9]* \
+		p5-CGI-2.66 p5-CGI-2.75 p5-CGI-2.75.[0-2] \
+		p5-Data-Dumper-2.1[0-9][0-9] p5-Data-Dumper-[0-9][0-9] \
+		p5-Devel-DProf-[0-9]* p5-Devel-Peek-[0-9]* \
+		perl-mk-[0-9]*
 
-USE_BUILDLINK2=		# defined
-HAS_CONFIGURE=		# defined
+USE_BUILDLINK2=		YES
+HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde
 CONFIGURE_ARGS+=	-Dprefix="${PREFIX}"
@@ -41,14 +54,14 @@ CONFIGURE_ARGS+=	-Dinstallsiteman3dir="${PERL5_SITEPERL}/man/man3"
 
 .include "../../mk/bsd.prefs.mk"
 
-MKPIC?=			yes
+MKPIC?=		yes
 
 .if ${OPSYS} == "Darwin"
 #
 # The perl build attempts to work around case-insensitivity problems on
 # HFS filesystems by using GNUmakefiles, so we need to use GNU make.
 #
-USE_GMAKE=	# defined
+USE_GMAKE=	YES
 #
 # Perl is _always_ built using shared libraries on Darwin; there's no
 # way to build a statically-linked perl binary.
@@ -59,8 +72,8 @@ STATIC_PERL=	NO
 # "installarchlib" and "installsitearch" have different forms between
 # Darwin and NetBSD.
 #
-PERL5_ARCHLIB=	${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${LOWER_OPSYS}
-PERL5_SITEARCH=	${PREFIX}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${LOWER_OPSYS}
+PERL5_ARCHLIB=	${PREFIX}/lib/perl5/${PERL5_VERS}/${LOWER_OPSYS}
+PERL5_SITEARCH=	${PREFIX}/lib/perl5/site_perl/${PERL5_VERS}/${LOWER_OPSYS}
 .endif
 
 # Nail down the needed libraries for each platform here to avoid hidden
@@ -124,11 +137,11 @@ CFLAGS=
 CONFIGURE_ARGS+=	-Duseshrplib
 .endif
 
-PERL5=			${PREFIX}/bin/perl${PERL5_DIST_VERS}
-PERL5_PRIVLIB?=		${PREFIX}/lib/perl5/${PERL5_DIST_VERS}
-PERL5_ARCHLIB?=		${PREFIX}/lib/perl5/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5=			${PREFIX}/bin/perl${PERL5_VERS}
+PERL5_PRIVLIB?=		${PREFIX}/lib/perl5/${PERL5_VERS}
+PERL5_ARCHLIB?=		${PREFIX}/lib/perl5/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
 PERL5_SITEPERL?=	${PREFIX}/lib/perl5/site_perl
-PERL5_SITEARCH?=	${PREFIX}/lib/perl5/site_perl/${PERL5_DIST_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
+PERL5_SITEARCH?=	${PREFIX}/lib/perl5/site_perl/${PERL5_VERS}/${MACHINE_ARCH}-${LOWER_OPSYS}
 PERL5_PACKLIST=		${PERL5_ARCHLIB}/.packlist
 PLIST_SUBST+=		PERL5_SITEPERL=${PERL5_SITEPERL:S/^${PREFIX}\///}
 
diff --git a/lang/perl58/Makefile.common b/lang/perl58/Makefile.common
deleted file mode 100644
index ccf16048ff9..00000000000
--- a/lang/perl58/Makefile.common
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/07/22 21:50:37 jlam Exp $
-
-DISTNAME=	perl-${PERL5_DIST_VERS}
-CATEGORIES+=	perl5
-MASTER_SITES_DEVEL= \
-		http://www.iki.fi/jhi/ \
-		ftp://ftp.funet.fi/pub/languages/perl/snap/
-MASTER_SITES+=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/ \
-		ftp://ftp.ruhr-uni-bochum.de/mirrors/ftp.funet.fi/pub/languages/perl/CPAN/src/
-
-# version number on the distfile
-PERL5_DIST_VERS=	5.8.0