svn commit: r484119 - head/www/mini_httpd

[Craig Leres]

Author: leres
Date: Sun Nov  4 18:17:42 2018
New Revision: 484119
URL: https://svnweb.freebsd.org/changeset/ports/484119

Log:
  After consulting with upstream it turns out 500.mini_httpd-rotate
  is supposed to be an example so add an EXAMPLES option and install
  (or not) appropriately.
  
  PR:		232926
  Reported by:	Oleg Strizhak
  Approved by:	ler (mentor, implicit)

Modified:
  head/www/mini_httpd/Makefile
  head/www/mini_httpd/pkg-plist

Modified: head/www/mini_httpd/Makefile
==============================================================================
--- head/www/mini_httpd/Makefile	Sun Nov  4 18:15:36 2018	(r484118)
+++ head/www/mini_httpd/Makefile	Sun Nov  4 18:17:42 2018	(r484119)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mini_httpd
 PORTVERSION=	1.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	https://www.acme.com/software/mini_httpd/
 
@@ -16,6 +16,8 @@ USES=		cpe ssl
 
 CPE_VENDOR=	acme
 
+OPTIONS_DEFINE+=	EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/' \
 		${WRKSRC}/htpasswd.1
@@ -23,13 +25,9 @@ post-patch:
 		${WRKSRC}/${PORTNAME}.8
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
-	@${MKDIR} ${STAGEDIR}${PREFIX}/www/chroot/logs
 	${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/htpasswd \
 		${STAGEDIR}${PREFIX}/sbin/${PORTNAME}-htpasswd
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/500.mini_httpd-rotate \
-		${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh \
@@ -40,5 +38,8 @@ do-install:
 		${STAGEDIR}${MANPREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf \
 		${STAGEDIR}${PREFIX}/etc/mini_httpd.cnf.sample
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/500.mini_httpd-rotate \
+		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/www/mini_httpd/pkg-plist
==============================================================================
--- head/www/mini_httpd/pkg-plist	Sun Nov  4 18:15:36 2018	(r484118)
+++ head/www/mini_httpd/pkg-plist	Sun Nov  4 18:17:42 2018	(r484119)
@@ -1,9 +1,9 @@
 @sample etc/mini_httpd.cnf.sample
-etc/periodic/daily/500.mini_httpd-rotate
 etc/rc.d/mini_httpd
 man/man1/mini_httpd-htpasswd.1.gz
 man/man8/mini_httpd.8.gz
 sbin/mini_httpd
 sbin/mini_httpd-htpasswd
 sbin/mini_httpd_wrapper
- at dir www/chroot/logs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/500.mini_httpd-rotate
+%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%