ports/70727: [UPDATE] Enable OPTIONS feature of ports/www/rnews

[Ying-Chieh Chen]

>Number:         70727
>Category:       ports
>Synopsis:       [UPDATE] Enable OPTIONS feature of ports/www/rnews
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 20 15:40:15 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Chen
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD alumni 4.10-STABLE FreeBSD 4.10-STABLE #25: Fri Jul 2 07:46:15 CST 2004 wcpan at ccduty:/bsdhome/bsd4/obj/bsdhome/bsd4/src/sys/CSIEBSD i386


	
>Description:

	Enable OPTIONS feature of ports/www/rnews

>How-To-Repeat:

	Apply the patch.

>Fix:

	

--- rnews.patch begins here ---
diff -ruN /usr/ports/www/rnews/Makefile rnews/Makefile
--- /usr/ports/www/rnews/Makefile	Sun Aug  1 00:06:41 2004
+++ rnews/Makefile	Fri Aug 20 20:27:06 2004
@@ -14,12 +14,6 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A server-side rss aggregator written in php with mysql
 
-.if defined(WITH_PHP3)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
-
 USE_MYSQL=	yes
 
 NO_BUILD=	yes
@@ -27,12 +21,14 @@
 		magpierss/CHANGES magpierss/ChangeLog magpierss/INSTALL \
 		magpierss/NEWS magpierss/README magpierss/TROUBLESHOOTING
 
-pre-everything::
-.if !defined(WITH_PHP3)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Press CTRL-C and define WITH_PHP3 if you want"
-	@${ECHO_MSG} "to use RNEWS with PHP3. PHP4 is used by default."
-	@${ECHO_MSG} ""
+OPTIONS=	PHP3 "use RNEWS with PHP3 (Default is PHP4)" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PHP3)
+RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
+.else
+RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 .endif
 
 post-patch:
@@ -61,4 +57,4 @@
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/www/rnews/magpierss/cache
 	@${SED} "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- rnews.patch ends here ---


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