Index: head/audio/zinf/Makefile
===================================================================
--- head/audio/zinf/Makefile	(revision 433661)
+++ head/audio/zinf/Makefile	(revision 433662)
@@ -1,53 +1,53 @@
 # Created by: Roman Shterenzon <roman@xpert.com>
 # $FreeBSD$
 
 PORTNAME=	zinf
 PORTVERSION=	2.2.5
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based MP3 player
 
 LIB_DEPENDS=	libid3.so:audio/id3lib \
 		libgdbm.so:databases/gdbm
 
 USES=		alias gettext gmake libtool ncurses pathfix perl5 pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ipv6 \
 		--disable-arts
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	ESOUND VORBIS
 OPTIONS_DEFAULT=VORBIS
 OPTIONS_SUB=	yes
 
 ESOUND_CONFIGURE_OFF=	--disable-esd
 ESOUND_USE=		GNOME=esound
 INSTALL_TARGET=	install-strip
 
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 CPPFLAGS+=	"-D_M_IX86"
 .else
 CONFIGURE_ARGS+=	--disable-x86opts
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Player::||' ${WRKSRC}/base/include/player.h
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/sdr/plugins
 	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.zinf \
 		${STAGEDIR}${PREFIX}/etc/sdr/plugins
 
 .include <bsd.port.post.mk>
Index: head/audio/zinf/files/patch-base_src_player.cpp
===================================================================
--- head/audio/zinf/files/patch-base_src_player.cpp	(revision 433661)
+++ head/audio/zinf/files/patch-base_src_player.cpp	(revision 433662)
@@ -1,51 +1,51 @@
 --- base/src/player.cpp.orig	2004-02-02 17:39:35 UTC
 +++ base/src/player.cpp
 @@ -547,7 +547,7 @@ void Player::HandleSingleArg(char *arg)
          // who needs to get this, plm or dlm?
          bool giveToDLM = false;
          bool giveToTheme = false;
 -        char* extension = NULL;
 +        const char* extension = NULL;
  
          extension = strrchr(url.c_str(), '.');
  
 @@ -1103,7 +1103,7 @@ char *
  Player::
  GetProtocol(const char *title)
  {
 -   char *temp_proto;
 +   const char *temp_proto;
     char *proto_return = NULL;
  
     temp_proto = strstr(title, "://");
 @@ -1122,7 +1122,7 @@ char *
  Player::
  GetExtension(const char *title)
  {
 -   char *temp_ext;
 +   const char *temp_ext;
     char *ext_return = NULL;
     char *proto = NULL;
  
 @@ -1961,15 +1961,14 @@ HandlePrefsChanged(Event *pEvent)
             m_context->prefs->GetPrefString(kProxyHostPref, &buffer);
         }
  
 -       char *port = strchr(buffer.c_str(),':');
 -       if (port) {
 -           *port = '\0';
 -           port++;
 -       }
         string proxyAddr = buffer;
         int nPort = 80;
 -       if (port && *port)
 -           nPort = atoi(port);
 +       size_t pos = buffer.find(':');
 +       if (pos != string::npos) {
-+	   proxyAddr = buffer.substr(0, pos++);
-+	   if (pos < buffer.size())
-+	       nPort = stoi(buffer.substr(pos));
++          proxyAddr = buffer.substr(0, pos++);
++          if (pos < buffer.size())
++              nPort = atoi(buffer.substr(pos).c_str());
 +       }
      }