Index: head/www/mini_httpd/Makefile
===================================================================
--- head/www/mini_httpd/Makefile	(revision 415007)
+++ head/www/mini_httpd/Makefile	(revision 415008)
@@ -1,37 +1,33 @@
 # Created by: se
 # $FreeBSD$
 
 PORTNAME=	mini_httpd
-PORTVERSION=	1.23
+PORTVERSION=	1.24
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.acme.com/software/mini_httpd/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe
 CPE_VENDOR=	acme
-MAKE_ARGS=	SSL_TREE="${OPENSSLBASE}"
 USE_OPENSSL=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1
 	@${REINPLACE_CMD} -e 's/\(htpasswd(1)\)/${PORTNAME}-\1/g' ${WRKSRC}/${PORTNAME}.8
-	@${REINPLACE_CMD} \
-		-e '/^CFLAGS =/s|=|= ${CFLAGS}|' \
-		-e '/^LDFLAGS =/s|=|= ${LDFLAGS}|' ${WRKSRC}/Makefile
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
 	${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 ${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_MAN} ${WRKSRC}/htpasswd.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}-htpasswd.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${STAGEDIR}${PREFIX}/etc/mini_httpd.cnf.sample
 
 .include <bsd.port.mk>
Index: head/www/mini_httpd/distinfo
===================================================================
--- head/www/mini_httpd/distinfo	(revision 415007)
+++ head/www/mini_httpd/distinfo	(revision 415008)
@@ -1,2 +1,2 @@
-SHA256 (mini_httpd-1.23.tar.gz) = bcc8c88392a4baeba5fa3ca8b924e9558c3dcb3018989b228d4f621acc8fffca
-SIZE (mini_httpd-1.23.tar.gz) = 43322
+SHA256 (mini_httpd-1.24.tar.gz) = ba3846368f1c42b10931b5c25199b011d243dbf8025e51e3e2c2919952f6c359
+SIZE (mini_httpd-1.24.tar.gz) = 43192
Index: head/www/mini_httpd/files/patch-Makefile
===================================================================
--- head/www/mini_httpd/files/patch-Makefile	(revision 415007)
+++ head/www/mini_httpd/files/patch-Makefile	(revision 415008)
@@ -1,25 +1,32 @@
 --- Makefile.orig	2014-10-19 06:33:43 UTC
 +++ Makefile
-@@ -15,17 +15,17 @@ CRYPT_LIB =    -lcrypt
+@@ -15,17 +15,21 @@ CRYPT_LIB =    -lcrypt
  # tree with your OpenSSL installation - depending on how you installed it,
  # it may be in /usr/local instead of /usr/local/ssl.
  #SSL_TREE =	/usr/local/ssl
 -#SSL_DEFS =	-DUSE_SSL
 -#SSL_INC =	-I$(SSL_TREE)/include
 -#SSL_LIBS =	-L$(SSL_TREE)/lib -lssl -lcrypto
 +SSL_DEFS =	-DUSE_SSL
-+SSL_INC =	-I$(SSL_TREE)/include
-+SSL_LIBS =	-L$(SSL_TREE)/lib -lssl -lcrypto
++.if "$(OPENSSLINC)" != "/usr/include"
++SSL_INC =	-I$(OPENSSLINC)
++.endif
++.if "$(OPENSSLLIB)" != "/usr/lib"
++SSL_LIBS =	-L$(OPENSSLLIB)
++.endif
++SSL_LIBS+=	-lssl -lcrypto
  
  
- BINDIR =	/usr/local/sbin
- MANDIR =	/usr/local/man
- CC =		cc
+-BINDIR =	/usr/local/sbin
++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
 -LDFLAGS =	-s
-+CFLAGS = -O2 -pipe  -fstack-protector -fno-strict-aliasing	$(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
-+LDFLAGS =  -Wl,-rpath,/usr/local/lib -fstack-protector	-s
++CFLAGS +=	$(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
  LDLIBS =	$(CRYPT_LIB) $(SSL_LIBS) $(SYSV_LIBS)
  
  all:		mini_httpd htpasswd