Date: Tue, 24 May 2016 13:15:40 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> 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 Message-ID: <201605241315.u4ODFeRg088174@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605241315.u4ODFeRg088174>