Date: Wed, 18 Jun 2008 20:21:04 GMT From: Luiz Otavio O Souza <loos.br@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/124730: [maintainer] update net-im/msn-proxy to 0.6.2 - add pgsql support Message-ID: <200806182021.m5IKL4tZ053254@www.freebsd.org> Resent-Message-ID: <200806182030.m5IKU2tp017795@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124730
>Category: ports
>Synopsis: [maintainer] update net-im/msn-proxy to 0.6.2 - add pgsql support
>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: Wed Jun 18 20:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Luiz Otavio O Souza
>Release: 7.0-STABLE
>Organization:
>Environment:
FreeBSD server.rede.int.br 7.0-STABLE FreeBSD 7.0-STABLE #7: Tue Jun 17 14:50:24 BRT 2008 root@server.rede.int.br:/usr/obj/usr/src/sys/FW i386
>Description:
Update the msn-proxy to 0.6.2
Add support to pgsql
>How-To-Repeat:
>Fix:
Apply the following patch. Please remove files/pkg-message.in
Patch attached with submission follows:
diff -u Makefile.orig Makefile
--- Makefile.orig 2008-06-16 12:45:12.000000000 -0300
+++ Makefile 2008-06-18 16:55:09.000000000 -0300
@@ -6,8 +6,7 @@
#
PORTNAME= msn-proxy
-PORTVERSION= 0.6
-PORTREVISION= 1
+PORTVERSION= 0.6.2
CATEGORIES= net-im
MASTER_SITES= SF
@@ -16,26 +15,57 @@
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
+.include <bsd.port.pre.mk>
+.if defined(WITH_PGSQL)
+DISTVERSIONSUFFIX= -pgsql
+MSNPROXYWWW+= pgsql.inc.php
+SUB_FILES= pkg-message-pgsql
+USE_PGSQL= yes
+USE_PHP+= pgsql
+PLIST_FILES+= etc/msn-proxy/pgsql/conf \
+ etc/msn-proxy/pgsql/tables/sb \
+ etc/msn-proxy/pgsql/tables/log \
+ etc/msn-proxy/pgsql/tables/users \
+ etc/msn-proxy/pgsql/tables/contacts \
+ etc/msn-proxy/pgsql/tables/defaults \
+ etc/msn-proxy/pgsql/tables/contact_groups \
+ %%WWWDIR%%/pgsql.inc.php
+.elif defined(WITH_MYSQL)
+DISTVERSIONSUFFIX= -mysql
+MSNPROXYWWW+= mysql.inc.php
+SUB_FILES= pkg-message-mysql
+USE_MYSQL= yes
+USE_PHP+= mysql
+PLIST_FILES+= 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 \
+ %%WWWDIR%%/mysql.inc.php
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/config.h
@@ -56,4 +86,5 @@
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
+
diff -u distinfo.orig distinfo
--- distinfo.orig 2008-06-16 12:45:12.000000000 -0300
+++ distinfo 2008-06-18 16:57:04.000000000 -0300
@@ -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 -u files/pkg-message-mysql.in.orig files/pkg-message-mysql.in
--- files/pkg-message-mysql.in.orig 1969-12-31 21:00:00.000000000 -0300
+++ files/pkg-message-mysql.in 2008-02-03 16:31:14.000000000 -0200
@@ -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 -u files/pkg-message-pgsql.in.orig files/pkg-message-pgsql.in
--- files/pkg-message-pgsql.in.orig 1969-12-31 21:00:00.000000000 -0300
+++ files/pkg-message-pgsql.in 2008-06-16 15:59:59.000000000 -0300
@@ -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 -u files/pkg-message.in.orig files/pkg-message.in
--- files/pkg-message.in.orig 2008-06-16 12:45:12.000000000 -0300
+++ files/pkg-message.in 1969-12-31 21:00:00.000000000 -0300
@@ -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 -u pkg-plist.orig pkg-plist
--- pkg-plist.orig 2008-06-16 12:45:12.000000000 -0300
+++ pkg-plist 2008-06-16 13:36:41.000000000 -0300
@@ -1,10 +1,3 @@
-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
%%WWWDIR%%/ajax.inc.php
@@ -20,7 +13,6 @@
%%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,10 @@
%%WWWDIR%%/imagens/webcam.png
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry etc/msn-proxy/pgsql/tables
@dirrmtry etc/msn-proxy/mysql/tables
@dirrmtry etc/msn-proxy/mysql
+@dirrmtry etc/msn-proxy/pgsql
@dirrmtry etc/msn-proxy
@dirrmtry %%WWWDIR%%/imagens
@dirrmtry %%WWWDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806182021.m5IKL4tZ053254>