Date: Fri, 30 Aug 2013 14:42:07 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325702 - in head/mail/archiveopteryx: . files Message-ID: <201308301442.r7UEg7NV093042@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Fri Aug 30 14:42:06 2013 New Revision: 325702 URL: http://svnweb.freebsd.org/changeset/ports/325702 Log: - Actually commit rc script fixes - Convert to new Perl USES - Move pkg-install logic to @exec and post-install - Other suggested cleanup Approved by: crees (mentor) Deleted: head/mail/archiveopteryx/pkg-install Modified: head/mail/archiveopteryx/Makefile head/mail/archiveopteryx/files/archiveopteryx.in head/mail/archiveopteryx/pkg-descr head/mail/archiveopteryx/pkg-plist Modified: head/mail/archiveopteryx/Makefile ============================================================================== --- head/mail/archiveopteryx/Makefile Fri Aug 30 14:40:18 2013 (r325701) +++ head/mail/archiveopteryx/Makefile Fri Aug 30 14:42:06 2013 (r325702) @@ -8,15 +8,16 @@ CATEGORIES= mail MASTER_SITES= http://archiveopteryx.org/download/ MAINTAINER= feld@FreeBSD.org -COMMENT= An advanced PostgreSQL-based IMAP/POP server +COMMENT= Advanced PostgreSQL-based IMAP/POP server LICENSE= BSD LICENSE_FILE= ${WRKSRC}/bsd.txt BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam +USES= perl5 USE_BZIP2= yes -USE_PERL5_BUILD= yes +USE_PERL5= build USE_PGSQL= yes MAN5= aoxsuper.conf.5 archiveopteryx.conf.5 @@ -47,7 +48,8 @@ do-install: @cd ${WRKSRC} && ${JAM} install post-install: - @${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL + ${INSTALL} -d -o root -g wheel -m 700 /var/db/aox/jail + ${INSTALL} -d -o ${USERS} -g ${GROUPS} /var/db/aox/messages @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Modified: head/mail/archiveopteryx/files/archiveopteryx.in ============================================================================== --- head/mail/archiveopteryx/files/archiveopteryx.in Fri Aug 30 14:40:18 2013 (r325701) +++ head/mail/archiveopteryx/files/archiveopteryx.in Fri Aug 30 14:42:06 2013 (r325702) @@ -15,46 +15,41 @@ . /etc/rc.subr -name="archiveopteryx" +name=archiveopteryx rcvar=archiveopteryx_enable +load_rc_config $name archiveopteryx_enable=${archiveopteryx_enable:-"NO"} -pidfile=/var/run/${name}.pid +pidfile=/var/run/aox/${name}.pid config_file=%%PREFIX%%/etc/archiveopteryx/archiveopteryx.conf required_files=$config_file command=%%PREFIX%%/bin/aox -extra_commands="status" -status_cmd="do_status" -start_cmd="do_start" -stop_cmd="do_stop" -restart_cmd="do_restart" +extra_commands=status +status_cmd="${command} show status" +start_cmd=do_start +stop_cmd=do_stop +restart_cmd=do_restart do_start() { - echo -n "Starting Archiveopteryx: " - ${command} start - echo "done." + echo -n "Starting Archiveopteryx: " + ${command} start + echo "done." } do_stop() { - echo -n "Stopping Archiveopteryx: " - ${command} stop - echo "done." + echo -n "Stopping Archiveopteryx: " + ${command} stop + echo "done." } do_restart() { - echo -n "Restarting Archiveopteryx: " - ${command} restart - echo "done." + echo -n "Restarting Archiveopteryx: " + ${command} restart + echo "done." } -do_status() -{ - ${command} show status -} - -load_rc_config $name run_rc_command "$1" Modified: head/mail/archiveopteryx/pkg-descr ============================================================================== --- head/mail/archiveopteryx/pkg-descr Fri Aug 30 14:40:18 2013 (r325701) +++ head/mail/archiveopteryx/pkg-descr Fri Aug 30 14:42:06 2013 (r325702) @@ -3,4 +3,4 @@ long-term archival storage. It seeks to manage large archives, but to use the information therein on a daily basis instead of relegating it to offline storage. -WWW: http://www.archiveopteryx.org/ +WWW: http://www.archiveopteryx.org/ Modified: head/mail/archiveopteryx/pkg-plist ============================================================================== --- head/mail/archiveopteryx/pkg-plist Fri Aug 30 14:40:18 2013 (r325701) +++ head/mail/archiveopteryx/pkg-plist Fri Aug 30 14:42:06 2013 (r325702) @@ -23,3 +23,5 @@ sbin/recorder @dirrmtry /var/db/aox/messages @dirrmtry /var/db/aox @dirrmtry /var/run/aox +@exec install -d -o root -g wheel -m 700 /var/db/aox/jail +@exec install -d -o %%USERS%% -g %%GROUPS%% /var/db/aox/messages
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308301442.r7UEg7NV093042>