Date: Thu, 1 Feb 2007 11:28:16 -0800 (PST) From: loader <loader@freebsdmall.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108665: [MAINTAINER UPDATE] www/interchange Message-ID: <20070201192816.8214F1D6F14C@mail.freebsdmall.com> Resent-Message-ID: <200702011930.l11JUCta016548@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108665 >Category: ports >Synopsis: [MAINTAINER UPDATE] www/interchange >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Feb 01 19:30:12 GMT 2007 >Closed-Date: >Last-Modified: >Originator: loader >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD mall.freebsdmall.com 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Wed Nov 23 21:25:06 PST 2005 murray@top.kuaitech.com:/usr/obj/usr/src/sys/TOP i386 >Description: update 5.4.0->5.4.1 >How-To-Repeat: >Fix: diff -ruN interchange.orig/Makefile interchange/Makefile --- interchange.orig/Makefile Thu Feb 1 12:18:35 2007 +++ interchange/Makefile Thu Feb 1 18:14:26 2007 @@ -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 @@ ${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 @@ .include <bsd.port.pre.mk> +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 @@ @${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 -ruN interchange.orig/distinfo interchange/distinfo --- interchange.orig/distinfo Thu Feb 1 12:18:35 2007 +++ interchange/distinfo Thu Feb 1 13:30:16 2007 @@ -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 -ruN interchange.orig/files/interchange.sh interchange/files/interchange.sh --- interchange.orig/files/interchange.sh Thu Feb 1 12:18:35 2007 +++ interchange/files/interchange.sh Thu Jan 1 00:00:00 1970 @@ -1,49 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/www/interchange/files/interchange.sh,v 1.3 2006/02/20 20:47:48 dougb Exp $ -# - -# 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 -ruN interchange.orig/files/interchange.sh.in interchange/files/interchange.sh.in --- interchange.orig/files/interchange.sh.in Thu Jan 1 00:00:00 1970 +++ interchange/files/interchange.sh.in Thu Feb 1 17:59:03 2007 @@ -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 -ruN interchange.orig/pkg-deinstall interchange/pkg-deinstall --- interchange.orig/pkg-deinstall Thu Feb 1 12:18:35 2007 +++ interchange/pkg-deinstall Thu Feb 1 18:25:15 2007 @@ -11,8 +11,12 @@ # 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 -ruN interchange.orig/pkg-install interchange/pkg-install --- interchange.orig/pkg-install Thu Feb 1 12:18:35 2007 +++ interchange/pkg-install Thu Feb 1 18:14:05 2007 @@ -41,6 +41,7 @@ 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 -ruN interchange.orig/pkg-plist interchange/pkg-plist --- interchange.orig/pkg-plist Thu Feb 1 12:18:35 2007 +++ interchange/pkg-plist Thu Feb 1 18:58:17 2007 @@ -13,7 +13,6 @@ 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/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/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 @@ @dirrmtry interchange/src @dirrmtry interchange/etc @dirrmtry interchange +@cwd / +@dirrmtry /var/run/interchange >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070201192816.8214F1D6F14C>