Index: perl.mk =================================================================== --- perl.mk (revision 494) +++ perl.mk (revision 495) @@ -1,21 +1,12 @@ ############################################################################## -# $HeadURL: svn://cvs1.rambler.ru/Contenido/trunk/ports/etc/ports.mk $ -# $Id: ports.mk 71 2006-06-03 14:32:52Z lonerr $ +# ############################################################################### PERL ?= ${shell which perl} PERL_LEVEL ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d%03d%02d", $$1,$$2,$$3;'} -ifeq (${shell ${PERL} -e '${PERL_LEVEL}<500600 && print 1'},1) -PERL_VER = ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%03d", $$1,$$2;'} -endif +PERL_VER = ${shell ${PERL} -e 'my ($$inc) = grep { $$_ =~ /site_perl/ } @INC; $$inc =~ /5\.(\d+)\.(\d)/ ? print "5.$$1.$$2" : $$inc =~ /5\.(\d+)/ ? print "5.$$1" : print '';'} -ifeq (${shell ${PERL} -e '${PERL_LEVEL}<501205 && print 1'},1) -PERL_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%d.%d", $$1,$$2,$$3;'} -else -PERL_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%d", $$1,$$2;'} -endif - ifeq (${shell ${PERL} -e '${PERL_LEVEL}<500600 && print 1'},1) PERL_ARCH ?= ${shell ${PERL} -e 'use Config; print $$Config::Config{archname};'} else