ports/153405: [PATCH] www/mini_httpd: allow to build without ssl

[Anton Yuzhaninov]

>Number:         153405
>Category:       ports
>Synopsis:       [PATCH] www/mini_httpd: allow to build without ssl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 23 14:40:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Anton Yuzhaninov
>Release:        FreeBSD 8.0-STABLE-20100215 amd64
>Organization:
Openstat.ru
>Environment:

>Description:
1. Makefile for port www/mini_httpd has NO_SSL knob, but it don't work.
Port always build with SSL support despite this knob.
>How-To-Repeat:
cd /usr/ports/www/mini_httpd && make -DNO_SSL
...
cc -O2 -pipe -fno-strict-aliasing  -DUSE_SSL  -c match.c
cc -O2 -pipe -fno-strict-aliasing  -DUSE_SSL  -c tdate_parse.c
cc -O2 -pipe -fno-strict-aliasing  -DUSE_SSL  -c htpasswd.c
...

2. While here - remove MD5 from distinfo
>Fix:
--- mini_httpd-1.19.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/mini_httpd/Makefile /usr/home/ayuzhaninov/mini_httpd/Makefile
--- /usr/ports/www/mini_httpd/Makefile	2008-12-19 02:44:44.000000000 +0000
+++ /usr/home/ayuzhaninov/mini_httpd/Makefile	2010-12-23 14:18:59.000000000 +0000
@@ -15,7 +15,7 @@
 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 -ruN --exclude=CVS /usr/ports/www/mini_httpd/distinfo /usr/home/ayuzhaninov/mini_httpd/distinfo
--- /usr/ports/www/mini_httpd/distinfo	2006-08-12 15:20:00.000000000 +0000
+++ /usr/home/ayuzhaninov/mini_httpd/distinfo	2010-12-23 14:03:53.000000000 +0000
@@ -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 -ruN --exclude=CVS /usr/ports/www/mini_httpd/files/patch-Makefile /usr/home/ayuzhaninov/mini_httpd/files/patch-Makefile
--- /usr/ports/www/mini_httpd/files/patch-Makefile	2003-11-02 23:19:54.000000000 +0000
+++ /usr/home/ayuzhaninov/mini_httpd/files/patch-Makefile	2010-12-23 14:03:42.000000000 +0000
@@ -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
--- mini_httpd-1.19.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: