Date: Sun, 25 Jul 2004 03:58:44 +0800 (KRAST) From: "Roman Y.Bogdanov" <sam@brj.pp.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: "Roman Y.Bogdanov" <sam@brj.pp.ru> Subject: ports/69542: update port: audio/napster Message-ID: <20040724195844.2E54711597@mail.brj.pp.ru> Resent-Message-ID: <200407242000.i6OK0hr2071773@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69542
>Category: ports
>Synopsis: update port: audio/napster
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 24 20:00:43 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Roman Y. Bogdanov
>Release: FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
n/a
>Environment:
System: FreeBSD brj.pp.ru 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #0: Thu Jul 15 01:04:50 KRAST 2004 root@brj.pp.ru:/usr/src/sys/i386/compile/brj-5x i386
>Description:
I'am run a opennapster server in our local campus network. My server use about 700 local clients. The majority of clients uses windows client SunshineeUN with russian windows CP1251 codepage. For users of my server I have made patch which does code conversion CP1251 in Russian locale freebsd koi8. Users happy very much because can talk from freebsd to clients windows in Russian.
>How-To-Repeat:
n/a
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# audio
# audio/napster
# audio/napster/Makefile
# audio/napster/distinfo
# audio/napster/pkg-descr
# audio/napster/pkg-plist
# audio/napster/files
# audio/napster/files/extra-win2koi
# audio/napster/files/patch-doc::Makefile.in
#
echo c - audio
mkdir -p audio > /dev/null 2>&1
echo c - audio/napster
mkdir -p audio/napster > /dev/null 2>&1
echo x - audio/napster/Makefile
sed 's/^X//' >audio/napster/Makefile << 'END-of-audio/napster/Makefile'
X# New ports collection makefile for: napster
X# Date created: Thu Nov 18 01:07:00 PST 1999
X# Whom: dburr@FreeBSD.org
X#
X# $FreeBSD: ports/audio/napster/Makefile,v 1.24 2004/06/23 16:32:16 petef Exp $
X#
X
XPORTNAME= nap
XPORTVERSION= 1.5.3
XCATEGORIES= audio net
XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR= nap
X
XMAINTAINER= petef@FreeBSD.org
XCOMMENT?= An MP3 sharing, search, and chat client for the OpenNAP network
X
XGNU_CONFIGURE= yes
XUSE_REINPLACE= yes
X
XMAN1= nap.1
X
X.if defined(WITH_ENCODING_PATCH)
Xpre-configure::
X @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-win2koi
X.endif
X
Xpost-install:
X.if !defined(NOPORTDOCS)
X @${MKDIR} ${DOCSDIR}
X.for file in NEWS README doc/napster.txt doc/userguide.html
X ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X.endfor
X.endif
X
X.include <bsd.port.mk>
END-of-audio/napster/Makefile
echo x - audio/napster/distinfo
sed 's/^X//' >audio/napster/distinfo << 'END-of-audio/napster/distinfo'
XMD5 (nap-1.5.3.tar.gz) = b39ceb2bac8432e1aef11b0d4ecf4c7c
XSIZE (nap-1.5.3.tar.gz) = 319902
END-of-audio/napster/distinfo
echo x - audio/napster/pkg-descr
sed 's/^X//' >audio/napster/pkg-descr << 'END-of-audio/napster/pkg-descr'
XNap is a console Napster client that supports MP3 sharing, search, and
Xchatting. It now defaults to connecting to the OpenNAP network because
Xthe official Napster.com network has client filters.
X
XWWW: http://quasar.mathstat.uottawa.ca/~selinger/nap/
X
X- Pete
Xpetef@FreeBSD.org
END-of-audio/napster/pkg-descr
echo x - audio/napster/pkg-plist
sed 's/^X//' >audio/napster/pkg-plist << 'END-of-audio/napster/pkg-plist'
Xbin/nap
Xbin/napping
X%%PORTDOCS%%%%DOCSDIR%%/NEWS
X%%PORTDOCS%%%%DOCSDIR%%/README
X%%PORTDOCS%%%%DOCSDIR%%/napster.txt
X%%PORTDOCS%%%%DOCSDIR%%/userguide.html
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
END-of-audio/napster/pkg-plist
echo c - audio/napster/files
mkdir -p audio/napster/files > /dev/null 2>&1
echo x - audio/napster/files/extra-win2koi
sed 's/^X//' >audio/napster/files/extra-win2koi << 'END-of-audio/napster/files/extra-win2koi'
Xdiff -urN src/cmds.c src/cmds.c
X--- src/cmds.c Wed Jul 21 18:57:52 2004
X+++ src/cmds.c Wed Jul 21 19:10:36 2004
X@@ -52,6 +52,8 @@
X #include "memwatch.h"
X #endif
X
X+#include "recoder.h"
X+
X extern info_t info;
X extern scroll_t *mscroll, *mscrollend;
X extern int lastlogflag;
X@@ -1744,8 +1746,10 @@
X }
X
X msg = fixquotes(cstr(str, 2));
X+ recodepage(msg,msg,1);
X sendpack(s, NAP_TELL, "%s %s", tok[1], msg);
X recent = findquery(chanl, tok[1]);
X+ recodepage(msg,msg,2);
X wp(win, "%s* --> (%s%s%s)%s %s\n", GREEN, WHITE, tok[1], GREEN, WHITE, msg);
X drw(win);
X
X@@ -2712,6 +2716,7 @@
X O_NAP_FUNC(dtopic)
X {
X chans_t *cur;
X+ char *k_topic=curchan->topic;
X
X if (num == 1)
X {
X@@ -2738,7 +2743,8 @@
X drw(win);
X return(1);
X }
X-
X+
X+ recodepage(str,str,1);
X sendpack(s, NAP_TOPIC, "%s", cstr(str, 1));
X
X return(1);
X@@ -2822,6 +2828,7 @@
X return(-3);
X }
X
X+ recodepage(str,str,1);
X sendpack(s, NAP_ANNOUNCE, "%s", cstr(str, 1));
X
X return(1);
X@@ -4696,6 +4703,7 @@
X }
X else if (curchan->q == 2 && buf[0] != '\0')
X {
X+ recodepage(buf,buf,1);
X ssock(ircsock, "PRIVMSG %s :%s\n", curchan->nm, buf);
X recent = curchan;
X wp(win, "%s<%s%s%s>%s %s\n", BRIGHT(MAGENTA), WHITE, mnick, BRIGHT(MAGENTA), WHITE, buf);
Xdiff -urN src/recoder.h src/recoder.h
X--- src/recoder.h Thu Jan 1 07:00:00 1970
X+++ src/recoder.h Wed Jul 21 19:10:36 2004
X@@ -0,0 +1,51 @@
X+/*
X+
X+ brj.pp.ru decoder library
X+
X+*/
X+
X+#include <stdio.h>
X+#include <string.h>
X+
X+unsigned char kw[] = {128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
X+ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
X+ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
X+ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
X+ 254,224,225,246,228,229,244,227,245,232,233,234,235,236,237,238,
X+ 239,255,240,241,242,243,230,226,252,251,231,248,253,249,247,250,
X+ 222,192,193,214,196,197,212,195,213,200,201,202,203,204,205,206,
X+ 207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218};
X+
X+unsigned char wk[] = {128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
X+ 144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
X+ 160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
X+ 176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
X+ 225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240,
X+ 242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241,
X+ 193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208,
X+ 210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209};
X+
X+unsigned char *table;
X+
X+char *recodepage(char * source, char * dest, int codenum)
X+{
X+
X+if((codenum == 1)){table=kw;}
X+if((codenum == 2)){table=wk;}
X+
X+int j=0;
X+
X+strcpy(dest,source);
X+
X+int i=0;
X+for(i=0;i<strlen(source);i++)
X+{
X+ j = source[i];
X+ j &= 0377;
X+ if(j & 0200)
X+ j = table[j & 0177];
X+ dest[i]=j;
X+}
X+return dest;
X+
X+}
Xdiff -urN src/scmds.c src/scmds.c
X--- src/scmds.c Wed Jul 21 18:57:52 2004
X+++ src/scmds.c Wed Jul 21 19:11:59 2004
X@@ -498,6 +498,8 @@
X if (!(recent = findchan(chanl, tok[0])))
X return(1); /* ?? we don't seem to be on that channel */
X
X+ recodepage(str,str,2);
X+
X /* highlight our own messages in MAGENTA, all others in BLUE */
X if (!strcasecmp(info.user, tok[1])) {
X hilit = MAGENTA;
X@@ -648,6 +650,7 @@
X
X I_NAP_FUNC(snotice)
X {
X+ recodepage(str,str,2);
X wp(win, "%s* %s%s\n", YELLOW, (str)?str:"", WHITE);
X drw(win);
X return(1);
X@@ -2014,6 +2017,7 @@
X
X I_NAP_FUNC(sme)
X {
X+ recodepage(tok[2],tok[2],2);
X if (!(recent = findchan(chanl, tok[0])))
X return(1);
X if (!strcasecmp(curchan->nm, tok[0]) || wmode)
Xdiff -urN src/winio.c src/winio.c
X--- src/winio.c Wed Jul 21 18:57:52 2004
X+++ src/winio.c Wed Jul 21 19:13:10 2004
X@@ -1007,13 +1007,16 @@
X drw(win);
X } else if (curchan->q == 1) {
X msg = fixquotes(strdup(command));
X+ recodepage(msg,msg,1);
X sendpack(s, NAP_TELL, "%s %s", curchan->nm, msg);
X recent = curchan;
X+ recodepage(msg,msg,2);
X wp(win, "%s* --> (%s%s%s)%s %s\n", GREEN, WHITE, curchan->nm, GREEN, WHITE, msg);
X drw(win);
X free(msg);
X recent = NULL;
X } else if (curchan->q == 2) {
X+ recodepage(command,command,1);
X ssock(ircsock, "PRIVMSG %s :%s\n", curchan->nm, command);
X recent = curchan;
X wp(win, "%s<%s%s%s>%s %s\n", BRIGHT(MAGENTA), WHITE, mnick, BRIGHT(MAGENTA), WHITE, command);
X@@ -1021,6 +1024,7 @@
X recent = NULL;
X } else {
X msg = fixquotes(strdup(command));
X+ recodepage(msg,msg,1);
X if (sendpack(s, NAP_SAY, "%s %s", curchan->nm, msg) == -1) {
X delsock(s); /* s is the server, or -1 if no server */
X }
END-of-audio/napster/files/extra-win2koi
echo x - audio/napster/files/patch-doc::Makefile.in
sed 's/^X//' >audio/napster/files/patch-doc::Makefile.in << 'END-of-audio/napster/files/patch-doc::Makefile.in'
X--- doc/Makefile.in.orig Wed Jun 23 11:20:36 2004
X+++ doc/Makefile.in Wed Jun 23 11:22:22 2004
X@@ -124,7 +124,7 @@
X sysconfdir = @sysconfdir@
X target_alias = @target_alias@
X EXTRA_DIST = nap.1.in userguide.html napster.txt
X-htmldir = $(prefix)/doc/nap
X+htmldir = $(prefix)/share/doc/nap
X man_MANS = nap.1
X html_DATA = userguide.html
X all: all-am
X@@ -208,6 +208,7 @@
X rm -f $(DESTDIR)$(man1dir)/$$inst; \
X done
X install-htmlDATA: $(html_DATA)
X+.ifndef(NOPORTDOCS)
X @$(NORMAL_INSTALL)
X $(mkdir_p) $(DESTDIR)$(htmldir)
X @list='$(html_DATA)'; for p in $$list; do \
X@@ -216,6 +217,7 @@
X echo " $(htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f"; \
X $(htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f; \
X done
X+.endif
X
X uninstall-htmlDATA:
X @$(NORMAL_UNINSTALL)
END-of-audio/napster/files/patch-doc::Makefile.in
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040724195844.2E54711597>