- Fix profiles support in startup script [1]

- move envvars support to the beginning of apache2_checkconfig() to be
  sure we're using envvars during configtest [2]

PR:             ports/116401 [1],
                ports/116329 [2]
Submitted by:   kevin brintnall <kbrint@rufus.net> [1],
                Ruud Althuizen <ruud@il.fontys.nl>

www/apache20/Makefile

@@ -52,6 +52,7 @@ USE_ICONV=		yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_PERL5=		yes
 USE_RC_SUBR=		apache2.sh
+SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 USE_APACHE=		common20
 LIBTOOLFILES=		configure
 USE_LDCONFIG=		${PREFIX}/lib/apache2

www/apache20/files/apache2.sh.in

@@ -98,6 +98,11 @@ apache2_requirepidfile()
 
 apache2_checkconfig()
 {
+	if test -f %%PREFIX%%/sbin/envvars
+	then
+		. %%PREFIX%%/sbin/envvars
+	fi
+
 	echo "Performing sanity check on apache2 configuration:"
 	eval ${command} ${apache2_flags} -t
 }
@@ -113,18 +118,12 @@ apache2_precmd()
 {
 	apache2_checkconfig
 
-	if test -f %%PREFIX%%/sbin/envvars
-	then
-		. %%PREFIX%%/sbin/envvars
-	fi
-
 	if checkyesno apache2limits_enable
 	then
 		eval `/usr/bin/limits ${apache2limits_args}` 2>/dev/null
 	else
 		return 0
         fi
-
 }
 
 extra_commands="reload graceful configtest"