From cb341b6f648b7ae2656d8fe5f7cd565d97de0ab7 Mon Sep 17 00:00:00 2001 From: Felippe de Meirelles Motta Date: Fri, 20 Jun 2008 05:30:14 +0000 Subject: - Update to 0.6.2. - Add support to MySQL and PostgreSQL. PR: ports/124730 Submitted by: Luiz Otavio O Souza (maintainer) Approved by: gabor (mentor, implicit) --- net-im/msn-proxy/Makefile | 43 ++++++++++++++++++++++------- net-im/msn-proxy/distinfo | 9 ++++-- net-im/msn-proxy/files/pkg-message-mysql.in | 24 ++++++++++++++++ net-im/msn-proxy/files/pkg-message-pgsql.in | 21 ++++++++++++++ net-im/msn-proxy/files/pkg-message.in | 24 ---------------- net-im/msn-proxy/pkg-plist | 34 +++++++++++++++-------- 6 files changed, 106 insertions(+), 49 deletions(-) create mode 100644 net-im/msn-proxy/files/pkg-message-mysql.in create mode 100644 net-im/msn-proxy/files/pkg-message-pgsql.in delete mode 100644 net-im/msn-proxy/files/pkg-message.in (limited to 'net-im/msn-proxy') diff --git a/net-im/msn-proxy/Makefile b/net-im/msn-proxy/Makefile index 6a7efc5292af..0928472b7f5f 100644 --- a/net-im/msn-proxy/Makefile +++ b/net-im/msn-proxy/Makefile @@ -6,8 +6,7 @@ # PORTNAME= msn-proxy -PORTVERSION= 0.6 -PORTREVISION= 1 +PORTVERSION= 0.6.2 CATEGORIES= net-im MASTER_SITES= SF @@ -16,25 +15,49 @@ COMMENT= Messenger proxy/control daemon LIB_DEPENDS= event:${PORTSDIR}/devel/libevent -USE_MYSQL= yes +OPTIONS+= MYSQL "Use MySQL database version" off +OPTIONS+= PGSQL "Use Postgresql (pgsql) database version" on -SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME} DOCS= INSTALL MSNPROXYWWW= ajax.inc.php al.inc.php bl.inc.php chat-to.php chat.php \ conf.php default.array.cmd.inc.php default.array.option.inc.php \ default.array.status.inc.php fl.inc.php group.inc.php \ - header.inc.php index.php mysql.inc.php save_contact_op.php \ - save_default_op.php save_msg.php save_user_op.php user.php \ - view-to.php view.php user.inc.php + header.inc.php index.php save_contact_op.php save_default_op.php \ + save_msg.php save_user_op.php user.php view-to.php view.php \ + user.inc.php MSNPROXYIMG= ausente.gif block.gif notinlist.png ocupado.gif offline.gif \ online.gif send_im.gif webcam.png WANT_PHP_WEB= yes -USE_PHP= mysql session +USE_PHP= session sockets MAKE_ARGS= SYSCONFDIR=$(DESTDIR)${PREFIX}/etc/msn-proxy \ - BINDIR=$(DESTDIR)${PREFIX}/bin + BINDIR=$(DESTDIR)${PREFIX}/bin + +.include + +.if defined(WITH_PGSQL) +DISTVERSIONSUFFIX= -pgsql +MSNPROXYWWW+= pgsql.inc.php +SUB_FILES= pkg-message-pgsql +USE_PGSQL= yes +USE_PHP+= pgsql +PLIST_SUB+= PGSQL="" +.else +PLIST_SUB+= PGSQL="@comment " +.endif + +.if defined(WITH_MYSQL) +DISTVERSIONSUFFIX= -mysql +MSNPROXYWWW+= mysql.inc.php +SUB_FILES= pkg-message-mysql +USE_MYSQL= yes +USE_PHP+= mysql +PLIST_SUB+= MYSQL="" +.else +PLIST_SUB+= MYSQL="@comment " +.endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/config.h @@ -56,4 +79,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/net-im/msn-proxy/distinfo b/net-im/msn-proxy/distinfo index 3e80e52ae307..8aaf927ddb86 100644 --- a/net-im/msn-proxy/distinfo +++ b/net-im/msn-proxy/distinfo @@ -1,3 +1,6 @@ -MD5 (msn-proxy-0.6.tar.gz) = b8f2ef35061df1c6a98f4c5513577fac -SHA256 (msn-proxy-0.6.tar.gz) = b774ba46060d1f042917621348004041c54e41411e3edf78e42f570586b366d6 -SIZE (msn-proxy-0.6.tar.gz) = 81827 +MD5 (msn-proxy-0.6.2-pgsql.tar.gz) = 4e3183bb9030d713fb051b277ee9aed6 +SHA256 (msn-proxy-0.6.2-pgsql.tar.gz) = 4fe03f0d304792c2ee964d76dd5ca0a11323efbf10e8894041bc3fa4643c9356 +SIZE (msn-proxy-0.6.2-pgsql.tar.gz) = 82929 +MD5 (msn-proxy-0.6.2-mysql.tar.gz) = 9bb785124aa3517adb65ee4aa053d8da +SHA256 (msn-proxy-0.6.2-mysql.tar.gz) = 135c853899c6399217f0e703dcd98104e5344f20ee830c320e3a87f6e0aede46 +SIZE (msn-proxy-0.6.2-mysql.tar.gz) = 82446 diff --git a/net-im/msn-proxy/files/pkg-message-mysql.in b/net-im/msn-proxy/files/pkg-message-mysql.in new file mode 100644 index 000000000000..8965de2f5536 --- /dev/null +++ b/net-im/msn-proxy/files/pkg-message-mysql.in @@ -0,0 +1,24 @@ +------------------------------------------------ +msn-proxy post installation (basic) instructions +------------------------------------------------ + +On mysql create the database and the user to msn-proxy: +> create database `msn-proxy`; +> grant all privileges on `msn-proxy`.* to `msn-proxy`@localhost identified by 'secret'; +> flush privileges; + +Pay attention at "`" and "'" differences on mysql commands. + +At first run, msn-proxy will check and create the mysql tables, after that +insert the default configuration (with your real proxy ip): + +> insert into defaults (internal_host) values ('192.168.0.1'); + +Now the proxy should be ready to run, just redirect the msn clients to +the proxy (all connections to the port 1863 should be redirect at your +gateway / firewall). + +(text from %%DOCSDIR%%/INSTALL) + +------------------------------------------------ + diff --git a/net-im/msn-proxy/files/pkg-message-pgsql.in b/net-im/msn-proxy/files/pkg-message-pgsql.in new file mode 100644 index 000000000000..435630f828b4 --- /dev/null +++ b/net-im/msn-proxy/files/pkg-message-pgsql.in @@ -0,0 +1,21 @@ +------------------------------------------------ +msn-proxy post installation (basic) instructions +------------------------------------------------ + +On pgsql create the database and the user to msn-proxy: +# create database "msn-proxy"; +# create role "msn-proxy" login password 'secret'; + +At first run, msn-proxy will check and create the pgsql tables, after that +insert the default configuration (with your real proxy ip): + +# insert into defaults (internal_host) values ('192.168.0.1'); + +Now the proxy should be ready to run, just redirect the msn clients to +the proxy (all connections to the port 1863 should be redirect at your +gateway / firewall). + +(text from %%DOCSDIR%%/INSTALL) + +------------------------------------------------ + diff --git a/net-im/msn-proxy/files/pkg-message.in b/net-im/msn-proxy/files/pkg-message.in deleted file mode 100644 index 8965de2f5536..000000000000 --- a/net-im/msn-proxy/files/pkg-message.in +++ /dev/null @@ -1,24 +0,0 @@ ------------------------------------------------- -msn-proxy post installation (basic) instructions ------------------------------------------------- - -On mysql create the database and the user to msn-proxy: -> create database `msn-proxy`; -> grant all privileges on `msn-proxy`.* to `msn-proxy`@localhost identified by 'secret'; -> flush privileges; - -Pay attention at "`" and "'" differences on mysql commands. - -At first run, msn-proxy will check and create the mysql tables, after that -insert the default configuration (with your real proxy ip): - -> insert into defaults (internal_host) values ('192.168.0.1'); - -Now the proxy should be ready to run, just redirect the msn clients to -the proxy (all connections to the port 1863 should be redirect at your -gateway / firewall). - -(text from %%DOCSDIR%%/INSTALL) - ------------------------------------------------- - diff --git a/net-im/msn-proxy/pkg-plist b/net-im/msn-proxy/pkg-plist index 1fdac33bdc05..cb7502f7b626 100644 --- a/net-im/msn-proxy/pkg-plist +++ b/net-im/msn-proxy/pkg-plist @@ -1,12 +1,5 @@ -etc/msn-proxy/mysql/conf -etc/msn-proxy/mysql/tables/sb -etc/msn-proxy/mysql/tables/log -etc/msn-proxy/mysql/tables/users -etc/msn-proxy/mysql/tables/contacts -etc/msn-proxy/mysql/tables/defaults -etc/msn-proxy/mysql/tables/contact_groups -etc/msn-proxy/msn-proxy.conf bin/msn-proxy +%%ETCDIR%%/msn-proxy.conf %%WWWDIR%%/ajax.inc.php %%WWWDIR%%/al.inc.php %%WWWDIR%%/bl.inc.php @@ -20,7 +13,6 @@ bin/msn-proxy %%WWWDIR%%/group.inc.php %%WWWDIR%%/header.inc.php %%WWWDIR%%/index.php -%%WWWDIR%%/mysql.inc.php %%WWWDIR%%/save_contact_op.php %%WWWDIR%%/save_default_op.php %%WWWDIR%%/save_msg.php @@ -39,8 +31,26 @@ bin/msn-proxy %%WWWDIR%%/imagens/webcam.png %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry etc/msn-proxy/mysql/tables -@dirrmtry etc/msn-proxy/mysql -@dirrmtry etc/msn-proxy +%%PGSQL%%%%ETCDIR%%/pgsql/conf +%%PGSQL%%%%ETCDIR%%/pgsql/tables/sb +%%PGSQL%%%%ETCDIR%%/pgsql/tables/log +%%PGSQL%%%%ETCDIR%%/pgsql/tables/users +%%PGSQL%%%%ETCDIR%%/pgsql/tables/contacts +%%PGSQL%%%%ETCDIR%%/pgsql/tables/defaults +%%PGSQL%%%%ETCDIR%%/pgsql/tables/contact_groups +%%PGSQL%%%%WWWDIR%%/pgsql.inc.php +%%MYSQL%%%%ETCDIR%%/mysql/conf +%%MYSQL%%%%ETCDIR%%/mysql/tables/sb +%%MYSQL%%%%ETCDIR%%/mysql/tables/log +%%MYSQL%%%%ETCDIR%%/mysql/tables/users +%%MYSQL%%%%ETCDIR%%/mysql/tables/contacts +%%MYSQL%%%%ETCDIR%%/mysql/tables/defaults +%%MYSQL%%%%ETCDIR%%/mysql/tables/contact_groups +%%MYSQL%%%%WWWDIR%%/mysql.inc.php +%%PGSQL%%@dirrmtry %%ETCDIR%%/pgsql/tables +%%PGSQL%%@dirrmtry %%ETCDIR%%/pgsql +%%MYSQL%%@dirrmtry %%ETCDIR%%/mysql/tables +%%MYSQL%%@dirrmtry %%ETCDIR%%/mysql +@dirrmtry %%ETCDIR%% @dirrmtry %%WWWDIR%%/imagens @dirrmtry %%WWWDIR%% -- cgit v1.2.3