- USE_APACHE=yes is deprecated

- PORTDOCS/DOCSDIR
- Use APACHEMODDIR
- Bump PORTREVISION

2 files changed, 7 insertions, 12 deletions

diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index ca370c6c60b1..1d5f2d31c1f2 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -7,18 +7,19 @@
 
 PORTNAME=	mod_mp3
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	www audio
 MASTER_SITES=	http://download.tangent.org/
 
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module to allow MP3 streaming
 
-USE_APACHE=	yes
+USE_APACHE=	1.3
 HAS_CONFIGURE=	yes
 MAKE_ARGS+=	APXS="${APXS}"
 USE_PERL5=	yes
 
-DOCS=		ChangeLog README TODO faq.html CONTRIBUTORS
+PORTDOCS=		ChangeLog README TODO faq.html CONTRIBUTORS
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		YES
@@ -28,9 +29,9 @@ CONFIGURE_ARGS+=	--with-mysql
 do-install:
 	${APXS} -i -A -n mp3 ${WRKSRC}/src/mod_mp3.so
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -m 0755 ${PREFIX}/share/doc/mod_mp3
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/mod_mp3/
+	${MKDIR} ${DOCSDIR}/
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
 .endfor
 .endif
 	${CAT} ${PKGMESSAGE}
diff --git a/www/mod_mp3/pkg-plist b/www/mod_mp3/pkg-plist
index d565f910a319..a1768175df7b 100644
--- a/www/mod_mp3/pkg-plist
+++ b/www/mod_mp3/pkg-plist
@@ -1,9 +1,3 @@
-libexec/apache/mod_mp3.so
+%%APACHEMODDIR%%/mod_mp3.so
 @exec %D/sbin/apxs -e -A -n mp3 %D/%F
 @unexec %D/sbin/apxs -e -A -n mp3 %D/%F
-%%PORTDOCS%%share/doc/mod_mp3/ChangeLog
-%%PORTDOCS%%share/doc/mod_mp3/CONTRIBUTORS
-%%PORTDOCS%%share/doc/mod_mp3/README
-%%PORTDOCS%%share/doc/mod_mp3/TODO
-%%PORTDOCS%%share/doc/mod_mp3/faq.html
-%%PORTDOCS%%@dirrm share/doc/mod_mp3