- Adopt, also adopt direct dependecy textproc/glimpse

- APACHE_COMPAT is deprecated, remove apache* from RUN_DEPENDS
- cleanup WWWDIR
- cleanup DOCSDIR
- use WWWOWN and WWWGRP
- Respect NOPORTDOCS

2 files changed, 49 insertions, 50 deletions

diff --git a/www/webglimpse/Makefile b/www/webglimpse/Makefile
index 54bf47b9bc16..8cbf0ea64cb1 100644
--- a/www/webglimpse/Makefile
+++ b/www/webglimpse/Makefile
@@ -12,18 +12,17 @@ CATEGORIES=	www textproc
 MASTER_SITES=	ftp://ftp.deva.net/pub/sources/ir/glimpse/
 DISTNAME=	${PKGNAME}.src
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	WWW interface to Glimpse search engine
 
-RUN_DEPENDS+=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS+=	glimpse:${PORTSDIR}/textproc/glimpse
+RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse
 
-WRKSRC=		${WRKDIR}/webglimpse-1.6.edu
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.edu
 
-NO_CDROM=	depends on glimpse
 USE_PERL5=	yes
+USE_APACHE=	1.3
+NO_CDROM=	depends on glimpse
 NO_BUILD=	yes
-APACHE_COMPAT=	yes
 
 pre-configure:
 .for i in wginstall wginstall.pl
@@ -32,14 +31,14 @@ pre-configure:
 .endfor
 
 do-install:
-	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
-		${PREFIX}/www/webglimpse
+	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 ${WWWDIR}/
 .if defined(PACKAGE_BUILDING)
-	${INSTALL_DATA} ${FILESDIR}/.wgsiteconf ${PREFIX}/www/webglimpse
+	${INSTALL_DATA} ${FILESDIR}/.wgsiteconf ${WWWDIR}/
 .endif
 	cd ${WRKSRC}; ./wginstall
-	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
-		${PREFIX}/share/doc/webglimpse
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} * ${PREFIX}/share/doc/webglimpse
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} * ${DOCSDIR}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/webglimpse/pkg-plist b/www/webglimpse/pkg-plist
index ed04d3fb70f5..433f623ecf6f 100644
--- a/www/webglimpse/pkg-plist
+++ b/www/webglimpse/pkg-plist
@@ -1,41 +1,41 @@
-share/doc/webglimpse/confarc.html
-share/doc/webglimpse/install_1.6.html
-share/doc/webglimpse/sample.wgsiteconf
+%%PORTDOCS%%%%DOCSDIR%%/confarc.html
+%%PORTDOCS%%%%DOCSDIR%%/install_1.6.html
+%%PORTDOCS%%%%DOCSDIR%%/sample.wgsiteconf
 www/cgi-bin/mfs
 www/cgi-bin/webglimpse
 www/cgi-bin/webglimpse-fullsearch
-www/webglimpse/.archives
-www/webglimpse/.wgsiteconf
-www/webglimpse/Makefile
-www/webglimpse/addsearch
-www/webglimpse/confarc
-www/webglimpse/dist/glimpse-eye.jpg
-www/webglimpse/dist/glimpse_filters
-www/webglimpse/dist/wgall.html
-www/webglimpse/dist/wgbox.html
-www/webglimpse/dist/wgfilter-box
-www/webglimpse/dist/wgfilter-index
-www/webglimpse/dist/wgindex.html
-www/webglimpse/getfile
-www/webglimpse/lib/OutputTool.pm
-www/webglimpse/lib/URL.pl
-www/webglimpse/lib/config.pl
-www/webglimpse/lib/ftplib.pl
-www/webglimpse/lib/html2txt
-www/webglimpse/lib/html2txt.c
-www/webglimpse/lib/httpget
-www/webglimpse/lib/httpget.c
-www/webglimpse/lib/httpget.pl
-www/webglimpse/lib/siteconf.pl
-www/webglimpse/lib/url_get
-www/webglimpse/lib/url_get.pl
-www/webglimpse/lib/utils.h
-www/webglimpse/lib/webgutils.pl
-www/webglimpse/lib/wgserver.pl
-www/webglimpse/makecron
-www/webglimpse/makenh
-www/webglimpse/rmarc
-@dirrm www/webglimpse/dist
-@dirrm www/webglimpse/lib
-@dirrm www/webglimpse
-@dirrm share/doc/webglimpse
+%%WWWDIR%%/.archives
+%%WWWDIR%%/.wgsiteconf
+%%WWWDIR%%/Makefile
+%%WWWDIR%%/addsearch
+%%WWWDIR%%/confarc
+%%WWWDIR%%/dist/glimpse-eye.jpg
+%%WWWDIR%%/dist/glimpse_filters
+%%WWWDIR%%/dist/wgall.html
+%%WWWDIR%%/dist/wgbox.html
+%%WWWDIR%%/dist/wgfilter-box
+%%WWWDIR%%/dist/wgfilter-index
+%%WWWDIR%%/dist/wgindex.html
+%%WWWDIR%%/getfile
+%%WWWDIR%%/lib/OutputTool.pm
+%%WWWDIR%%/lib/URL.pl
+%%WWWDIR%%/lib/config.pl
+%%WWWDIR%%/lib/ftplib.pl
+%%WWWDIR%%/lib/html2txt
+%%WWWDIR%%/lib/html2txt.c
+%%WWWDIR%%/lib/httpget
+%%WWWDIR%%/lib/httpget.c
+%%WWWDIR%%/lib/httpget.pl
+%%WWWDIR%%/lib/siteconf.pl
+%%WWWDIR%%/lib/url_get
+%%WWWDIR%%/lib/url_get.pl
+%%WWWDIR%%/lib/utils.h
+%%WWWDIR%%/lib/webgutils.pl
+%%WWWDIR%%/lib/wgserver.pl
+%%WWWDIR%%/makecron
+%%WWWDIR%%/makenh
+%%WWWDIR%%/rmarc
+@dirrm %%WWWDIR%%/dist
+@dirrm %%WWWDIR%%/lib
+@dirrm %%WWWDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%