Bug 76556 - Update: www/publicfile optional patches
Summary: Update: www/publicfile optional patches
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-01-22 00:40 UTC by David Thiel
Modified: 2005-02-27 18:43 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (63.49 KB, patch)
2005-01-22 00:40 UTC, David Thiel
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description David Thiel 2005-01-22 00:40:21 UTC
Adding the following optional patches to publicfile, djb's web/ftp server:

WITH_BASICAUTH - basic HTTP authentication support
WITH_COMMONLOG - support for Apache common log format
WITH_REDIRECT_SLASH - don't complain when omitting trailing slash
WITH_SSL - provide SSL support through ucspi-ssl

Also, take maintainership of the port.
Comment 1 David Thiel 2005-01-22 01:28:22 UTC
Changing to use OPTIONS. Diff against the Makefile(after original diff is
applied):

--- /tmp/publicfile.Makefile	Fri Jan 21 16:56:26 2005
+++ Makefile	Fri Jan 21 17:22:32 2005
@@ -18,29 +18,21 @@
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 
-pre-everything::
+OPTIONS=	BASICAUTH "basic HTTP authentication support" off \
+		COMMONLOG "support for Apache common log format" off \
+		REDIRECT_SLASH "don't error when omitting trailing slash" off \
+		SSL "provide SSL support through ucspi-ssl" off
 
-	@${ECHO_MSG}
-	@${ECHO_MSG} "This port can use the following tuneables:"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "WITH_BASICAUTH 		basic HTTP authentication support"
-	@${ECHO_MSG} "WITH_COMMONLOG 		support for Apache common log format"
-	@${ECHO_MSG} "WITH_REDIRECT_SLASH 	don't complain when omitting trailing slash"
-	@${ECHO_MSG} "WITH_SSL 		provide SSL support through ucspi-ssl"
-	@${ECHO_MSG}
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_BASICAUTH) && defined(WITH_COMMONLOG)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Currently the common log and auth patches conflict."
-	@${ECHO_MSG}
-BROKEN=	"Currently the common log and auth patches conflict."
+BROKEN=	"Currently the common log and auth patches conflict.\
+	Run 'make config' to reconfigure the port."
 .endif
 
 .if defined(WITH_BASICAUTH) && defined(WITH_REDIRECT_SLASH)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Currently the redirect slash and auth patches conflict."
-	@${ECHO_MSG}
-BROKEN=	"Currently the redirect slash and auth patches conflict."
+BROKEN=	"Currently the redirect slash and auth patches conflict.\
+	Run 'make config' to reconfigure the port."
 .endif
 
 .if defined(WITH_REDIRECT_SLASH)
@@ -92,4 +84,4 @@
 	@${ECHO_CMD} "${CC} -s" > ${WRKSRC}/conf-ld
 	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Comment 2 Volker Stolz freebsd_committer freebsd_triage 2005-02-27 18:42:44 UTC
State Changed
From-To: open->closed

Committed, thanks! 
I modified the port to use suitable OPTIONS.