--- 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)