aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LEGAL2
-rw-r--r--mail/silkymail/pkg-message2
-rw-r--r--mail/websieve/Makefile4
-rw-r--r--shells/wapsh/Makefile3
-rw-r--r--www/rnews/Makefile10
5 files changed, 4 insertions, 17 deletions
diff --git a/LEGAL b/LEGAL
index a7b4420fc60e..ea5bfa5d28c4 100644
--- a/LEGAL
+++ b/LEGAL
@@ -508,8 +508,6 @@ so-7-ga-bin-linux-en.* ports/editors/staroffice70 Must be bought and downloaded
direct from Sun via www interface
socks5-* ports/net/socks5 No commercial use
SpaceAryarya-KXL-* ports/games/spacearyarya Possible copyright infringement
-spdbv37-Linux.tar.gz ports/biology/spdbv Must be downloaded direct from
- Expasy via www interface
speedmgmt* ports/net/pppoa Not for redistribution - see
http://www.alcatel.com/consumer-
/dsl/disclaimer_lx.htm
diff --git a/mail/silkymail/pkg-message b/mail/silkymail/pkg-message
index 076604ffc265..2829f3cd44f4 100644
--- a/mail/silkymail/pkg-message
+++ b/mail/silkymail/pkg-message
@@ -11,7 +11,7 @@ in %%LOCALBASE%%/etc/php.ini
It is recommended that you restart Apache.
Silkymail requires an IMAP server. If you want to install one on
-this machine, you may install the ports mail/cyrus-imapd, or
+this machine, you may install the ports mail/cyrus-imapd22,
mail/imap-uw, or mail/courier-imap.
************************************************************************
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index 5f5d73c8b068..56113eb490b3 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -24,10 +24,8 @@ DISTVERSION= 063a
RUN_DEPENDS= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd22
.elif ${WITH_CYRUS_IMAPD_VER} == 21
RUN_DEPENDS= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd2
-.elif ${WITH_CYRUS_IMAPD_VER} == 20
-RUN_DEPENDS= ${CYRUS_IMAP_PM}:${PORTSDIR}/mail/cyrus-imapd
.else
-.error WITH_CYRUS_IMAPD_VER must be 22, 21 or 20
+.error WITH_CYRUS_IMAPD_VER must be 22 or 21
.endif
.else
RUN_DEPENDS= ${SITE_PERL}/IMAP/Admin.pm:${PORTSDIR}/mail/p5-IMAP-Admin \
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index f82da143f9cb..5e1c6537d809 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -15,9 +15,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A system to allow remote shell logins via a WAP phone or web browser
-#RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
-# ${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
-
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
USERGUIDEDOCS= Image10.jpg Image11.jpg Image12.jpg Image13.jpg \
diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index 7b31fcc909e1..ffe1dd938a57 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A server-side rss aggregator written in php with mysql
+RUN_DEPENDS= ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
+
USE_MYSQL= yes
NO_BUILD= yes
@@ -21,16 +23,8 @@ MYPORTDOCS= CHANGELOG INSTALL LICENSE README magpierss/AUTHORS \
magpierss/CHANGES magpierss/ChangeLog magpierss/INSTALL \
magpierss/NEWS magpierss/README magpierss/TROUBLESHOOTING
-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:
@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr