7050602 userland consolidation should build with perl 5.12 by default
authorcraig mohrman <craig.mohrman@oracle.com>
Wed, 01 Jun 2011 14:24:54 -0700
changeset 277 12ebd29ad46c
parent 276 18dcd0ca5b0c
child 278 77b380ba9d84
7050602 userland consolidation should build with perl 5.12 by default
components/git/Makefile
components/git/git.p5m
components/imagemagick/Makefile
components/imagemagick/imagemagick.p5m
components/net-snmp/Makefile
components/net-snmp/net-snmp-base.p5m
components/perl512/Makefile
components/psutils/Makefile
components/subversion/Makefile
components/subversion/subversion-perl.p5m
make-rules/shared-macros.mk
--- a/components/git/Makefile	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/git/Makefile	Wed Jun 01 14:24:54 2011 -0700
@@ -24,7 +24,6 @@
 
 COMPONENT_NAME=		git
 COMPONENT_VERSION=	1.7.3.2
-PERL_VERSION=		5.10.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:cd8d806752aa6f5716cf193585024a002e098bf4
@@ -43,12 +42,12 @@
 CONFIGURE_PREFIX    =	/usr
 CONFIGURE_OPTIONS  +=	--without-openssl
 CONFIGURE_OPTIONS  +=	--libexecdir=/usr/lib
-CONFIGURE_OPTIONS  +=	--with-perl=/usr/perl5/$(PERL_VERSION)/bin/perl
+CONFIGURE_OPTIONS  +=	--with-perl=$(PERL)
 CONFIGURE_OPTIONS  +=	--with-python=$(PYTHON.32)
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
-COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell /usr/perl5/$(PERL_VERSION)/bin/perl -MConfig -e 'print "$$Config{installvendorarch}"')
+COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell $(PERL) -MConfig -e 'print "$$Config{installvendorarch}"')
 
 COMPONENT_TEST_TARGETS = test
 
@@ -66,9 +65,6 @@
 #
 DOC=$(BUILD_DIR)/Documentation
 
-PKG_MACROS	+=	PERL_ARCH=$(shell arch)
-PKG_MACROS	+=	PERL_VERSION=$(PERL_VERSION)
-
 build:		$(BUILD_32) $(DOC)/.manpages
 
 install:	$(INSTALL_32)
--- a/components/git/git.p5m	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/git/git.p5m	Wed Jun 01 14:24:54 2011 -0700
@@ -47,7 +47,7 @@
 dir path=usr/perl5
 dir path=usr/perl5/vendor_perl
 dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
 dir path=usr/share
 dir path=usr/share/git-core
 dir path=usr/share/git-core/templates
@@ -123,9 +123,9 @@
 file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.py
 file path=usr/lib/python2.6/site-packages/git_remote_helpers/util.py
 file \
-    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Error.pm
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Error.pm
 file \
-    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Git.pm
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Git.pm
 file path=usr/share/git-core/templates/description
 file path=usr/share/git-core/templates/hooks/applypatch-msg.sample
 file path=usr/share/git-core/templates/hooks/commit-msg.sample
--- a/components/imagemagick/Makefile	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/imagemagick/Makefile	Wed Jun 01 14:24:54 2011 -0700
@@ -67,6 +67,7 @@
 CONFIGURE_OPTIONS+= --enable-shared=yes
 CONFIGURE_OPTIONS+= --enable-static=no
 CONFIGURE_OPTIONS+= --without-gvc
+CONFIGURE_OPTIONS.32+= --with-perl=$(PERL)
 CONFIGURE_OPTIONS.64+= --without-perl
 
 # common targets
--- a/components/imagemagick/imagemagick.p5m	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/imagemagick/imagemagick.p5m	Wed Jun 01 14:24:54 2011 -0700
@@ -57,25 +57,16 @@
 dir path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/filters
 dir path=usr/lib/pkgconfig
 dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man3
+dir path=usr/perl5/$(PERL_VERSION)
+dir path=usr/perl5/$(PERL_VERSION)/man
+dir path=usr/perl5/$(PERL_VERSION)/man/man3
 dir path=usr/perl5/site_perl
-dir path=usr/perl5/site_perl/5.8.4
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/Image variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image \
-    variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick \
-    variant.arch=i386
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/Image variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image \
-    variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick \
-    variant.arch=sparc
+dir path=usr/perl5/site_perl/$(PERL_VERSION)
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image
+dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick
 dir path=usr/share
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config
@@ -548,29 +539,14 @@
 file path=usr/lib/pkgconfig/ImageMagick++.pc
 file path=usr/lib/pkgconfig/ImageMagick.pc
 file path=usr/lib/pkgconfig/Wand.pc
-file path=usr/perl5/5.8.4/man/man3/Image::Magick.3
-file path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/Image/Magick.pm \
-    variant.arch=i386
-file \
-    path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick/Magick.bs \
-    variant.arch=i386
-file \
-    path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick/Magick.so \
-    variant.arch=i386
+file path=usr/perl5/$(PERL_VERSION)/man/man3/Image::Magick.3
+file path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
 file \
-    path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick/autosplit.ix \
-    variant.arch=i386
-file path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/Image/Magick.pm \
-    variant.arch=sparc
+    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.bs
 file \
-    path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick/Magick.bs \
-    variant.arch=sparc
+    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
 file \
-    path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick/Magick.so \
-    variant.arch=sparc
-file \
-    path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image/Magick/autosplit.ix \
-    variant.arch=sparc
+    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/ChangeLog
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/LICENSE
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/NEWS
--- a/components/net-snmp/Makefile	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/net-snmp/Makefile	Wed Jun 01 14:24:54 2011 -0700
@@ -27,7 +27,6 @@
 
 COMPONENT_NAME=		net-snmp
 COMPONENT_VERSION=	5.4.1
-PERL_VERSION=	5.8.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:ac5ba033c10d53d3057415121f8c4936c643c208
@@ -64,7 +63,7 @@
 
 # Only build 32 bit Perl support
 PERL_ARGS =			DESTDIR=$(PROTO_DIR) INSTALLDIRS=vendor
-CONFIGURE_OPTIONS.32  +=	PERL="$(PERL)"
+CONFIGURE_OPTIONS.32  +=	PERLPROG="$(PERL)"
 CONFIGURE_OPTIONS.32  +=	--with-perl-modules="$(PERL_ARGS)"
 CONFIGURE_OPTIONS.32  +=	--disable-perl-cc-checks
 
@@ -75,11 +74,7 @@
 CONFIGURE_OPTIONS	+=	CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS	+=	CC="$(CC)"
 
-ARCHNAME=$(shell $(PERL) -V:archname | sed -e "s/archname='\(.*\)'\;/\1/")
-
-PKG_MACROS +=	ARCHNAME=$(ARCHNAME)
 PKG_MACROS +=	BUILD_DIR=$(BUILD_DIR)
-PKG_MACROS +=	PERL_VERSION=$(PERL_VERSION)
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D); $(CLONEY) $(COMPONENT_DIR)/sun $(@D)/sun)
--- a/components/net-snmp/net-snmp-base.p5m	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/net-snmp/net-snmp-base.p5m	Wed Jun 01 14:24:54 2011 -0700
@@ -69,21 +69,21 @@
 dir path=usr/perl5/$(PERL_VERSION)/man/man3
 dir path=usr/perl5/vendor_perl
 dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/Bundle
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/Bundle/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/default_store
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/ASN
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/default_store
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/OID
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/TrapReceiver
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/SNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/Bundle
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/agent
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent
 dir path=usr/sbin
 dir path=usr/sbin/$(MACH64)
 dir path=usr/sbin/$(MACH32)
@@ -515,38 +515,38 @@
 file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::OID.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::TrapReceiver.3
 file path=usr/perl5/$(PERL_VERSION)/man/man3/SNMP.3
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/Bundle/NetSNMP/.packlist
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/agent.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/agent.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/default_store/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/default_store/default_store.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/agent/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/ASN/ASN.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/ASN/ASN.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/ASN/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/default_store/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/default_store/default_store.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/OID/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/OID/OID.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/OID/OID.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/TrapReceiver/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/SNMP/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/SNMP/SNMP.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/auto/SNMP/SNMP.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/Bundle/Makefile.subs.pl
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/agent.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/agent/default_store.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/agent/netsnmp_request_infoPtr.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/agent/Support.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/ASN.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/default_store.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/OID.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/NetSNMP/TrapReceiver.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(ARCHNAME)/SNMP.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP/.packlist
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/autosplit.ix
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle/Makefile.subs.pl
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/default_store.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/netsnmp_request_infoPtr.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/Support.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/ASN.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/default_store.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/OID.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/TrapReceiver.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/SNMP.pm
 file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmpd path=usr/sbin/$(MACH64)/snmpd
 file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmptrapd path=usr/sbin/$(MACH64)/snmptrapd
 file usr/sbin/snmpd path=usr/sbin/$(MACH32)/snmpd
--- a/components/perl512/Makefile	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/perl512/Makefile	Wed Jun 01 14:24:54 2011 -0700
@@ -22,6 +22,10 @@
 #
 include ../../make-rules/shared-macros.mk
 
+# I want to override PERL_VERSION and PERL_ARCH because when building
+# a new version of perl it probably isn't installed so shared-macros.mk
+# can't call it.
+
 COMPONENT_NAME=		perl
 COMPONENT_VERSION=	5.12.3
 PERL_VERSION=		5.12
--- a/components/psutils/Makefile	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/psutils/Makefile	Wed Jun 01 14:24:54 2011 -0700
@@ -57,7 +57,7 @@
 COMPONENT_INSTALL_ENV += BINDIR=$(PROTO_DIR)/usr/bin
 COMPONENT_INSTALL_ENV += INCLUDEDIR=$(PROTO_DIR)/usr/share/psutils
 COMPONENT_INSTALL_ENV += MANDIR=$(PROTO_DIR)/usr/share/man/man1
-COMPONENT_INSTALL_ENV += PERL=/usr/perl5/bin/perl
+COMPONENT_INSTALL_ENV += PERL=$(PERL)
 COMPONENT_INSTALL_ENV += INSTALL="$(INSTALL) -m 0555"
 COMPONENT_INSTALL_ENV += INSTALLMAN="$(INSTALL) -m 0444"
 
--- a/components/subversion/Makefile	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/subversion/Makefile	Wed Jun 01 14:24:54 2011 -0700
@@ -42,8 +42,6 @@
 
 PYMODS = client core delta fs ra repos wc
 
-PERL = /usr/perl5/bin/perl
-PERLARCH=$(shell $(PERL) -e 'use Config; print $$Config{archname}')
 PLMODS= Fs Core Wc Client Repos Ra Delta
 
 JAVA_ROOT = $(JAVA_HOME)
@@ -63,8 +61,6 @@
 CFLAGS += `pkg-config --cflags neon`
 CFLAGS += $(CPP_LARGEFILES)
 
-PKG_MACROS += PERLARCH=$(PERLARCH)
-
 # Let's write some post-configure hacks
 COMPONENT_POST_CONFIGURE_ACTION = \
     ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \
--- a/components/subversion/subversion-perl.p5m	Wed Jun 01 08:08:36 2011 -0700
+++ b/components/subversion/subversion-perl.p5m	Wed Jun 01 14:24:54 2011 -0700
@@ -20,10 +20,10 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/perl5/5.8.4/man.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr/perl5/$(PERL_VERSION)/man.+ -> default mangler.man.stability uncommitted>
 
-<transform file path=(usr/perl5/vendor_perl/5.8.4/)(SVN/.+) -> \
-	set action.hash %<\1>$(PERLARCH)/%<\2> >
+<transform file path=(usr/perl5/vendor_perl/$(PERL_VERSION)/)(SVN/.+) -> \
+	set action.hash %<\1>$(PERL_ARCH)/%<\2> >
 
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
@@ -39,54 +39,54 @@
 dir path=usr/lib
 dir path=usr/lib/svn
 dir path=usr/perl5
-dir path=usr/perl5/5.8.4
-dir path=usr/perl5/5.8.4/man
-dir path=usr/perl5/5.8.4/man/man3
+dir path=usr/perl5/$(PERL_VERSION)
+dir path=usr/perl5/$(PERL_VERSION)/man
+dir path=usr/perl5/$(PERL_VERSION)/man/man3
 dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/5.8.4
-dir path=usr/perl5/vendor_perl/5.8.4/SVN
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Client
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Core
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Delta
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Fs
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Ra
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Repos
-dir path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Wc
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc
 #
 file path=usr/lib/svn/libsvn_swig_perl-1.so.0.0.0
-file path=usr/perl5/5.8.4/man/man3/SVN::Base.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Client.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Core.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Delta.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Fs.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Ra.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Repos.3
-file path=usr/perl5/5.8.4/man/man3/SVN::Wc.3
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Client/_Client.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Client/_Client.so
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Core/_Core.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Core/_Core.so pkg.depend.bypass-generate=.*
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Delta/_Delta.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Delta/_Delta.so
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Fs/_Fs.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Fs/_Fs.so
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Ra/_Ra.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Ra/_Ra.so
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Repos/_Repos.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Repos/_Repos.so
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Wc/_Wc.bs
-file path=usr/perl5/vendor_perl/5.8.4/$(PERLARCH)/auto/SVN/_Wc/_Wc.so
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Base.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Client.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Core.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Delta.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Fs.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Ra.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Repos.pm
-file path=usr/perl5/vendor_perl/5.8.4/SVN/Wc.pm
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Base.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Client.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Core.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Delta.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Fs.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Ra.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Repos.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Wc.3
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.so pkg.depend.bypass-generate=.*
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Base.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Client.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Core.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Delta.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Fs.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Ra.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Repos.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Wc.pm
 #
 link path=usr/lib/svn/libsvn_swig_perl-1.so target=libsvn_swig_perl-1.so.0.0.0
 link path=usr/lib/svn/libsvn_swig_perl-1.so.0 target=libsvn_swig_perl-1.so.0.0.0
--- a/make-rules/shared-macros.mk	Wed Jun 01 08:08:36 2011 -0700
+++ b/make-rules/shared-macros.mk	Wed Jun 01 14:24:54 2011 -0700
@@ -237,7 +237,7 @@
 
 # This is the default BUILD version of perl
 # Not necessarily the system's default version, i.e. /usr/bin/perl
-PERL_VERSION =  5.8.4
+PERL_VERSION =  5.12
 
 PERL_VERSIONS = 5.8.4 5.12