From owner-svn-ports-head@freebsd.org  Tue May 24 13:15:41 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EF1EB48495;
 Tue, 24 May 2016 13:15:41 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2712B18AE;
 Tue, 24 May 2016 13:15:41 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4ODFeGQ088176;
 Tue, 24 May 2016 13:15:40 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4ODFeRg088174;
 Tue, 24 May 2016 13:15:40 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201605241315.u4ODFeRg088174@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 24 May 2016 13:15:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r415785 - in head/www/mini_httpd: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 May 2016 13:15:41 -0000

Author: amdmi3
Date: Tue May 24 13:15:40 2016
New Revision: 415785
URL: https://svnweb.freebsd.org/changeset/ports/415785

Log:
  - Fix build on 9.x
  
  PR:		209731
  Submitted by:	nevecherya@gmail.com

Modified:
  head/www/mini_httpd/Makefile
  head/www/mini_httpd/files/patch-Makefile

Modified: head/www/mini_httpd/Makefile
==============================================================================
--- head/www/mini_httpd/Makefile	Tue May 24 13:11:18 2016	(r415784)
+++ head/www/mini_httpd/Makefile	Tue May 24 13:15:40 2016	(r415785)
@@ -26,8 +26,8 @@ do-install:
 	${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_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
 
 .include <bsd.port.mk>

Modified: head/www/mini_httpd/files/patch-Makefile
==============================================================================
--- head/www/mini_httpd/files/patch-Makefile	Tue May 24 13:11:18 2016	(r415784)
+++ head/www/mini_httpd/files/patch-Makefile	Tue May 24 13:15:40 2016	(r415785)
@@ -8,11 +8,11 @@
 -#SSL_INC =	-I$(SSL_TREE)/include
 -#SSL_LIBS =	-L$(SSL_TREE)/lib -lssl -lcrypto
 +SSL_DEFS =	-DUSE_SSL
-+.if "$(OPENSSLINC)" != "/usr/include"
-+SSL_INC =	-I$(OPENSSLINC)
++.if ${OPENSSLINC} != "/usr/include"
++SSL_INC =	-I${OPENSSLINC}
 +.endif
-+.if "$(OPENSSLLIB)" != "/usr/lib"
-+SSL_LIBS =	-L$(OPENSSLLIB)
++.if ${OPENSSLLIB} != "/usr/lib"
++SSL_LIBS =	-L${OPENSSLLIB}
 +.endif
 +SSL_LIBS+=	-lssl -lcrypto