Date: Tue, 1 Nov 2005 15:41:11 -0800 From: "Devon O'Dell" <dodell@offmyserver.com> To: Edwin Groothuis <edwin@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/88308: [patch] Update www/raqdevil to 0.9.6 Message-ID: <20051101154111.D57263@knight.ixsystems.net> In-Reply-To: <200511010935.jA19Zn7G044001@freefall.freebsd.org>; from edwin@FreeBSD.org on Tue, Nov 01, 2005 at 09:35:49AM %2B0000 References: <200511010935.jA19Zn7G044001@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--jI8keyz6grp/JLjh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Nov 01, 2005 at 09:35:49AM +0000, Edwin Groothuis wrote: > Synopsis: [patch] Update www/raqdevil to 0.9.6 > > State-Changed-From-To: open->feedback > State-Changed-By: edwin > State-Changed-When: Tue Nov 1 09:33:52 GMT 2005 > State-Changed-Why: > Can you please double check the changes in the last Makefile I > submitted (I'll hint for it: USE_PHP, USE_GNOME, the removal of > LOCALBASE/bin etc) and incorperate them into your new version? > > http://www.freebsd.org/cgi/query-pr.cgi?pr=88308 Attached is a patch addressing your issues. Please let me know if I can / need to do anything else to make it nicer for inclusion. --Devon --jI8keyz6grp/JLjh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="raqdevil.diff" diff -ur /usr/ports/www/raqdevil/Makefile raqdevil/Makefile --- /usr/ports/www/raqdevil/Makefile Mon Oct 31 03:25:56 2005 +++ raqdevil/Makefile Tue Nov 1 15:24:07 2005 @@ -2,55 +2,52 @@ # Date created: 06 September 2005 # Whom: Devon H. O'Dell <dodell@offmyserver.com> # -# $FreeBSD: ports/www/raqdevil/Makefile,v 1.1 2005/10/31 11:25:56 edwin Exp $ +# $FreeBSD$ # PORTNAME= raqdevil -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.6 CATEGORIES= www sysutils -MASTER_SITES= http://raqdevil.alkeninternet.com/ \ - http://www.sitetronics.com/ +MASTER_SITES= http://www.raqdevil.com/ MAINTAINER= dodell@offmyserver.com COMMENT= A port of the Sun Cobalt RaQ550 software to FreeBSD -RUN_DEPENDS= \ - ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw \ - ${LOCALBASE}/libexec/qpopper:${PORTSDIR}/mail/qpopper \ - ${SITE_PERL}/${PERL_ARCH}/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \ - ${SITE_PERL}/${PERL_ARCH}/Quota.pm:${PORTSDIR}/sysutils/p5-Quota \ - ${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode \ - analog:${PORTSDIR}/www/analog \ - clamscan:${PORTSDIR}/security/clamav \ - logrotate:${PORTSDIR}/sysutils/logrotate \ - pcretest:${PORTSDIR}/devel/pcre \ - procmail:${PORTSDIR}/mail/procmail \ - proftpd:${PORTSDIR}/ftp/proftpd \ - sendmail:${PORTSDIR}/mail/sendmail-sasl \ - snmpd:${PORTSDIR}/net-mgmt/net-snmp \ - spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \ - xinetd:${PORTSDIR}/security/xinetd -BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ - re2c:${PORTSDIR}/devel/re2c +RUN_DEPENDS= ${LOCALBASE}/libexec/smrsh:${PORTSDIR}/mail/sendmail-sasl \ + ${SITE_PERL}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode \ + ${SITE_PERL}/mach/Quota.pm:${PORTSDIR}/sysutils/p5-Quota \ + ${SITE_PERL}/mach/Locale/gettext.pm:${PORTSDIR}/devel/p5-Locale-gettext \ + ${SITE_PERL}/GD/Graph.pm:${PORTSDIR}/graphics/p5-GD-Graph \ + ${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query \ + logrotate:${PORTSDIR}/sysutils/logrotate \ + httpd:${PORTSDIR}/www/apache20 \ + perl:${PORTSDIR}/lang/perl5.8 \ + imapd:${PORTSDIR}/mail/imap-uw \ + pcretest:${PORTSDIR}/devel/pcre \ + snmpd:${PORTSDIR}/net-mgmt/net-snmp \ + proftpd:${PORTSDIR}/ftp/proftpd \ + qpopauth:${PORTSDIR}/mail/qpopper \ + xinetd:${PORTSDIR}/security/xinetd \ + spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \ + procmail:${PORTSDIR}/mail/procmail \ + clamscan:${PORTSDIR}/security/clamav \ + analog:${PORTSDIR}/www/analog +BUILD_DEPENDS= re2c:${PORTSDIR}/devel/re2c USE_GNOME= glib20 -USE_PHP= xml pcre +USE_PHP= pcre session xml USE_GMAKE= yes USE_PERL5= yes USE_REINPLACE= yes +USE_APACHE= yes + +WITH_APACHE2= yes REINPLACE_ARGS= -i"" INSTALLS_SHLIB= yes LDCONFIG_DIRS= ${PREFIX}/raqdevil/lib -.include <bsd.port.pre.mk> - -.ifdef (WITH_APACHE) -WITH_APACHE2= yes -.endif -.ifndef (WITH_APACHE2) -BROKEN?= "This port requires Apache 2. Use make -DWITH_APACHE." -.endif +.include <bsd.port.pre.mk> pre-extract: @${SH} ${FILESDIR}/warning @@ -67,7 +64,7 @@ @${FIND} ${WRKSRC} -type f -name \*-e | ${XARGS} ${RM} -f post-install: - @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @PKG_PREFIX=${PREFIX} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ur /usr/ports/www/raqdevil/distinfo raqdevil/distinfo --- /usr/ports/www/raqdevil/distinfo Mon Oct 31 03:25:56 2005 +++ raqdevil/distinfo Tue Nov 1 15:26:39 2005 @@ -1,2 +1,2 @@ -MD5 (raqdevil-0.9.4.tar.gz) = e4f8a3aff80814788d588b3138355b20 -SIZE (raqdevil-0.9.4.tar.gz) = 2194931 +MD5 (raqdevil-0.9.6.tar.gz) = 7fa7a5134daa037384f465032cd15d2c +SIZE (raqdevil-0.9.6.tar.gz) = 2196422 diff -ur /usr/ports/www/raqdevil/pkg-install raqdevil/pkg-install --- /usr/ports/www/raqdevil/pkg-install Mon Oct 31 03:25:56 2005 +++ raqdevil/pkg-install Fri Oct 28 10:44:28 2005 @@ -1,5 +1,6 @@ #!/bin/sh +PREF=${PREFIX:-$PKG_PREFIX} PATH=/bin:/usr/sbin case $2 in @@ -19,13 +20,11 @@ /usr/bin/touch /etc/mail/access - if [ \! -d /usr/local/raqdevil/ui/web/base/sitestats/img ]; then - mkdir -p /usr/local/raqdevil/ui/web/base/sitestats/img; - chown www:wheel /usr/local/raqdevil/ui/web/base/sitestats/img; - mkdir -p /usr/local/raqdevil/skel/spam; - mkdir -p /usr/local/raqdevil/skel/quarantine; - mkdir -p /usr/local/raqdevil/sessions; - fi; + mkdir -p ${PREF}/raqdevil/ui/web/base/sitestats/img; + chown www:wheel ${PREF}/raqdevil/ui/web/base/sitestats/img; + mkdir -p ${PREF}/raqdevil/skel/spam; + mkdir -p ${PREF}/raqdevil/skel/quarantine; + mkdir -p ${PREF}/raqdevil/sessions; ( cd /etc/namedb; sh /etc/namedb/make-localhost ) ;; diff -ur /usr/ports/www/raqdevil/pkg-plist raqdevil/pkg-plist --- /usr/ports/www/raqdevil/pkg-plist Mon Oct 31 03:25:56 2005 +++ raqdevil/pkg-plist Fri Oct 28 17:33:27 2005 @@ -23,6 +23,7 @@ admserv/certs/request admserv/libexec bin/clamfilter.pl +bin/generateGraph.pl etc/apache2/httpd.conf etc/apache2/ssl.conf etc/build @@ -34,6 +35,7 @@ etc/rc.d/admserv.sh etc/rc.d/cced.sh etc/ssh_banner +etc/snmp/snmpd.conf etc/xinetd.conf etc/xinetd/xinetd.d/imap etc/xinetd/xinetd.d/imaps @@ -596,6 +598,9 @@ raqdevil/ui/style/trueBlue.xml raqdevil/ui/style/trueBlue.xml.en raqdevil/ui/style/trueBlue.xml.ja +raqdevil/ui/style/trueBlue.xml.fr +raqdevil/ui/style/trueBlue.xml.de +raqdevil/ui/style/trueBlue.xml.es raqdevil/ui/web/base/alpine/adminredirect.html raqdevil/ui/web/base/alpine/license.php raqdevil/ui/web/base/alpine/splashPersonal.php @@ -1006,7 +1011,10 @@ raqdevil/ui/web/uiLog.php raqdevil/ui/web/uifc/MultiFileUpload.php raqdevil/ui/web/uifc/MultiFileUploadHandler.php +sbin/ftplog2commonlog +sbin/maillog2commonlog.pl sbin/split_logs +sbin/grab_logs.pl share/locale/de/LC_MESSAGES/base-am.mo share/locale/de/LC_MESSAGES/base-apache.mo share/locale/de/LC_MESSAGES/base-cce.mo @@ -1286,8 +1294,6 @@ @dirrm raqdevil/ccewrap @dirrm raqdevil/bin @dirrm raqdevil -@dirrm etc/rc.d/init.d -@dirrm etc/ccewrap.d @dirrm admserv/run @dirrm admserv/conf.d @dirrm admserv/conf --jI8keyz6grp/JLjh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051101154111.D57263>