Index: head/science/metaf2xml/Makefile
===================================================================
--- head/science/metaf2xml/Makefile	(revision 442392)
+++ head/science/metaf2xml/Makefile	(revision 442393)
@@ -1,50 +1,42 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	metaf2xml
 PORTVERSION=	2.0
 CATEGORIES=	science perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse and Decode METAR, TAF, SYNOP, BUOY and AMDAR and Write as XML
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
+RUN_DEPENDS=	p5-CGI>0:www/p5-CGI
+
 OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_SUB=	yes
 APACHE_DESC=	Install Apache config file for metaf2xml (depends on Apache)
 
 MAKE_ARGS=	CGI_BIN_DIR=${WWWDIR}/cgi-bin \
 		CGI_DATA_DIR=/var/tmp \
 		CGI_LOG_DIR=/var/tmp \
 		HTDOCS_DIR=${WWWDIR}/htdocs \
 		METAF2XML=${PREFIX} \
 		METAF2XML_LIB=${PREFIX}/${SITE_PERL_REL} \
 		METAF2XML_DOC=${DOCSDIR} \
 		METAF2XML_MAN=${PREFIX}/man \
 		METAF2XML_XSL=${DATADIR} \
 		BUILD_ROOT=${STAGEDIR}
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		perl5 shebangfix tar:tgz
 USE_PERL5=	install run
 SHEBANG_FILES=	metaf.pl metaf2xml.pl metafsrc2raw.pl
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+APACHE_MAKE_ARGS=	CONF_DIR=${PREFIX}/${APACHEETCDIR}/Includes
+APACHE_USE=		APACHE_RUN=22+
 
-.if ${PERL_LEVEL} >= 502200
-RUN_DEPENDS+=	p5-CGI>0:www/p5-CGI
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
-MAKE_ARGS+=	CONF_DIR=${PREFIX}/${APACHEETCDIR}/Includes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>