svn commit: r418444 - in head/www/mini_httpd: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Jul 12 19:47:08 2016
New Revision: 418444
URL: https://svnweb.freebsd.org/changeset/ports/418444

Log:
  - Update to 1.25
  - Switch to USES=ssl
  - Switch to @sample
  - Fix rc.d script filename
  - Pass maintainership to submitter
  
  PR:             210895
  Submitted by:   leres at ee.lbl.gov

Modified:
  head/www/mini_httpd/Makefile
  head/www/mini_httpd/distinfo
  head/www/mini_httpd/files/patch-Makefile
  head/www/mini_httpd/pkg-plist

Modified: head/www/mini_httpd/Makefile
==============================================================================
--- head/www/mini_httpd/Makefile	Tue Jul 12 19:44:44 2016	(r418443)
+++ head/www/mini_httpd/Makefile	Tue Jul 12 19:47:08 2016	(r418444)
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	mini_httpd
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.acme.com/software/mini_httpd/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	leres at ee.lbl.gov
 COMMENT=	Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cpe
+USES=		cpe ssl
 CPE_VENDOR=	acme
-USE_OPENSSL=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1
@@ -25,7 +24,7 @@ do-install:
 	${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 ${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${STAGEDIR}${PREFIX}/etc/rc.d/mini_httpd
 	${INSTALL_MAN} ${WRKSRC}/htpasswd.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}-htpasswd.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${STAGEDIR}${PREFIX}/etc/mini_httpd.cnf.sample

Modified: head/www/mini_httpd/distinfo
==============================================================================
--- head/www/mini_httpd/distinfo	Tue Jul 12 19:44:44 2016	(r418443)
+++ head/www/mini_httpd/distinfo	Tue Jul 12 19:47:08 2016	(r418444)
@@ -1,2 +1,3 @@
-SHA256 (mini_httpd-1.24.tar.gz) = ba3846368f1c42b10931b5c25199b011d243dbf8025e51e3e2c2919952f6c359
-SIZE (mini_httpd-1.24.tar.gz) = 43192
+TIMESTAMP = 1467863467
+SHA256 (mini_httpd-1.25.tar.gz) = 25a0325e698d6bf828ab8089d5ba8835edd7384936cd3074e1543ecafd85958c
+SIZE (mini_httpd-1.25.tar.gz) = 43628

Modified: head/www/mini_httpd/files/patch-Makefile
==============================================================================
--- head/www/mini_httpd/files/patch-Makefile	Tue Jul 12 19:44:44 2016	(r418443)
+++ head/www/mini_httpd/files/patch-Makefile	Tue Jul 12 19:47:08 2016	(r418444)
@@ -1,4 +1,4 @@
---- Makefile.orig	2014-10-19 06:33:43 UTC
+--- Makefile.orig	2016-07-07 03:21:44 UTC
 +++ Makefile
 @@ -15,17 +15,21 @@ CRYPT_LIB =    -lcrypt
  # tree with your OpenSSL installation - depending on how you installed it,
@@ -18,10 +18,10 @@
  
  
 -BINDIR =	/usr/local/sbin
-+BINDIR =	${PREFIX}/sbin
 -MANDIR =	/usr/local/man
-+MANDIR =	${MANPREFIX}/man
 -CC =		cc
++BINDIR =	${PREFIX}/sbin
++MANDIR =	${MANPREFIX}/man
 +CC ?=		cc
  CDEFS =		$(SSL_DEFS) $(SSL_INC)
 -CFLAGS =	-O $(CDEFS) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long

Modified: head/www/mini_httpd/pkg-plist
==============================================================================
--- head/www/mini_httpd/pkg-plist	Tue Jul 12 19:44:44 2016	(r418443)
+++ head/www/mini_httpd/pkg-plist	Tue Jul 12 19:47:08 2016	(r418444)
@@ -1,6 +1,6 @@
-etc/mini_httpd.cnf.sample
+ at sample etc/mini_httpd.cnf.sample
 etc/periodic/daily/500.mini_httpd-rotate
-etc/rc.d/mini_httpd.sh
+etc/rc.d/mini_httpd
 man/man1/mini_httpd-htpasswd.1.gz
 man/man8/mini_httpd.8.gz
 sbin/mini_httpd