Stagify.

Approved by:	portmgr@ (blanket approval)

3 files changed, 38 insertions, 41 deletions

diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index 9a611698ab8f..f7718438e9a4 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -14,17 +14,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
-
-MAN8=		logwatch.8
-DOCS=		HOWTO-Customize-LogWatch License README
-
+SHEBANG_FILES=	scripts/logwatch.pl
+PORTDOCS=	HOWTO-Customize-LogWatch README
 NO_BUILD=	yes
-
 MAKE_ENV+=	SITE_PERL_REL=${SITE_PERL_REL}
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 pre-configure:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
@@ -45,10 +44,10 @@ post-patch:
 	${WRKSRC}/conf/logwatch.conf
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/HOWTO-Customize-LogWatch ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/HOWTO-Customize-LogWatch ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/logwatch/files/Makefile b/sysutils/logwatch/files/Makefile
index 2aeb3d28fb64..5436d6bc24e3 100644
--- a/sysutils/logwatch/files/Makefile
+++ b/sysutils/logwatch/files/Makefile
@@ -19,29 +19,29 @@ logwatch:
 	@echo "reading the ./README file."
 
 install:
-	install -d ${PREFIX}/sbin
-	install -d ${ETCDIR}/html
-	install -d ${ETCDIR}/logfiles
-	install -d ${ETCDIR}/services
-	install -d ${ETCDIR}/defaults/html
-	install -d ${ETCDIR}/defaults/logfiles
-	install -d ${ETCDIR}/defaults/services
-	install -d ${LIBEXECDIR}
-	install -d ${SITE_PERL}
-	install -d ${CACHEDIR}
-	install -d ${MAN8DIR}
-	install -m 555 scripts/logwatch.pl ${PREFIX}/sbin
-	install -m 555 lib/Logwatch.pm ${SITE_PERL}
-	install -m 444 logwatch.8 ${MAN8DIR}
-	install -m 644 conf/logwatch.conf ${ETCDIR}/defaults
-	install -m 640 conf/ignore.conf ${ETCDIR}/defaults
-	install -m 444 conf/html/header.html ${ETCDIR}/defaults/html
-	install -m 444 conf/html/footer.html ${ETCDIR}/defaults/html
+	install -d $(DESTDIR)${PREFIX}/sbin
+	install -d $(DESTDIR)${ETCDIR}/html
+	install -d $(DESTDIR)${ETCDIR}/logfiles
+	install -d $(DESTDIR)${ETCDIR}/services
+	install -d $(DESTDIR)${ETCDIR}/defaults/html
+	install -d $(DESTDIR)${ETCDIR}/defaults/logfiles
+	install -d $(DESTDIR)${ETCDIR}/defaults/services
+	install -d $(DESTDIR)${LIBEXECDIR}
+	install -d $(DESTDIR)${SITE_PERL}
+	install -d $(DESTDIR)${CACHEDIR}
+	install -d $(DESTDIR)${MAN8DIR}
+	install -m 555 scripts/logwatch.pl $(DESTDIR)${PREFIX}/sbin
+	install -m 555 lib/Logwatch.pm $(DESTDIR)${SITE_PERL}
+	install -m 444 logwatch.8 $(DESTDIR)${MAN8DIR}
+	install -m 644 conf/logwatch.conf $(DESTDIR)${ETCDIR}/defaults
+	install -m 640 conf/ignore.conf $(DESTDIR)${ETCDIR}/defaults
+	install -m 444 conf/html/header.html $(DESTDIR)${ETCDIR}/defaults/html
+	install -m 444 conf/html/footer.html $(DESTDIR)${ETCDIR}/defaults/html
 .for etcdir in html logfiles services
-	mkdir -p ${ETCDIR}/defaults/${etcdir}
+	mkdir -p $(DESTDIR)${ETCDIR}/defaults/${etcdir}
 .endfor
 .for scriptdir in logfiles services shared
-	mkdir -p ${LIBEXECDIR}/defaults/${scriptdir}
+	mkdir -p $(DESTDIR)${LIBEXECDIR}/defaults/${scriptdir}
 .endfor
 .for logfile in \
 	autorpm \
@@ -88,7 +88,7 @@ install:
 	windows \
 	xferlog \
 	yum 
-	install -m 640 conf/logfiles/${logfile}.conf ${ETCDIR}/defaults/logfiles/${logfile}.conf
+	install -m 640 conf/logfiles/${logfile}.conf $(DESTDIR)${ETCDIR}/defaults/logfiles/${logfile}.conf
 .endfor
 .for service in \
 	afpd \
@@ -189,8 +189,8 @@ install:
 	zz-runtime \
 	zz-sys \
 	zz-zfs
-	install -m 444 scripts/services/${service} ${LIBEXECDIR}/defaults/services/${service}
-	install -m 444 conf/services/${service}.conf ${ETCDIR}/defaults/services/${service}.conf
+	install -m 444 scripts/services/${service} $(DESTDIR)${LIBEXECDIR}/defaults/services/${service}
+	install -m 444 conf/services/${service}.conf $(DESTDIR)${ETCDIR}/defaults/services/${service}.conf
 .endfor
 .for script in \
 	applybinddate \
@@ -211,12 +211,12 @@ install:
 	remove \
 	removeheaders \
 	removeservice 
-	install -m 555 scripts/shared/${script} ${LIBEXECDIR}/defaults/shared/${script}
+	install -m 555 scripts/shared/${script} $(DESTDIR)${LIBEXECDIR}/defaults/shared/${script}
 .endfor
 .for logfile in autorpm cron emerge samba up2date xferlog yum
-	mkdir -p ${LIBEXECDIR}/defaults/logfiles/${logfile}
-	install -m 555 scripts/logfiles/${logfile}/applydate ${LIBEXECDIR}/defaults/logfiles/${logfile}
+	mkdir -p $(DESTDIR)${LIBEXECDIR}/defaults/logfiles/${logfile}
+	install -m 555 scripts/logfiles/${logfile}/applydate $(DESTDIR)${LIBEXECDIR}/defaults/logfiles/${logfile}
 .endfor
 .for logfile in samba up2date xferlog 
-	install -m 555 scripts/logfiles/${logfile}/removeheaders ${LIBEXECDIR}/defaults/logfiles/${logfile}
+	install -m 555 scripts/logfiles/${logfile}/removeheaders $(DESTDIR)${LIBEXECDIR}/defaults/logfiles/${logfile}
 .endfor
diff --git a/sysutils/logwatch/pkg-plist b/sysutils/logwatch/pkg-plist
index 0a428f16e766..5130795d11d0 100644
--- a/sysutils/logwatch/pkg-plist
+++ b/sysutils/logwatch/pkg-plist
@@ -144,8 +144,6 @@ etc/logwatch/defaults/services/zz-sys.conf
 etc/logwatch/defaults/services/zz-zfs.conf
 etc/logwatch/defaults/ignore.conf
 etc/logwatch/defaults/logwatch.conf
-%%PORTDOCS%%%%DOCSDIR%%/HOWTO-Customize-LogWatch
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%SITE_PERL%%/Logwatch.pm
 libexec/logwatch/defaults/logfiles/autorpm/applydate
 libexec/logwatch/defaults/logfiles/cron/applydate
@@ -273,6 +271,7 @@ libexec/logwatch/defaults/shared/onlyservice
 libexec/logwatch/defaults/shared/remove
 libexec/logwatch/defaults/shared/removeheaders
 libexec/logwatch/defaults/shared/removeservice
+man/man8/logwatch.8.gz
 sbin/logwatch.pl
 @exec mkdir -p %D/var/logwatch
 @dirrm var/logwatch
@@ -289,7 +288,6 @@ sbin/logwatch.pl
 @dirrm libexec/logwatch/defaults/logfiles
 @dirrm libexec/logwatch/defaults
 @dirrm libexec/logwatch
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/logwatch/defaults/services
 @dirrm etc/logwatch/defaults/logfiles
 @dirrm etc/logwatch/defaults/html