Index: www/mini_httpd/Makefile =================================================================== --- www/mini_httpd/Makefile (revision 418159) +++ www/mini_httpd/Makefile (working copy) @@ -2,18 +2,26 @@ # $FreeBSD$ PORTNAME= mini_httpd -PORTVERSION= 1.24 +PORTVERSION= 1.25 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/mini_httpd/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= leres@ee.lbl.gov COMMENT= Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6 LICENSE= BSD2CLAUSE -USES= cpe +PLIST_FILES= "@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 + +USES= cpe ssl CPE_VENDOR= acme -USE_OPENSSL= yes post-patch: @${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1 @@ -25,7 +33,7 @@ ${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 Index: www/mini_httpd/distinfo =================================================================== --- www/mini_httpd/distinfo (revision 418159) +++ www/mini_httpd/distinfo (working copy) @@ -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 Index: www/mini_httpd/files/patch-Makefile =================================================================== --- www/mini_httpd/files/patch-Makefile (revision 418159) +++ www/mini_httpd/files/patch-Makefile (working copy) @@ -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 +-MANDIR = /usr/local/man +-CC = cc +BINDIR = ${PREFIX}/sbin --MANDIR = /usr/local/man +MANDIR = ${MANPREFIX}/man --CC = cc +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