PERFORCE change 125266 for review

[Andrew Pantyukhin]

http://perforce.freebsd.org/chv.cgi?CH=125266

Change 125266 by sat at sat_amilo on 2007/08/17 13:30:08

	- Fix whitespace
	- Move $FreeBSD$ close to the top
	- Use Pre/Post_Include to match most other bsd.*.mk files

Affected files ...

.. //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#22 edit

Differences ...

==== //depot/projects/soc2007/gabor_perlmk/Mk/bsd.perl.mk#22 (text+ko) ====

@@ -1,6 +1,8 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
+# $FreeBSD$
+#
 # bsd.perl.mk - Support for Perl-based ports.
 #
 # Created by: Gabor Kovesdan <gabor at FreeBSD.org>
@@ -9,41 +11,40 @@
 # Please send all suggested changes to the maintainer instead of committing
 # them to CVS yourself.
 #
-#
 # PERL5			- Set to full path of perl5, either in the system or
-#				installed from a port.
+#				  installed from a port.
 # PERL			- Set to full path of perl5, either in the system or
-#				installed from a port, but without the version number.
-#				Use this if you need to replace "#!" lines in scripts.
-# PERL_VERSION		- Full version of perl5 (see below for current value).
+#				  installed from a port, but without the version number.
+#				  Use this if you need to replace "#!" lines in scripts.
+# PERL_VERSION	- Full version of perl5 (see below for current value).
 # PERL_VER		- Short version of perl5 (see below for current value).
-# PERL_LEVEL		- Perl version as an integer of the form MNNNPP, where
-#				M is major version, N is minor version, and P is
-#				the patch level. E.g., PERL_VERSION=5.6.1 would give
-#				a PERL_LEVEL of 500601. This can be used in comparisons
-#				to determine if the version of perl is high enough,
-#				whether a particular dependency is needed, etc.
+# PERL_LEVEL	- Perl version as an integer of the form MNNNPP, where
+#				  M is major version, N is minor version, and P is
+#				  the patch level. E.g., PERL_VERSION=5.6.1 would give
+#				  a PERL_LEVEL of 500601. This can be used in comparisons
+#				  to determine if the version of perl is high enough,
+#				  whether a particular dependency is needed, etc.
 # PERL_ARCH		- Directory name of architecture dependent libraries
-#				(value: ${ARCH}-freebsd).
+#				  (value: ${ARCH}-freebsd).
 # PERL_PORT		- Name of the perl port that is installed
-#				(value: perl5)
+#				  (value: perl5)
 # SITE_PERL		- Directory name where site specific perl packages go.
-#				This value is added to PLIST_SUB.
+#				  This value is added to PLIST_SUB.
 # USE_PERL5		- If your port needs a specific version of Perl, you
-#				can easily specify that with this knob.  If
-#				you need a certain minimal version, but don't
-#				care if about the upperversion, just put the
-#				+ sign behind the version.  If you want to
-#				specify a latest version your port can be used
-#				with, suffix the version number with a - sign.
-#				Exact version can also be specified if you just
-#				set USE_PERL5 to the desired version.  If you
-#				just set USE_PERL5 to "yes", Perl will be
-#				pulled in as a dependency but no version check
-#				is done.
-#
-# USE_PERL5_REASON	- Along with USE_PERL5, you can set a specific reason,
-#				why a given version is required.
+#				  can easily specify that with this knob.  If
+#				  you need a certain minimal version, but don't
+#				  care if about the upperversion, just put the
+#				  + sign behind the version.  If you want to
+#				  specify a latest version your port can be used
+#				  with, suffix the version number with a - sign.
+#				  Exact version can also be specified if you just
+#				  set USE_PERL5 to the desired version.  If you
+#				  just set USE_PERL5 to "yes", Perl will be
+#				  pulled in as a dependency but no version check
+#				  is done.
+# USE_PERL5_REASON
+#				- Along with USE_PERL5, you can set a specific reason,
+#				  why a given version is required.
 #
 # Examples:
 # 	USE_PERL5=	yes	# port requires any version of Perl5 to build.
@@ -56,43 +57,40 @@
 #
 #	USE_PERL5_REASON=	this module is already part of your Perl version
 #
-# PERL_CONFIGURE	- Configure using Perl's MakeMaker.  Implies USE_PERL5.
-#				The version requirement can be specified here,
-#				as well.
-# USE_PERL5_BUILD	- If set, this port uses perl5 in one or more of the
-#				extract, patch, build or install phases.
-#				The version requirement can be specified here,
-#				as well.
+# PERL_CONFIGURE
+#				- Configure using Perl's MakeMaker.  Implies USE_PERL5.
+#				  The version requirement can be specified here,
+#				  as well.
+# USE_PERL5_BUILD
+#				- If set, this port uses perl5 in one or more of the
+#				  extract, patch, build or install phases.
+#				  The version requirement can be specified here,
+#				  as well.
+# USE_PERL5_RUN	- If set, this port uses perl5 for running.  The
+#			 	  version requirement can be specified here,
+#				  as well.
+# PERL_MODBUILD	- Use Module::Build to configure, build and install
+#				  port.  The version requirement can be specified
+#				  here, as well.
 #
-# USE_PERL5_RUN		- If set, this port uses perl5 for running.  The
-#			 	version requirement can be specified here,
-#				as well.
-#
-# PERL_MODBUILD		- Use Module::Build to configure, build and install
-#				port.  The version requirement can be specified
-#				here, as well.
-#
-# $FreeBSD$
-#
 
-.if !defined(_POSTMKINCLUDED) && !defined(_PERLPREMKINCLUDED)
+.if !defined(_POSTMKINCLUDED) && !defined(Perl_Pre_Include)
 
+Perl_Pre_Include=			bsd.perl.mk
 PERL_Include_MAINTAINER=	perl at FreeBSD.org
 
-_PERLPREMKINCLUDED=	yes
-
 PERL_VERSION?=	5.8.8
-PERL_VER?=	5.8.8
+PERL_VER?=		5.8.8
 
 .if !defined(PERL_LEVEL) && defined(PERL_VERSION)
 perl_major=		${PERL_VERSION:C|^([1-9]+).*|\1|}
-_perl_minor=		00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+_perl_minor=	00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
 perl_minor=		${_perl_minor:C|^.*(...)|\1|}
 .if ${perl_minor} >= 100
 perl_minor=		${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
 perl_patch=		${PERL_VERSION:C|^.*(..)|\1|}
 .else # ${perl_minor} < 100
-_perl_patch=		0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+_perl_patch=	0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
 perl_patch=		${_perl_patch:C|^.*(..)|\1|}
 .endif # ${perl_minor} < 100
 PERL_LEVEL=		${perl_major}${perl_minor}${perl_patch}
@@ -160,9 +158,9 @@
 PERL=		${LOCALBASE}/bin/perl
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
-		PERL_ARCH=${PERL_ARCH} \
-		SITE_PERL=${SITE_PERL_REL}
+			PERL_VER=${PERL_VER} \
+			PERL_ARCH=${PERL_ARCH} \
+			SITE_PERL=${SITE_PERL_REL}
 
 .if defined(PERL_MODBUILD)
 PERL_CONFIGURE=		${PERL_MODBUILD}
@@ -205,11 +203,11 @@
 MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VERSION}
 .undef HAS_CONFIGURE
 .endif # defined(PERL_CONFIGURE)
-.endif # !defined(_POSTMKINCLUDED) && !defined(_PERLPREMKINCLUDED)
+.endif # !defined(_POSTMKINCLUDED) && !defined(Perl_Pre_Include)
 
-.if defined (_POSTMKINCLUDED) && !defined(_PERLPOSTMKINCLUDED)
+.if defined(_POSTMKINCLUDED) && !defined(Perl_Post_Include)
 
-_PERLPOSTMKINCLUDED=	yes
+Perl_Post_Include=		bsd.perl.mk
 
 .if defined(PERL_CONFIGURE)
 .if !target(do-configure)
@@ -237,4 +235,4 @@
 .endif # !target(do-install)
 .endif # !defined(USE_GMAKE)
 .endif # defined(PERL_MODBUILD)
-.endif # defined (_POSTMKINCLUDED) && !defined(_PERLPOSTMKINCLUDED)
+.endif # defined(_POSTMKINCLUDED) && !defined(Perl_Post_Include)