diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 8b3c2ca4f03f..758bf2d9adfe 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -1,50 +1,49 @@
 # ex:ts=8
 # Ports collection makefile for:	vamos
 # Date created:			Mar 15, 2002
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	vamos
-PORTVERSION=	0.4.3
+PORTVERSION=	0.4.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An automotive simulation framework
 
 BUILD_DEPENDS=	${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \
 		${X11BASE}/lib/libplibul.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
 		sigc.1:${PORTSDIR}/devel/libsigc++ \
 		glut.3:${PORTSDIR}/graphics/libglut \
 		png.5:${PORTSDIR}/graphics/png
 
+USE_GNOME=	gnometarget lthack
 USE_GL=		yes
 USE_GETOPT_LONG=	yes
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
 INSTALLS_SHLIB=	yes
 
 INFO=		vamos
 
 CPPFLAGS=	-I${LOCALBASE}/include/libpng -I${X11BASE}/include \
 		${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
 		${PTHREAD_LIBS}
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/*.info*
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-lsgxml -lsgmisc|-lsgxml -lsgstructure -lsgmisc|g ; \
 		 s|-pedantic||g'
 
 .include <bsd.port.mk>
diff --git a/games/vamos/distinfo b/games/vamos/distinfo
index beb7d1fa661a..4a3f7a9afc10 100644
--- a/games/vamos/distinfo
+++ b/games/vamos/distinfo
@@ -1 +1 @@
-MD5 (vamos-0.4.3.tar.gz) = 3549fa78853eef04eac32bf0276552b3
+MD5 (vamos-0.4.4.tar.gz) = 21db546b7c5081f463f4270fdb59d30c
diff --git a/games/vamos/files/patch-configure b/games/vamos/files/patch-configure
index 87e80af09b23..059d729c6bcc 100644
--- a/games/vamos/files/patch-configure
+++ b/games/vamos/files/patch-configure
@@ -1,98 +1,90 @@
 --- configure.orig	Sun Nov  9 06:15:34 2003
 +++ configure	Mon Nov 10 13:08:47 2003
-@@ -8169,6 +8169,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -8402,7 +8403,6 @@
  fi
  
  LIBS="$LIBS -L$x_libraries"
 -CXXFLAGS="-gstabs+ -Wall -pedantic"
  
  
  ac_ext=cc
 @@ -10890,71 +10890,6 @@
      opengl_LIBS="$LIBS $x_suffix"
  
  
 -echo "$as_me:$LINENO: checking for glutGetModifiers in -lfreeglut" >&5
 -echo $ECHO_N "checking for glutGetModifiers in -lfreeglut... $ECHO_C" >&6
 -if test "${ac_cv_lib_freeglut_glutGetModifiers+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lfreeglut $opengl_LIBS $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
 -char glutGetModifiers ();
 -int
 -main ()
 -{
 -glutGetModifiers ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 -  (eval $ac_link) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -         { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_freeglut_glutGetModifiers=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -ac_cv_lib_freeglut_glutGetModifiers=no
 -fi
 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_freeglut_glutGetModifiers" >&5
 -echo "${ECHO_T}$ac_cv_lib_freeglut_glutGetModifiers" >&6
 -if test $ac_cv_lib_freeglut_glutGetModifiers = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBFREEGLUT 1
 -_ACEOF
 -
 -  LIBS="-lfreeglut $LIBS"
 -
 -fi
 -
 -    if test "x$ac_cv_lib_freeglut_glutGetModifiers" = "xno" ; then
 -
  echo "$as_me:$LINENO: checking for glutGetModifiers in -lglut" >&5
  echo $ECHO_N "checking for glutGetModifiers in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutGetModifiers+set}" = set; then
 @@ -11018,7 +10953,6 @@
  
  fi
  
 -    fi
  
      LIBS="$LIBS $x_suffix"
  else
diff --git a/games/vamos/pkg-plist b/games/vamos/pkg-plist
index 2c6502d05bec..c593c1a94c11 100644
--- a/games/vamos/pkg-plist
+++ b/games/vamos/pkg-plist
@@ -1,162 +1,166 @@
 bin/vamos
 include/vamos/body/Aerodynamic_Device.h
 include/vamos/body/Body.h
 include/vamos/body/Brake.h
 include/vamos/body/Car.h
 include/vamos/body/Clutch.h
 include/vamos/body/Contact_Point.h
 include/vamos/body/Differential.h
 include/vamos/body/Drivetrain.h
 include/vamos/body/Engine.h
 include/vamos/body/Exerter.h
 include/vamos/body/Frame.h
 include/vamos/body/Fuel_Tank.h
 include/vamos/body/Gauge.h
 include/vamos/body/Gl_Car.h
 include/vamos/body/Particle.h
 include/vamos/body/Suspension.h
 include/vamos/body/Tire.h
 include/vamos/body/Transmission.h
 include/vamos/body/Wheel.h
 include/vamos/geometry/Ac3d.h
 include/vamos/geometry/Constants.h
 include/vamos/geometry/Conversions.h
 include/vamos/geometry/Gl_Texture_Image.h
 include/vamos/geometry/Handle.h
 include/vamos/geometry/Inertia_Tensor.h
 include/vamos/geometry/Interpolator.h
 include/vamos/geometry/Linear_Interpolator.h
 include/vamos/geometry/Material.h
 include/vamos/geometry/Sample.h
 include/vamos/geometry/Spline.h
 include/vamos/geometry/Texture_Image.h
 include/vamos/geometry/Three_Matrix.h
 include/vamos/geometry/Three_Vector.h
 include/vamos/geometry/Two_Point.h
 include/vamos/track/Road_Segment.h
 include/vamos/track/Strip_Track.h
 include/vamos/track/Track.h
 include/vamos/world/Atmosphere.h
-include/vamos/world/Car_World.h
 include/vamos/world/Controls.h
-include/vamos/world/Gl_Car_World.h
+include/vamos/world/Gl_World.h
 include/vamos/world/Sounds.h
 include/vamos/world/World.h
 lib/libvamos-body.a
 lib/libvamos-body.so
 lib/libvamos-body.so.0
 lib/libvamos-geometry.a
 lib/libvamos-geometry.so
 lib/libvamos-geometry.so.0
 lib/libvamos-track.a
 lib/libvamos-track.so
 lib/libvamos-track.so.0
 lib/libvamos-world.a
 lib/libvamos-world.so
 lib/libvamos-world.so.0
-share/vamos/cars/F1-1967.ac
-share/vamos/cars/F1-1967.xml
-share/vamos/cars/F1.ac
-share/vamos/cars/F1.xml
-share/vamos/cars/GT.ac
-share/vamos/cars/GT.xml
-share/vamos/cars/default-car.xml
-share/vamos/cars/front-drive.xml
-share/vamos/cars/trainer.xml
-share/vamos/cars/wheel-fast.ac
-share/vamos/cars/wheel.ac
-share/vamos/controls/clutch-wheel.xml
-share/vamos/controls/default-controls.xml
-share/vamos/controls/stick.xml
-share/vamos/controls/throttle-wheel.xml
-share/vamos/sounds/crash.wav
-share/vamos/sounds/default-sounds.xml
-share/vamos/sounds/engine.wav
-share/vamos/sounds/f1-engine.wav
-share/vamos/sounds/rumble.wav
-share/vamos/sounds/tire_squeal.wav
-share/vamos/sounds/wind.wav
-share/vamos/textures/100.png
-share/vamos/textures/150.png
-share/vamos/textures/1967-steering-wheel.png
-share/vamos/textures/200.png
-share/vamos/textures/300.png
-share/vamos/textures/400.png
-share/vamos/textures/50.png
-share/vamos/textures/F1-steering-wheel.png
-share/vamos/textures/blue-green-tires.png
-share/vamos/textures/blue-kerb.png
-share/vamos/textures/blue-tires.png
-share/vamos/textures/digits-lcd.png
-share/vamos/textures/digits.png
-share/vamos/textures/fuel-face.png
-share/vamos/textures/gear-shift.png
-share/vamos/textures/gears-lcd.png
-share/vamos/textures/gears.png
-share/vamos/textures/grass.png
-share/vamos/textures/grass2.png
-share/vamos/textures/gravel.png
-share/vamos/textures/gravel2.png
-share/vamos/textures/gravel3.png
-share/vamos/textures/kerb.png
-share/vamos/textures/needle.png
-share/vamos/textures/rail.png
-share/vamos/textures/red-kerb.png
-share/vamos/textures/red-tires.png
-share/vamos/textures/shift-gate.png
-share/vamos/textures/sky.png
-share/vamos/textures/sky_bottom.png
-share/vamos/textures/sky_sides.png
-share/vamos/textures/sky_top.png
-share/vamos/textures/speedometer-face.png
-share/vamos/textures/steering-wheel.png
-share/vamos/textures/tachometer-face.png
-share/vamos/textures/tachometer-leds.png
-share/vamos/textures/tires.png
-share/vamos/textures/track.png
-share/vamos/textures/track2.png
-share/vamos/textures/wall.png
-share/vamos/tracks/Albert_Park.xml
-share/vamos/tracks/Bahrain.xml
-share/vamos/tracks/Catalunya.xml
-share/vamos/tracks/Hockenheimring.xml
-share/vamos/tracks/Hungaroring.xml
-share/vamos/tracks/Imola.xml
-share/vamos/tracks/Indianapolis.xml
-share/vamos/tracks/Interlagos.xml
-share/vamos/tracks/Laguna_Seca.xml
-share/vamos/tracks/Magny-Cours.xml
-share/vamos/tracks/Monaco.xml
-share/vamos/tracks/Monza.xml
-share/vamos/tracks/Mosport.xml
-share/vamos/tracks/Nurburgring.xml
-share/vamos/tracks/Peanut.xml
-share/vamos/tracks/Road_Atlanta.xml
-share/vamos/tracks/Sepang.xml
-share/vamos/tracks/Shanghai.xml
-share/vamos/tracks/Silverstone.xml
-share/vamos/tracks/Spa.xml
-share/vamos/tracks/Suzuka.xml
-share/vamos/tracks/Villeneuve.xml
-share/vamos/tracks/bridge.ac
-share/vamos/tracks/default-track.xml
-share/vamos/tracks/drag.xml
-share/vamos/tracks/garage.ac
-share/vamos/tracks/grandstand.ac
-share/vamos/tracks/jump.xml
-share/vamos/tracks/skid_pad.xml
-share/vamos/worlds/default-world.xml
-share/vamos/worlds/earth.xml
-share/vamos/worlds/moon.xml
-@dirrm share/vamos/worlds
-@dirrm share/vamos/tracks
-@dirrm share/vamos/textures
-@dirrm share/vamos/sounds
-@dirrm share/vamos/controls
-@dirrm share/vamos/cars
-@dirrm share/vamos
+%%DATADIR%%/cars/F1-1967-interior.ac
+%%DATADIR%%/cars/F1-1967.ac
+%%DATADIR%%/cars/F1-1967.xml
+%%DATADIR%%/cars/F1.ac
+%%DATADIR%%/cars/F1.xml
+%%DATADIR%%/cars/GT-interior.ac
+%%DATADIR%%/cars/GT.ac
+%%DATADIR%%/cars/GT.xml
+%%DATADIR%%/cars/default-car.xml
+%%DATADIR%%/cars/front-drive.xml
+%%DATADIR%%/cars/trainer.xml
+%%DATADIR%%/cars/wheel-fast.ac
+%%DATADIR%%/cars/wheel.ac
+%%DATADIR%%/controls/clutch-wheel.xml
+%%DATADIR%%/controls/default-controls.xml
+%%DATADIR%%/controls/stick.xml
+%%DATADIR%%/controls/throttle-wheel.xml
+%%DATADIR%%/sounds/crash.wav
+%%DATADIR%%/sounds/default-sounds.xml
+%%DATADIR%%/sounds/engine.wav
+%%DATADIR%%/sounds/f1-engine.wav
+%%DATADIR%%/sounds/rumble.wav
+%%DATADIR%%/sounds/tire_squeal.wav
+%%DATADIR%%/sounds/wind.wav
+%%DATADIR%%/textures/100.png
+%%DATADIR%%/textures/150.png
+%%DATADIR%%/textures/1967-steering-wheel.png
+%%DATADIR%%/textures/200.png
+%%DATADIR%%/textures/300.png
+%%DATADIR%%/textures/400.png
+%%DATADIR%%/textures/50.png
+%%DATADIR%%/textures/F1-steering-wheel.png
+%%DATADIR%%/textures/blue-green-tires.png
+%%DATADIR%%/textures/blue-kerb.png
+%%DATADIR%%/textures/blue-tires.png
+%%DATADIR%%/textures/digits-lcd.png
+%%DATADIR%%/textures/digits.png
+%%DATADIR%%/textures/fuel-face.png
+%%DATADIR%%/textures/gear-shift.png
+%%DATADIR%%/textures/gears-lcd.png
+%%DATADIR%%/textures/gears.png
+%%DATADIR%%/textures/grass.png
+%%DATADIR%%/textures/grass2.png
+%%DATADIR%%/textures/gravel.png
+%%DATADIR%%/textures/gravel2.png
+%%DATADIR%%/textures/gravel3.png
+%%DATADIR%%/textures/kerb.png
+%%DATADIR%%/textures/needle.png
+%%DATADIR%%/textures/rail.png
+%%DATADIR%%/textures/red-kerb.png
+%%DATADIR%%/textures/red-tires.png
+%%DATADIR%%/textures/round-mask.png
+%%DATADIR%%/textures/shift-gate.png
+%%DATADIR%%/textures/sky.png
+%%DATADIR%%/textures/sky_bottom.png
+%%DATADIR%%/textures/sky_sides.png
+%%DATADIR%%/textures/sky_top.png
+%%DATADIR%%/textures/speedometer-face.png
+%%DATADIR%%/textures/square-mask.png
+%%DATADIR%%/textures/steering-wheel.png
+%%DATADIR%%/textures/tachometer-face.png
+%%DATADIR%%/textures/tachometer-leds.png
+%%DATADIR%%/textures/tires.png
+%%DATADIR%%/textures/track.png
+%%DATADIR%%/textures/track2.png
+%%DATADIR%%/textures/wall.png
+%%DATADIR%%/tracks/Albert_Park.xml
+%%DATADIR%%/tracks/Bahrain.xml
+%%DATADIR%%/tracks/Catalunya.xml
+%%DATADIR%%/tracks/Hockenheimring.xml
+%%DATADIR%%/tracks/Hungaroring.xml
+%%DATADIR%%/tracks/Imola.xml
+%%DATADIR%%/tracks/Indianapolis.xml
+%%DATADIR%%/tracks/Interlagos.xml
+%%DATADIR%%/tracks/Kyalami.xml
+%%DATADIR%%/tracks/Laguna_Seca.xml
+%%DATADIR%%/tracks/Magny-Cours.xml
+%%DATADIR%%/tracks/Monaco.xml
+%%DATADIR%%/tracks/Monza.xml
+%%DATADIR%%/tracks/Mosport.xml
+%%DATADIR%%/tracks/Nurburgring.xml
+%%DATADIR%%/tracks/Peanut.xml
+%%DATADIR%%/tracks/Road_Atlanta.xml
+%%DATADIR%%/tracks/Sepang.xml
+%%DATADIR%%/tracks/Shanghai.xml
+%%DATADIR%%/tracks/Silverstone.xml
+%%DATADIR%%/tracks/Spa.xml
+%%DATADIR%%/tracks/Suzuka.xml
+%%DATADIR%%/tracks/Villeneuve.xml
+%%DATADIR%%/tracks/bridge.ac
+%%DATADIR%%/tracks/default-track.xml
+%%DATADIR%%/tracks/drag.xml
+%%DATADIR%%/tracks/garage.ac
+%%DATADIR%%/tracks/grandstand.ac
+%%DATADIR%%/tracks/jump.xml
+%%DATADIR%%/tracks/skid_pad.xml
+%%DATADIR%%/worlds/default-world.xml
+%%DATADIR%%/worlds/earth.xml
+%%DATADIR%%/worlds/moon.xml
+@dirrm %%DATADIR%%/worlds
+@dirrm %%DATADIR%%/tracks
+@dirrm %%DATADIR%%/textures
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/controls
+@dirrm %%DATADIR%%/cars
+@dirrm %%DATADIR%%
 @dirrm include/vamos/world
 @dirrm include/vamos/track
 @dirrm include/vamos/geometry
 @dirrm include/vamos/body
 @dirrm include/vamos