Date: Sun, 22 Mar 2009 13:11:44 GMT From: Luiz Otavio O Souza <loos.br@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/132932: [maintainer] net-im/msn-proxy: update to 0.7 Message-ID: <200903221311.n2MDBimq026824@www.freebsd.org> Resent-Message-ID: <200903221320.n2MDK1TG077401@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132932
>Category: ports
>Synopsis: [maintainer] net-im/msn-proxy: update to 0.7
>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: Sun Mar 22 13:20:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Luiz Otavio O Souza
>Release: -current
>Organization:
>Environment:
FreeBSD server.rede.int.br 8.0-CURRENT FreeBSD 8.0-CURRENT #2: Thu Jan 15 15:19:37 BRST 2009 root@server.rede.int.br:/usr/src/sys/i386/compile/FW-current i386
>Description:
update msn-proxy to 0.7
port changed because only mysql is supported by current msn-proxy.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -u Makefile.orig Makefile
--- Makefile.orig 2009-03-22 09:25:23.000000000 -0300
+++ Makefile 2009-03-22 09:56:34.000000000 -0300
@@ -6,7 +6,7 @@
#
PORTNAME= msn-proxy
-PORTVERSION= 0.6.3
+PORTVERSION= 0.7
CATEGORIES= net-im
MASTER_SITES= SF
@@ -15,50 +15,27 @@
LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
-OPTIONS+= MYSQL "Use MySQL database version" off
-OPTIONS+= PGSQL "Use Postgresql (pgsql) database version" on
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
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 \
+MSNPROXYWWW= js.inc.php lists.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 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
+ user.inc.php mysql.inc.php class.ctl.php .htaccess
MSNPROXYIMG= ausente.gif block.gif notinlist.png ocupado.gif offline.gif \
online.gif send_im.gif webcam.png
+SUB_FILES= pkg-message-mysql
WANT_PHP_WEB= yes
-USE_PHP= session sockets
+USE_PHP= mysql session sockets
+USE_MYSQL= yes
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_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
diff -u distinfo.orig distinfo
--- distinfo.orig 2009-03-22 09:25:23.000000000 -0300
+++ distinfo 2009-03-22 09:30:54.000000000 -0300
@@ -1,6 +1,3 @@
-MD5 (msn-proxy-0.6.3-mysql.tar.gz) = 1b143133d3462b3a6fdc22dc77e3df5a
-SHA256 (msn-proxy-0.6.3-mysql.tar.gz) = 6a56785e527625ef409deb34b7872627d5c7073e7f159d7035a37d0d8b01b572
-SIZE (msn-proxy-0.6.3-mysql.tar.gz) = 83567
-MD5 (msn-proxy-0.6.3-pgsql.tar.gz) = 536d7c764e94708f6b839a9852a2a2b1
-SHA256 (msn-proxy-0.6.3-pgsql.tar.gz) = 1a96e749ee23d3464432f454c2948d8468d57f6a44c3ddbce769b7b13150c646
-SIZE (msn-proxy-0.6.3-pgsql.tar.gz) = 83405
+MD5 (msn-proxy-0.7.tar.gz) = 11faa72c70c36874685ca1b0ed382dcc
+SHA256 (msn-proxy-0.7.tar.gz) = 0752c7f13f0e57fd71239dc0ff33f1ab94cebb5ffc0fe6e4c87c12e70a6dae83
+SIZE (msn-proxy-0.7.tar.gz) = 87480
diff -u pkg-plist.orig pkg-plist
--- pkg-plist.orig 2009-03-22 09:25:23.000000000 -0300
+++ pkg-plist 2009-03-22 09:57:40.000000000 -0300
@@ -1,11 +1,12 @@
bin/msn-proxy
%%ETCDIR%%/msn-proxy.conf
-%%WWWDIR%%/ajax.inc.php
-%%WWWDIR%%/al.inc.php
-%%WWWDIR%%/bl.inc.php
+%%WWWDIR%%/.htaccess
+%%WWWDIR%%/js.inc.php
+%%WWWDIR%%/lists.inc.php
%%WWWDIR%%/chat-to.php
%%WWWDIR%%/chat.php
%%WWWDIR%%/conf.php
+%%WWWDIR%%/class.ctl.php
%%WWWDIR%%/default.array.cmd.inc.php
%%WWWDIR%%/default.array.option.inc.php
%%WWWDIR%%/default.array.status.inc.php
@@ -31,26 +32,16 @@
%%WWWDIR%%/imagens/webcam.png
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%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
+%%ETCDIR%%/mysql/conf
+%%ETCDIR%%/mysql/tables/sb
+%%ETCDIR%%/mysql/tables/log
+%%ETCDIR%%/mysql/tables/users
+%%ETCDIR%%/mysql/tables/contacts
+%%ETCDIR%%/mysql/tables/defaults
+%%ETCDIR%%/mysql/tables/contact_groups
+%%WWWDIR%%/mysql.inc.php
+@dirrmtry %%ETCDIR%%/mysql/tables
+@dirrmtry %%ETCDIR%%/mysql
@dirrmtry %%ETCDIR%%
@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?200903221311.n2MDBimq026824>