On Mon, 19 Jul 2010, Philip M. Gollucci wrote:
I've long been interested in this. I must be using the wrong options or
something. About 1 yr ago I was able to build the index after removing
the appropriate things in Mk/.
Well, seems like I have good news. :) I ran tests on both 9-current and
6-stable with a full, clean tree and no make.conf; with and without
-D_PERL_REFACTORING_COMPLETE and the INDEX files were identical. So it
looks like this is a good time to pull the trigger and make the change.
If portmgr approves I'll be glad to make the change myself, but I
imagine that a pointyhat run first is in order. The diff is easy, but
I've attached it just in case.
Doug
--
Improve the effectiveness of your Internet presence with
a domain name makeover! http://SupersetSolutions.com/
Computers are useless. They can only give you answers.
-- Pablo Picasso
Index: bsd.perl.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.perl.mk,v
retrieving revision 1.17
diff -u -r1.17 bsd.perl.mk
--- bsd.perl.mk 15 Jul 2010 14:48:50 -0000 1.17
+++ bsd.perl.mk 20 Jul 2010 03:55:54 -0000
@@ -80,10 +80,6 @@
Perl_Pre_Include= bsd.perl.mk
PERL_Include_MAINTAINER= p...@freebsd.org
-# XXX to remain undefined until all ports that require Perl are fixed
-# to set one of the conditionals that force the inclusion of bsd.perl.mk
-.if defined(_PERL_REFACTORING_COMPLETE)
-
PERL_VERSION?= 5.10.1
.if !defined(PERL_LEVEL) && defined(PERL_VERSION)
@@ -113,8 +109,6 @@
PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
PERL= ${LOCALBASE}/bin/perl
-.endif # defined(_PERL_REFACTORING_COMPLETE)
-
# Decide where to look for the version string
.ifdef USE_PERL5
USE_PERL5_STRING= ${USE_PERL5}
@@ -175,15 +169,11 @@
Perl_Post_Include= bsd.perl.mk
-.if defined(_PERL_REFACTORING_COMPLETE)
-
PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
PERL_VER=${PERL_VERSION} \
PERL_ARCH=${PERL_ARCH} \
SITE_PERL=${SITE_PERL_REL}
-.endif # defined(_PERL_REFACTORING_COMPLETE)
-
.if !defined(PERL) || !defined(PERL5) || !defined(PERL_PORT) ||
!defined(SITE_PERL)
IGNORE= missing define for WANT_PERL, USE_PERL5, or similar
before bsd.port.pre.mk inclusion
.endif
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.643
diff -u -r1.643 bsd.port.mk
--- bsd.port.mk 15 Jul 2010 14:48:50 -0000 1.643
+++ bsd.port.mk 20 Jul 2010 03:55:55 -0000
@@ -1450,46 +1450,6 @@
PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
-# XXX to remain undefined until all ports that require Perl are fixed
-# to set one of the conditionals that force the inclusion of bsd.perl.mk
-.if !defined(_PERL_REFACTORING_COMPLETE)
-
-PERL_VERSION?= 5.10.1
-
-.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= ${_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= ${_perl_patch:C|^.*(..)|\1|}
-.endif # ${perl_minor} < 100
-PERL_LEVEL= ${perl_major}${perl_minor}${perl_patch}
-.else
-PERL_LEVEL=0
-.endif # !defined(PERL_LEVEL) && defined(PERL_VERSION)
-
-PERL_ARCH?= mach
-
-.if ${PERL_LEVEL} >= 501200
-PERL_PORT?= perl5.12
-.elif ${PERL_LEVEL} >= 501000
-PERL_PORT?= perl5.10
-.else
-PERL_PORT?= perl5.8
-.endif
-
-SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VERSION}
-SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL}
-
-PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION}
-PERL= ${LOCALBASE}/bin/perl
-
-.endif # !defined(_PERL_REFACTORING_COMPLETE)
-
.if defined(USE_LOCAL_MK)
.include "${PORTSDIR}/Mk/bsd.local.mk"
.endif
@@ -2049,13 +2009,6 @@
.endif
-.if !defined(_PERL_REFACTORING_COMPLETE)
-PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \
- PERL_VER=${PERL_VERSION} \
- PERL_ARCH=${PERL_ARCH} \
- SITE_PERL=${SITE_PERL_REL}
-.endif # !defined(_PERL_REFACTORING_COMPLETE)
-
.if defined(USE_LOCAL_MK)
.include "${PORTSDIR}/Mk/bsd.local.mk"
.endif
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
