Index: Makefile
===================================================================
--- Makefile	(revision 449587)
+++ Makefile	(working copy)
@@ -98,6 +98,7 @@
 
 APACHE_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:www/mod_perl2 \
 			p5-Apache-DBI>0:www/p5-Apache-DBI
+APACHE_USE=		apache_run=22+
 
 REPORTS_RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
 			p5-GD-Graph>=0:graphics/p5-GD-Graph \
@@ -122,12 +123,6 @@
 
 GNUPG_RUN_DEPENDS=	gpg:security/gnupg1
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MAPACHE}
-USE_APACHE_RUN=	22+
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.pm" | \
 		${XARGS} ${REINPLACE_CMD} -i '' \
@@ -141,18 +136,18 @@
 	@${FIND} ${WRKSRC}/Kernel -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/opt/=${PREFIX}/=g;s=wwwrun=${WWWOWN}=g;"
-.if ${PORT_OPTIONS:MISPELL}
+
+do-build-ISPELL-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/ispell=g"
-.endif
-.if ${PORT_OPTIONS:MASPELL}
+
+do-build-ASPELL-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/ispell=${PREFIX}/bin/aspell=g"
-.endif
-.if ${PORT_OPTIONS:MGNUPG}
+
+do-build-GNUPG-on:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${SED} -i '' \
 		-e "s=/usr/bin/gpg=${PREFIX}/bin/gpg=g"
-.endif
 
 do-install:
 .for D in ${ROOT_DIRS_LIST:S!^!${OTRSDIR}/!} ${BIN_DIRS_LIST:S!^!${OTRSDIR}/bin/!} ${SCRIPTS_DIRS_LIST:S!^!${OTRSDIR}/scripts/!}
@@ -190,4 +185,4 @@
 		s=share/doc/${PORTNAME}=%%DOCSDIR%%=; \
 	')> temp-pkg-plist
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>