4 files changed, 67 insertions, 39 deletions

diff --git a/graphics/xmms-xvs/Makefile b/graphics/xmms-xvs/Makefile
index 5269abff9907..5c25f1899155 100644
--- a/graphics/xmms-xvs/Makefile
+++ b/graphics/xmms-xvs/Makefile
@@ -7,34 +7,47 @@
 
 PORTNAME=	xmms-xvs
 PORTVERSION=	0.1.0b1
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://godot.tuniv.szczecin.pl/~jgregor/xvs/download/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/
+MASTER_SITES=	http://jgregor.ps.pl/xvs/download/
 DISTNAME=	xvs-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/audio/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+RUN_DEPENDS=	xmms:${PORTSDIR}/audio/xmms
+
+XML2_CONFIG?=	${LOCALBASE}/bin/xml2-config
+XMMS_CONFIG?=	${X11BASE}/bin/xmms-config
 
+USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	XML2_CONFIG="${LOCALBASE}/bin/xml2-config" \
-		XMMS_CONFIG="${X11BASE}/bin/xmms-config" \
-		CFLAGS="-I${LOCALBASE}/include/libxml2/libxml ${CFLAGS}"
+WANT_GNOME=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	XML2_CONFIG="${XML2_CONFIG}" XMMS_CONFIG="${XMMS_CONFIG}"
 
-DOCS=	AUTHORS ChangeLog NEWS README TODO
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibpanel}!=""
+USE_GNOME+=	libpanel gnomeprefix
+PLIST_SUB+=	DATADIR="share/gnome"
+.else
+PLIST_SUB+=	DATADIR="share"
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|<xml|<libxml/xml|g' ${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS ChangeLog NEWS README TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/xmms-xvs/files/patch-src-calc-parser.y b/graphics/xmms-xvs/files/patch-src-calc-parser.y
index 9ef0b8ccbbb6..984c4728ce8c 100644
--- a/graphics/xmms-xvs/files/patch-src-calc-parser.y
+++ b/graphics/xmms-xvs/files/patch-src-calc-parser.y
@@ -1,6 +1,22 @@
---- src/calc/parser.y.orig	Thu Jun 21 11:34:14 2001
-+++ src/calc/parser.y	Tue Jun 26 22:20:18 2001
-@@ -148,12 +148,20 @@
+--- src/calc/parser.y.orig	Thu Jun 21 18:34:14 2001
++++ src/calc/parser.y	Wed Nov 20 21:38:13 2002
+@@ -81,6 +81,7 @@
+                         | expression_list ';'
+     			| error ';'	
+ 			    { yyerrok; }
++;
+ 
+ /* argument list is a comma separated list od expressions */
+ argument_list:
+@@ -90,6 +91,7 @@
+                         | argument_list ',' expression
+                             {
+                             }
++;
+      
+ /* expression is a C-like expression. */
+ expression:		NUMBER
+@@ -148,12 +150,20 @@
    return 0;
  }
  
@@ -22,7 +38,7 @@
    
    /* End of input ? */
    if (c == EOF)
-@@ -161,14 +169,16 @@
+@@ -161,14 +171,16 @@
    
    /* Char starts a number => parse the number. */
    if (isdigit (c)) {
@@ -41,7 +57,7 @@
        setlocale (LC_ALL, saved_locale);
        g_free (saved_locale);
      }
-@@ -185,10 +195,10 @@
+@@ -185,10 +197,10 @@
        sym_name = g_string_append_c (sym_name, c);
  
        /* Get another character. */
@@ -54,20 +70,20 @@
  
      yylval->s_value = sym_name->str;
      
-@@ -264,11 +274,8 @@
+@@ -264,11 +276,8 @@
       
  expression_t *expr_compile_string (const char* str, symbol_dict_t *dict) {
    parser_control pc;
 -  FILE *stream;
- 
--  stream = fmemopen (str, strlen (str), "r");
 -
+-  stream = fmemopen (str, strlen (str), "r");
+ 
 -  pc.input = stream;
 +  pc.input = str;
    pc.expr = expr_new ();
    pc.dict = dict;
  
-@@ -277,8 +284,6 @@
+@@ -277,8 +286,6 @@
      expr_free (pc.expr);
      pc.expr = NULL;
    }
diff --git a/graphics/xmms-xvs/pkg-descr b/graphics/xmms-xvs/pkg-descr
index 686e4a51bcaa..dc81b73023b2 100644
--- a/graphics/xmms-xvs/pkg-descr
+++ b/graphics/xmms-xvs/pkg-descr
@@ -12,6 +12,6 @@ easy to use, powerful user interface
 resizable window
 save & restore
 
-WWW: http://godot.tuniv.szczecin.pl/~jgregor/xvs/
+WWW: http://jgregor.ps.pl/xvs/
 
 - Anders Nordby <anders@FreeBSD.org>
diff --git a/graphics/xmms-xvs/pkg-plist b/graphics/xmms-xvs/pkg-plist
index c0d38c8004f2..3830c26c0942 100644
--- a/graphics/xmms-xvs/pkg-plist
+++ b/graphics/xmms-xvs/pkg-plist
@@ -1,15 +1,14 @@
-lib/xmms/Visualization/libxvs.la
-lib/xmms/Visualization/libxvs.a
-share/gnome/xmms/xvs_presets/Beam
-share/gnome/xmms/xvs_presets/BlurScope
-share/gnome/xmms/xvs_presets/DotCrazy
-share/gnome/xmms/xvs_presets/Radar
-share/gnome/xmms/xvs_presets/Spot
-share/gnome/xmms/xvs_presets/Whirl
-@dirrm share/gnome/xmms/xvs_presets
-%%PORTDOCS%%share/doc/xvs/AUTHORS
-%%PORTDOCS%%share/doc/xvs/ChangeLog
-%%PORTDOCS%%share/doc/xvs/NEWS
-%%PORTDOCS%%share/doc/xvs/README
-%%PORTDOCS%%share/doc/xvs/TODO
-%%PORTDOCS%%@dirrm share/doc/xvs
+lib/xmms/Visualization/libxvs.so
+%%PORTDOCS%%share/doc/xmms-xvs/AUTHORS
+%%PORTDOCS%%share/doc/xmms-xvs/ChangeLog
+%%PORTDOCS%%share/doc/xmms-xvs/NEWS
+%%PORTDOCS%%share/doc/xmms-xvs/README
+%%PORTDOCS%%share/doc/xmms-xvs/TODO
+%%DATADIR%%/xmms/xvs_presets/Beam
+%%DATADIR%%/xmms/xvs_presets/BlurScope
+%%DATADIR%%/xmms/xvs_presets/DotCrazy
+%%DATADIR%%/xmms/xvs_presets/Radar
+%%DATADIR%%/xmms/xvs_presets/Spot
+%%DATADIR%%/xmms/xvs_presets/Whirl
+@dirrm %%DATADIR%%/xmms/xvs_presets
+%%PORTDOCS%%@dirrm share/doc/xmms-xvs