--- x11-fm/fsv/Makefile	Sat Mar 13 20:41:28 2004
+++ x11-fm/fsv/Makefile	Sat Mar 13 21:09:05 2004
@@ -10,7 +10,7 @@ 
 PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fsv
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D filesystem visualizer
@@ -20,15 +20,15 @@ 
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gtk12
+USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-GL-prefix=${X11BASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-.include <bsd.port.pre.mk>
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
-BROKEN=		"Does not compile on amd64 or ia64"
-.endif
+post-extract:
+	-@${RM} ${WRKSRC}/lib/getopt*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- x11-fm/fsv/files/patch-aa	Tue Aug  8 11:51:51 2000
+++ x11-fm/fsv/files/patch-aa	Sat Mar 13 21:24:24 2004
@@ -26,7 +26,7 @@ 
  	gtk_main( );
  
 +#ifdef __FreeBSD__
-+#ifndef __alpha__
++#ifdef __i386__
 +	fpresetsticky(FP_X_DZ|FP_X_INV);
 +#endif
 +	fpsetmask(FP_X_DZ|FP_X_INV);
--- x11-fm/fsv/files/patch-lib::Makefile.in	Thu Jan  1 09:00:00 1970
+++ x11-fm/fsv/files/patch-lib::Makefile.in	Sat Mar 13 21:08:36 2004
@@ -0,0 +1,24 @@ 
+--- lib/Makefile.in.orig	Sun Jan 16 09:44:24 2000
++++ lib/Makefile.in	Sat Mar 13 21:08:23 2004
+@@ -99,10 +99,10 @@
+ 
+ INCLUDES = @GTK_CFLAGS@
+ 
+-noinst_HEADERS =  	gnome-i18nP.h 	gnome-color-picker.h 	gnome-dateedit.h 	getopt.h 	nvstore.h
++noinst_HEADERS =  	gnome-i18nP.h 	gnome-color-picker.h 	gnome-dateedit.h 	nvstore.h
+ 
+ libgnomeui_a_SOURCES = gnome-color-picker.c gnome-dateedit.c
+-libmisc_a_SOURCES = getopt.c getopt1.c nvstore.c
++libmisc_a_SOURCES = nvstore.c
+ libmisc_a_LIBADD = @LIBOBJS@
+ 
+ EXTRA_DIST = README.gnome
+@@ -119,7 +119,7 @@
+ libgnomeui_a_LIBADD = 
+ libgnomeui_a_OBJECTS =  gnome-color-picker.o gnome-dateedit.o
+ libmisc_a_DEPENDENCIES =  @LIBOBJS@
+-libmisc_a_OBJECTS =  getopt.o getopt1.o nvstore.o
++libmisc_a_OBJECTS =  nvstore.o
+ AR = ar
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)