From acbe68d02532072045b8a8383b13974a78cffb5e Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Tue, 28 Apr 2009 06:10:54 +0000
Subject: [PATCH] - USE_APACHE=yes is deprecated - Handle NOPORTEXAMPLES - Use
 SF macro - Use APACHEMODDIR in pkg-plist

PR:		ports/133645
Submitted by:	pgollucci
---
 www/mod_gzip/Makefile  | 18 +++++++++++-------
 www/mod_gzip/pkg-plist | 34 ++++++++++++++++------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/www/mod_gzip/Makefile b/www/mod_gzip/Makefile
index a9582444c26e..95721770fbb8 100644
--- a/www/mod_gzip/Makefile
+++ b/www/mod_gzip/Makefile
@@ -8,14 +8,14 @@
 PORTNAME=	mod_gzip
 PORTVERSION=	1.3.26.1a
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mod-gzip
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	An Internet Content Acceleration module for Apache
 
-USE_APACHE=	yes
+USE_APACHE=	1.3
 MAKE_ENV+=	"APXS=${APXS}"
 ALL_TARGET=	build
 
@@ -23,12 +23,16 @@ post-patch:
 	@${REINPLACE_CMD} 's|-Wc,-Wall,-O3,-fomit-frame-pointer,-pipe||' \
 		${WRKSRC}/Makefile
 
+PORTEXAMPLES=	${PORTNAME}.conf.sample
+
 post-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/mod_gzip.conf.sample ${EXAMPLESDIR}
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/docs/${PORTNAME}.conf.sample ${EXAMPLESDIR}/
+.endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/manual/english/* ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/docs/manual/english/* ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/mod_gzip/pkg-plist b/www/mod_gzip/pkg-plist
index 45274e10e7ad..328f826c5e7a 100644
--- a/www/mod_gzip/pkg-plist
+++ b/www/mod_gzip/pkg-plist
@@ -1,20 +1,18 @@
-libexec/apache/mod_gzip.so
+%%APACHEMODDIR%%/mod_gzip.so
 @exec %D/sbin/apxs -e -A -n gzip %f
 @unexec %D/sbin/apxs -e -A -n gzip %f
-%%PORTDOCS%%share/doc/mod_gzip/browser.htm
-%%PORTDOCS%%share/doc/mod_gzip/cache.htm
-%%PORTDOCS%%share/doc/mod_gzip/config.htm
-%%PORTDOCS%%share/doc/mod_gzip/encoding.htm
-%%PORTDOCS%%share/doc/mod_gzip/enhancements.htm
-%%PORTDOCS%%share/doc/mod_gzip/extern.gif
-%%PORTDOCS%%share/doc/mod_gzip/firewalls.htm
-%%PORTDOCS%%share/doc/mod_gzip/index.htm
-%%PORTDOCS%%share/doc/mod_gzip/links.htm
-%%PORTDOCS%%share/doc/mod_gzip/mod_gzip_logo.gif
-%%PORTDOCS%%share/doc/mod_gzip/status.htm
-%%PORTDOCS%%share/doc/mod_gzip/valid-css.png
-%%PORTDOCS%%share/doc/mod_gzip/valid-xhtml11.png
-%%PORTDOCS%%share/doc/mod_gzip/versions.htm
-share/examples/mod_gzip/mod_gzip.conf.sample
-@dirrm share/examples/mod_gzip
-%%PORTDOCS%%@dirrm share/doc/mod_gzip
+%%PORTDOCS%%%%DOCSDIR%%/browser.htm
+%%PORTDOCS%%%%DOCSDIR%%/cache.htm
+%%PORTDOCS%%%%DOCSDIR%%/config.htm
+%%PORTDOCS%%%%DOCSDIR%%/encoding.htm
+%%PORTDOCS%%%%DOCSDIR%%/enhancements.htm
+%%PORTDOCS%%%%DOCSDIR%%/extern.gif
+%%PORTDOCS%%%%DOCSDIR%%/firewalls.htm
+%%PORTDOCS%%%%DOCSDIR%%/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/links.htm
+%%PORTDOCS%%%%DOCSDIR%%/mod_gzip_logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/status.htm
+%%PORTDOCS%%%%DOCSDIR%%/valid-css.png
+%%PORTDOCS%%%%DOCSDIR%%/valid-xhtml11.png
+%%PORTDOCS%%%%DOCSDIR%%/versions.htm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%