From owner-svn-ports-all@FreeBSD.ORG Sat Apr 19 16:58:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 605D02D0; Sat, 19 Apr 2014 16:58:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 408AE15C4; Sat, 19 Apr 2014 16:58:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3JGwEHO044121; Sat, 19 Apr 2014 16:58:14 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3JGwDIU044118; Sat, 19 Apr 2014 16:58:13 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201404191658.s3JGwDIU044118@svn.freebsd.org> From: Chris Rees Date: Sat, 19 Apr 2014 16:58:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351601 - in head/mail/sympa: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2014 16:58:14 -0000 Author: crees Date: Sat Apr 19 16:58:13 2014 New Revision: 351601 URL: http://svnweb.freebsd.org/changeset/ports/351601 QAT: https://qat.redports.org/buildarchive/r351601/ Log: pkg-messageify pkg-message rather than using pkg-install Suggested by: mat Added: head/mail/sympa/files/pkg-message.in (contents, props changed) Modified: head/mail/sympa/Makefile head/mail/sympa/files/pkg-install.in Modified: head/mail/sympa/Makefile ============================================================================== --- head/mail/sympa/Makefile Sat Apr 19 16:33:48 2014 (r351600) +++ head/mail/sympa/Makefile Sat Apr 19 16:58:13 2014 (r351601) @@ -61,8 +61,8 @@ CONFIGURE_ARGS+=--bindir=${PREFIX}/libex --with-spooldir=/var/spool/${PORTNAME} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} MAKE_ENV?= PERL_EXTUTILS_AUTOINSTALL=--skip -SUB_FILES= pkg-install -SUB_LIST= DB_TYPE=${DB_TYPE:L} WITH_FASTCGI=${PORT_OPTIONS:MFASTCGI} +SUB_FILES= pkg-install pkg-message +SUB_LIST= DB_TYPE=${DB_TYPE:L} PORTEXAMPLES= * USE_RC_SUBR= sympa @@ -98,10 +98,13 @@ PLIST_SUB+= NLS="@comment " .if ${PORT_OPTIONS:MFASTCGI} RUN_DEPENDS+= p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI +SUB_LIST+= FCGI="" . if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22+ RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi . endif +.else +SUB_LIST+= FCGI="@comment " .endif .if ${PORT_OPTIONS:MORACLE} Modified: head/mail/sympa/files/pkg-install.in ============================================================================== --- head/mail/sympa/files/pkg-install.in Sat Apr 19 16:33:48 2014 (r351600) +++ head/mail/sympa/files/pkg-install.in Sat Apr 19 16:58:13 2014 (r351601) @@ -2,55 +2,12 @@ # $FreeBSD$ # -DB_TYPE=%%DB_TYPE%% -WITH_FASTCGI=%%WITH_FASTCGI%% +[ "$2" = "POST_INSTALL" ] || exit 0 -case $2 in -POST-INSTALL) - echo "======================================================" - if [ -n "${DB_TYPE}" ]; then - echo "If this is your first installation of sympa, please load" - echo "this file with your ${DB_TYPE} database client:" - echo " %%PREFIX%%/libexec/sympa/create_db.${DB_TYPE}" - echo "" - fi - echo "To configure sympa interactively, please run:" - echo " perl %%PREFIX%%/libexec/sympa/sympa_wizard.pl" - echo "" - - for conf in sympa.conf wwsympa.conf - do [ ! -f ${PKG_PREFIX}/etc/${conf} ] \ - && cp -p ${PKG_PREFIX}/etc/${conf}.sample ${PKG_PREFIX}/etc/${conf} \ - && chmod u+w ${PKG_PREFIX}/etc/${conf} - done - - echo "You may also manually edit the two configuration files:" - echo " ${PKG_PREFIX}/etc/sympa.conf" - echo " ${PKG_PREFIX}/etc/wwsympa.conf" - echo "======================================================" - echo "To set up the wwsympa server, add something like this to" - echo "your Apache configuration file:" - echo "" - echo " DocumentRoot \"%%DATADIR%%\"" - echo " AddDefaultCharset UTF-8" - echo " DirectoryIndex wws" - echo " Options +Indexes" - if [ -n "${WITH_FASTCGI}" ]; then - echo " LoadModule fastcgi_module libexec/apache2/mod_fastcgi.so" - echo " " - echo " SetHandler fastcgi-script" - echo " " - fi - echo " " - echo " Allow from all" - echo " " - echo " ScriptAlias /wws %%PREFIX%%/libexec/sympa/wwsympa-wrapper" - echo "======================================================" - exit 0 - ;; -PRE-INSTALL) - exit 0 - ;; -esac +for conf in sympa.conf wwsympa.conf +do [ ! -f ${PKG_PREFIX}/etc/${conf} ] && \ + cp -p ${PKG_PREFIX}/etc/${conf}.sample ${PKG_PREFIX}/etc/${conf} && \ + chmod u+w ${PKG_PREFIX}/etc/${conf} +done exit 0 Added: head/mail/sympa/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sympa/files/pkg-message.in Sat Apr 19 16:58:13 2014 (r351601) @@ -0,0 +1,26 @@ +If this is your first installation of sympa, please load +this file with your %%DB_TYPE%% database client: + %%PREFIX%%/libexec/sympa/create_db.%%DB_TYPE%% + +To configure sympa interactively, please run: + perl %%PREFIX%%/libexec/sympa/sympa_wizard.pl + +You may also manually edit the two configuration files: + %%PREFIX%%/etc/sympa.conf + %%PREFIX%%/etc/wwsympa.conf + +To set up the wwsympa server, add something like this to +your Apache configuration file: + + DocumentRoot "%%DATADIR%%" + AddDefaultCharset UTF-8 + DirectoryIndex wws + Options +Indexes +%%FCGI%% LoadModule fastcgi_module libexec/apache2/mod_fastcgi.so +%%FCGI%% +%%FCGI%% SetHandler fastcgi-script +%%FCGI%% + + Allow from all + + ScriptAlias /wws %%PREFIX%%/libexec/sympa/wwsympa-wrapper