From 3d7be3e6f8d3d3c127d84db202a34207de52a2a7 Mon Sep 17 00:00:00 2001 From: nivit Date: Fri, 2 Feb 2007 16:46:22 +0000 Subject: - Updated to 5.4.1 - Added files/interchange.sh.in - Removed files/interchange.sh PR: ports/108665 Submitted by: loader (maintainer) Approved by: alexbl (mentor, implicit) --- www/interchange/Makefile | 9 +++--- www/interchange/distinfo | 6 ++-- www/interchange/files/interchange.sh | 49 ------------------------------ www/interchange/files/interchange.sh.in | 53 +++++++++++++++++++++++++++++++++ www/interchange/pkg-deinstall | 10 +++++-- www/interchange/pkg-install | 3 +- www/interchange/pkg-plist | 5 +++- 7 files changed, 74 insertions(+), 61 deletions(-) delete mode 100644 www/interchange/files/interchange.sh create mode 100644 www/interchange/files/interchange.sh.in (limited to 'www') diff --git a/www/interchange/Makefile b/www/interchange/Makefile index fcdfd0eeea8d..47ce0df5a27b 100644 --- a/www/interchange/Makefile +++ b/www/interchange/Makefile @@ -6,7 +6,7 @@ # PORTNAME= interchange -PORTVERSION= 5.4.0 +PORTVERSION= 5.4.1 CATEGORIES= www MASTER_SITES= http://ftp.icdevgroup.org/interchange/5.4/tar/ @@ -20,6 +20,7 @@ BUILD_DEPENDS= ${ARCH_PERL}/Safe/Hole.pm:${PORTSDIR}/security/p5-Safe-Hole \ ${SITE_PERL}/Business/OnlinePayment.pm:${PORTSDIR}/finance/p5-Business-OnlinePayment USE_PERL5= yes +USE_BZIP2= yes PERL_CONFIGURE= yes OPTIONS= MYSQL "Add MySQL support" off \ @@ -27,6 +28,8 @@ OPTIONS= MYSQL "Add MySQL support" off \ .include +USE_RC_SUBR= interchange.sh + .if defined(WITH_MYSQL) BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql USE_SQLDB= yes @@ -111,12 +114,10 @@ pre-install: @${MKDIR} ${PREFIX}/interchange post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/interchange.sh \ - ${PREFIX}/etc/rc.d/interchange.sh.sample .for i in compile_link config_prog configdump dump expire expireall interchange localize makecat offline restart update @${REINPLACE_CMD} -i "" -e "s:${PREFIX}:${PREFIX}/interchange:g; s:${PREFIX}/interchange/bin: ${PREFIX}/bin:g" ${PREFIX}/bin/${i} .endfor - @${CHOWN} -R interch:interch ${PREFIX}/interchange + @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL .if ${PERL_LEVEL} < 500600 IGNORE= needs perl 5.6.1 or higher, install lang/perl5.8 and try again. diff --git a/www/interchange/distinfo b/www/interchange/distinfo index d976363e993f..b08ebdea47d3 100644 --- a/www/interchange/distinfo +++ b/www/interchange/distinfo @@ -1,3 +1,3 @@ -MD5 (interchange-5.4.0.tar.gz) = def855c7cfca000ad41f44cd4db83476 -SHA256 (interchange-5.4.0.tar.gz) = e73c69e8c8ba0b10142f83051781c48fb885aec96d117fb2b88785041a37ecd4 -SIZE (interchange-5.4.0.tar.gz) = 2295141 +MD5 (interchange-5.4.1.tar.bz2) = 8fec2aedd97a0ccb0c3ef6655da062dc +SHA256 (interchange-5.4.1.tar.bz2) = 77637ad7e413eeb863a1bb8e329eb7688dfb1933efcac056a6dbda7477453a40 +SIZE (interchange-5.4.1.tar.bz2) = 1989233 diff --git a/www/interchange/files/interchange.sh b/www/interchange/files/interchange.sh deleted file mode 100644 index 6992188b7624..000000000000 --- a/www/interchange/files/interchange.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: interchange -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable Interchange: -# interchange_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable Interchange -# interchange_config (str): Default config file: -# /usr/local/interchange/interchange.cfg -# interchange_args (str): Custom additional arguments to be passed -# to interchange (default empty). -# - - -. /etc/rc.subr - -name="interchange" -rcvar=`set_rcvar` - -interchange_enable=${interchange_enable:-"NO"} -interchange_config=${interchange_config:-"/usr/local/interchange/interchange.cfg"} -interchange_args=${interchange_args:-""} - -load_rc_config $name - -interchange_user="interch" -pidfile="/var/run/interchange/interchange.pid" -command="/usr/local/bin/interchange" -command_interpreter="/usr/local/bin/perl" -command_args="--config=${interchange_config} ${interchange_args}" - -stop_cmd="interchange_cmd --stop" -restart_cmd="interchange_cmd --restart" -reload_cmd="interchange_cmd --restart" - -interchange_cmd() -{ - su -l ${interchange_user} -c "exec env PIDfile=${pidfile} ${command} ${command_args} $1" -} - -run_rc_command "$1" - diff --git a/www/interchange/files/interchange.sh.in b/www/interchange/files/interchange.sh.in new file mode 100644 index 000000000000..1eba6a50ef9f --- /dev/null +++ b/www/interchange/files/interchange.sh.in @@ -0,0 +1,53 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: interchange +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable Interchange: +# interchange_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable Interchange +# interchange_config (str): Default config file: +# /usr/local/interchange/interchange.cfg +# interchange_args (str): Custom additional arguments to be passed +# to interchange (default empty). +# + +. %%RC_SUBR%% + +name="interchange" +rcvar=`set_rcvar` + +interchange_enable=${interchange_enable:-"NO"} +interchange_config=${interchange_config:-"%%PREFIX%%/interchange/interchange.cfg"} +interchange_args=${interchange_args:-""} + +load_rc_config $name + +interchange_user="interch" +rundir="/var/run/interchange" +pidfile="${rundir}/${name}.pid" +command="%%PREFIX%%/bin/interchange" +command_interpreter="%%PREFIX%%/bin/perl" +command_args="--config=${interchange_config} ${interchange_args}" + +start_cmd="interchange_cmd" +stop_cmd="interchange_cmd --stop" +restart_cmd="interchange_cmd --restart" +reload_cmd="interchange_cmd --restart" + +interchange_cmd() +{ + su -l ${interchange_user} -c "exec env PERL_SIGNALS=unsafe \ + ${command} -pidfile ${pidfile} PIDfile=${pidfile} \ + -rundir ${rundir} SocketFile=${rundir}/socket \ + IPCsocket=${rundir}/socket.ipc ${command_args} $1" +} + +run_rc_command "$1" + diff --git a/www/interchange/pkg-deinstall b/www/interchange/pkg-deinstall index 64924fede56f..7dfcf9b6382f 100644 --- a/www/interchange/pkg-deinstall +++ b/www/interchange/pkg-deinstall @@ -11,8 +11,12 @@ USER=interch # Don't delete it, there may be ${USER} owned files around. pw usershow "${USER}" >/dev/null 2>&1 \ - && echo -e "*\n\ -* To clean up the Interchange from your filesystem, run 'rm -fr ${PKG_PREFIX}/interchange.' \n\ -* To delete the user '${USER}' permanently, use 'pw userdel ${USER}'.\n*" + && echo -e "\n\ +* To clean up the Interchange from your filesystem, +* run 'rm -fr ${PKG_PREFIX}/interchange' +* and 'rm -fr /var/run/interchange' +* +* To delete the user '${USER}' permanently, +* use 'pw userdel ${USER}'.\n" exit 0 diff --git a/www/interchange/pkg-install b/www/interchange/pkg-install index 6dba3592ed2b..15810cde5d9b 100644 --- a/www/interchange/pkg-install +++ b/www/interchange/pkg-install @@ -41,6 +41,7 @@ PRE-INSTALL) fi ;; POST-INSTALL) - chown -R ${USER}:${GROUP} ${PKG_PREFIX}/interchange + /usr/bin/install -d -m 755 -o ${USER} -g ${GROUP} /var/run/interchange + /usr/sbin/chown -R ${USER}:${GROUP} ${PKG_PREFIX}/interchange ;; esac diff --git a/www/interchange/pkg-plist b/www/interchange/pkg-plist index 7b75b1bb1071..e48f32f499b6 100644 --- a/www/interchange/pkg-plist +++ b/www/interchange/pkg-plist @@ -13,7 +13,6 @@ bin/makecat bin/offline bin/restart bin/update -etc/rc.d/interchange.sh.sample interchange/_session_storable interchange/_uid interchange/catalog_after.cfg @@ -1184,6 +1183,7 @@ interchange/src/mod_interchange/Makefile interchange/src/mod_interchange/README interchange/src/mod_interchange/mod_interchange.c interchange/src/mod_interchange/mod_interchange.html +interchange/src/mod_perl2/Interchange/Link.pm.mod_perl-1.999_21_and_before interchange/src/mod_perl2/Interchange/Link.pm interchange/src/mod_perl2/README interchange/src/mod_perl_tlink.pl @@ -1513,6 +1513,7 @@ interchange/standard/products/ship/Priority.txt interchange/standard/products/ship/Xarea.csv interchange/standard/products/ship/Zone.csv interchange/standard/products/ship/air_pp.txt +interchange/standard/products/ship/ems.txt interchange/standard/products/ship/shipping.asc interchange/standard/products/ship/surf_pp.txt interchange/standard/products/ship/ups_cache.txt @@ -1757,3 +1758,5 @@ interchange/standard/variables/THEME_CSS @dirrmtry interchange/src @dirrmtry interchange/etc @dirrmtry interchange +@cwd / +@dirrmtry /var/run/interchange -- cgit