2 files changed, 27 insertions, 39 deletions

diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index dce9ce83aadd..c8924a2aef7b 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -8,49 +8,46 @@
 PORTNAME=		gnatsweb
 PORTVERSION=		4.00
 CATEGORIES=		databases devel www
-MASTER_SITES=		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gnatsweb
+MASTER_SITES=		GNU
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		pgollucci@FreeBSD.org
 COMMENT=		Gnatsweb, a GNATS web interface
 
 RUN_DEPENDS=		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
-.ifdef WITH_APACHE2
-RUN_DEPENDS+=		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
-.endif
+USE_APACHE=	2.0+
 
 USE_PERL5_RUN=		yes
 NO_BUILD=		yes
 
-CGI_DIR?=		${PREFIX}/www/cgi-bin
+CGI_DIR?=		${WWWDIR}/cgi-bin
 
 PLIST_SUB=		CGI_DIR="${CGI_DIR:S,^${PREFIX}/,,}"
 
-DOCFILES=		CUSTOMIZE CUSTOMIZE.cb CUSTOMIZE.vars \
+PORTDOCS=		CUSTOMIZE CUSTOMIZE.cb CUSTOMIZE.vars \
 			ChangeLog INSTALL NEWS README TROUBLESHOOTING
 
-EXAMPLEFILES=		gnatsweb-site-example.pl
+PORTEXAMPLESS=		gnatsweb-site-example.pl
 
 do-install:
-	@${MKDIR} ${PREFIX}/etc/gnatsweb
-	@${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \
-		${PREFIX}/etc/gnatsweb/gnatsweb-site.pl.default
-	@[ -f ${PREFIX}/etc/gnatsweb/gnatsweb-site.pl ] || \
-		${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl \
-		${PREFIX}/etc/gnatsweb
-	@${MKDIR} ${CGI_DIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${CGI_DIR}
-	@${LN} -s ${PREFIX}/etc/gnatsweb/gnatsweb-site.pl ${CGI_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${CGI_DIR}
+	@${MKDIR} ${ETCDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl  ${ETCDIR}/gnatsweb-site.pl.default
+	@[ -f ${ETCDIR}/gnatsweb-site.pl ] || \
+		${INSTALL_DATA} ${WRKSRC}/gnatsweb-site.pl ${ETCDIR}/
+	@${MKDIR} ${CGI_DIR}/
+	@${INSTALL_SCRIPT} ${WRKSRC}/gnatsweb.pl ${CGI_DIR}/
+	@${LN} -s  ${ETCDIR}/gnatsweb-site.pl ${CGI_DIR}/
+	@${INSTALL_DATA} ${WRKSRC}/gnatsweb.html ${CGI_DIR}/
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@for doc in ${DOCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}; \
+	@${MKDIR} ${DOCSDIR}/
+	@for doc in ${PORTDOCS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${doc} ${DOCSDIR}/; \
 	done
-	@${MKDIR} ${EXAMPLESDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}/
 	@for example in ${EXAMPLEFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${example} ${EXAMPLESDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$${example} ${EXAMPLESDIR}/; \
 	done
 .endif
 
diff --git a/databases/gnatsweb4/pkg-plist b/databases/gnatsweb4/pkg-plist
index 8c537e931a89..d38366c9e7b8 100644
--- a/databases/gnatsweb4/pkg-plist
+++ b/databases/gnatsweb4/pkg-plist
@@ -1,20 +1,11 @@
-@comment $FreeBSD$
-@unexec if cmp -s %D/etc/gnatsweb/gnatsweb-site.pl %D/etc/gnatsweb/gnatsweb-site.pl.default; then rm -f %D/etc/gnatsweb/gnatsweb-site.pl; fi
-etc/gnatsweb/gnatsweb-site.pl.default
+@unexec if cmp -s %%ETCDIR%%/gnatsweb-site.pl %%ETCDIR%%/gnatsweb-site.pl.default; then rm -f %%ETCDIR%%/gnatsweb-site.pl; fi
+%%ETCDIR%%/gnatsweb-site.pl.default
 @exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl
-@dirrmtry etc/gnatsweb
 %%CGI_DIR%%/gnatsweb.pl
 %%CGI_DIR%%/gnatsweb-site.pl
 %%CGI_DIR%%/gnatsweb.html
-%%PORTDOCS%%%%DOCSDIR%%/CUSTOMIZE
-%%PORTDOCS%%%%DOCSDIR%%/CUSTOMIZE.cb
-%%PORTDOCS%%%%DOCSDIR%%/CUSTOMIZE.vars
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TROUBLESHOOTING
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/gnatsweb-site-example.pl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%ETCDIR%%/gnatsweb-site.pl
 @dirrmtry %%CGI_DIR%%
+@dirrmtry %%ETCDIR%%
+@dirrm %%WWWDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%