Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 28 Oct 2012 22:20:28 +0000 (UTC)
From:      Gabor Pali <pgj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306586 - head/www/bozohttpd
Message-ID:  <201210282220.q9SMKSES012363@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pgj
Date: Sun Oct 28 22:20:28 2012
New Revision: 306586
URL: http://svn.freebsd.org/changeset/ports/306586

Log:
  - Fix handling of options
  
  Inspired by:	jhale
  Feature safe:	yes

Modified:
  head/www/bozohttpd/Makefile

Modified: head/www/bozohttpd/Makefile
==============================================================================
--- head/www/bozohttpd/Makefile	Sun Oct 28 22:19:55 2012	(r306585)
+++ head/www/bozohttpd/Makefile	Sun Oct 28 22:20:28 2012	(r306586)
@@ -23,31 +23,28 @@ HTPASSWD_DESC=		Enable htpassword suppor
 SSL_DESC=		Enable SSL support
 CGI_DESC=		Enable CGI support
 
-#make happy portlint
-.if empty(PORT_OPTIONS:MSSL)
-.else
-USE_OPENSSL=	yes
-.endif
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTPASSWD}
-CFLAGS+=	-DDO_HTPASSWD
-MAKE_ARGS+=	'LDFLAGS+= -lcrypt'
+MAKE_ARGS+=	'COPTS+=	-DDO_HTPASSWD' \
+		'LDFLAGS+= -lcrypt'
 .else
-CFLAGS+=	-UDO_HTPASSWD
+MAKE_ARGS+=	'COPTS+=	-UDO_HTPASSWD'
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
-CFLAGS+=	-UNO_SSL_SUPPORT
+USE_OPENSSL=	yes
+MAKE_ARGS+=	'COPTS+=	-UNO_SSL_SUPPORT'
 .else
-CFLAGS+=	-DNO_SSL_SUPPORT
+MAKE_ARGS+=	'COPTS+=	-DNO_SSL_SUPPORT' \
+		'CRYPTOLIBS=' \
+		'CRYPTODEPS='
 .endif
 
 .if ${PORT_OPTIONS:MCGI}
-CFLAGS+=	-UNO_CGIBIN_SUPPORT
+MAKE_ARGS+=	'COPTS+=	-UNO_CGIBIN_SUPPORT'
 .else
-CFLAGS+=	-DNO_CGIBIN_SUPPORT
+MAKE_ARGS+=	'COPTS+=	-DNO_CGIBIN_SUPPORT'
 .endif
 
 MAN8=		bozohttpd.8



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210282220.q9SMKSES012363>