summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2010-12-24 00:45:59 +0000
committerWen Heping <wen@FreeBSD.org>2010-12-24 00:45:59 +0000
commit3b95fcf23ea257fcec1d19cf86b77552c84582f7 (patch)
tree14ec244817ccd669505e6f73bea293ad6cb0dae4 /www
parent- Bump PORTREVISION since distinfo change. (diff)
- Allow to build without ssl
PR: ports/153405 Submitted by: Anton Yuzhaninov <citrin@citrin.ru>
Notes
Notes: svn path=/head/; revision=266820
Diffstat (limited to 'www')
-rw-r--r--www/mini_httpd/Makefile2
-rw-r--r--www/mini_httpd/distinfo1
-rw-r--r--www/mini_httpd/files/patch-Makefile14
3 files changed, 8 insertions, 9 deletions
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index cc7c751a19f8..086eb077713b 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
.ifndef NO_SSL
-USE_OPENSSL= YES
+MAKE_ARGS+= -DUSE_OPENSSL
.endif
MAN8= mini_httpd.8 htpasswd.8
diff --git a/www/mini_httpd/distinfo b/www/mini_httpd/distinfo
index 869c824b75d4..bbaafb61c17e 100644
--- a/www/mini_httpd/distinfo
+++ b/www/mini_httpd/distinfo
@@ -1,3 +1,2 @@
-MD5 (mini_httpd-1.19.tar.gz) = 7c68293ad265ecfe2edea917912f6f1f
SHA256 (mini_httpd-1.19.tar.gz) = f7f36533b1338ea16d916ea525ea7006ab38fdd3544ac7df93a4688a8e270241
SIZE (mini_httpd-1.19.tar.gz) = 42063
diff --git a/www/mini_httpd/files/patch-Makefile b/www/mini_httpd/files/patch-Makefile
index 200a1e4ea41d..68349ea2176f 100644
--- a/www/mini_httpd/files/patch-Makefile
+++ b/www/mini_httpd/files/patch-Makefile
@@ -1,19 +1,19 @@
---- Makefile.orig Thu Oct 30 22:53:07 2003
-+++ Makefile Thu Oct 30 23:03:24 2003
-@@ -14,17 +14,18 @@
+--- Makefile.orig 2002-11-01 23:02:57.000000000 +0000
++++ Makefile 2010-12-23 14:02:54.000000000 +0000
+@@ -14,17 +14,20 @@
# http://www.openssl.org/ Make sure the SSL_TREE definition points to the
# tree with your OpenSSL installation - depending on how you installed it,
# it may be in /usr/local instead of /usr/local/ssl.
-+.ifndef NO_OPENSSL
++.ifdef USE_OPENSSL
#SSL_TREE = /usr/local/ssl
-#SSL_DEFS = -DUSE_SSL
+SSL_DEFS = -DUSE_SSL
#SSL_INC = -I${SSL_TREE}/include
--#SSL_LIBS = -L${SSL_TREE}/lib -lssl -lcrypto
--
+ #SSL_LIBS = -L${SSL_TREE}/lib -lssl -lcrypto
+SSL_LIBS = -lssl -lcrypto
+.endif
+
BINDIR = /usr/local/sbin
MANDIR = /usr/local/man
-CC = gcc
@@ -24,7 +24,7 @@
#CFLAGS = -g ${CDEFS}
LDFLAGS = -s
#LDFLAGS = -g
-@@ -76,9 +77,7 @@
+@@ -76,9 +79,7 @@
-mkdir -p ${BINDIR}
cp mini_httpd htpasswd ${BINDIR}
rm -f ${MANDIR}/man8/mini_httpd.8 ${MANDIR}/man1/htpasswd.1