diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index 0004d9acf537..427b0bcda459 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	xmorph
-PORTVERSION=	2003.05.27
-PORTREVISION=	1
+PORTVERSION=	2004.01.10
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/x/xmorph
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A digital image warping program
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g}
+WRKSRC=		${WRKDIR}/${PORTNAME}-current
 
 CONFLICTS=	libmorph*
 
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnometarget lthack
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 INSTALLS_SHLIB=	yes
@@ -36,13 +36,18 @@ INFO=		xmorph
 USE_GNOME+=     gtk20
 CONFIGURE_ARGS+=	--with-gtk2
 MAN1+=		gtkmorph.1
-PLIST_SUB+=	GTK2=""
 .else
 CONFIGURE_ARGS+=	--without-gtkmorph
-PLIST_SUB+=	GTK2="@comment "
 .endif
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/*.info*
 
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/example && ${FIND} . | \
+		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/xmorph/distinfo b/graphics/xmorph/distinfo
index 976d8b9bdef4..6f4335e988f0 100644
--- a/graphics/xmorph/distinfo
+++ b/graphics/xmorph/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmorph_20030527.tar.gz) = 8bd5ac56a1f228f59578f2618ddfa682
-SIZE (xmorph_20030527.tar.gz) = 854541
+MD5 (xmorph_20040110.tar.gz) = f0fec1ab474649fbbc74f04e2b151e19
+SIZE (xmorph_20040110.tar.gz) = 1146523
diff --git a/graphics/xmorph/files/patch-Makefile.in b/graphics/xmorph/files/patch-Makefile.in
new file mode 100644
index 000000000000..d8128c9222a4
--- /dev/null
+++ b/graphics/xmorph/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Tue Jan 13 00:29:21 2004
++++ Makefile.in	Sun Mar 14 02:13:28 2004
+@@ -763,12 +763,6 @@
+ 	    fi \
+ 	  done \
+ 	fi 
+-	cd example; for i in * ;\
+-	 	do $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/example/$$i ;\
+-		for j in $$i/* ;\
+-		do  $(INSTALL_DATA) $$j $(DESTDIR)$(pkgdatadir)/example/$$i;\
+-		done;\
+-	done
+ 
+ dist-hook:
+ 	if test -d pixmaps; then \
diff --git a/graphics/xmorph/files/patch-configure b/graphics/xmorph/files/patch-configure
deleted file mode 100644
index 658a198c7026..000000000000
--- a/graphics/xmorph/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 28 01:35:34 2003
-+++ configure	Thu May 29 10:06:07 2003
-@@ -7652,6 +7652,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'
diff --git a/graphics/xmorph/pkg-descr b/graphics/xmorph/pkg-descr
index 3db756e72559..d7807c7ebf0e 100644
--- a/graphics/xmorph/pkg-descr
+++ b/graphics/xmorph/pkg-descr
@@ -1,22 +1,12 @@
-From the README:
-   xmorph: Digital Image Warp ("morph") graphical user interface
+Xmorph is a digital image warping program, also known as a "morphing"
+program.
 
-   Written and Copyright (C) 1994, 1995, 1996 by Michael J. Gourlay
+Xmorph loads, saves, warps, and dissolves images, and loads, saves,
+creates, and manipulates control meshes which determine the warping.
+Xmorph has help pages built into it, so no external documentation
+is necessary.
 
-   NO WARRANTEES, EXPRESS OR IMPLIED.
+Gtkmorph is another graphical interface for the warping engine in
+Xmorph.
 
-   Xmorph is a digital image warping program, also known as a "morphing"
-   program.  It runs under the X Window System, using the X library, X
-   toolkit, X miscellaneous utilities, and the Athena widgets, all of
-   which are publically available from MIT, and part of the typical X
-   installation.  It is written in ANSI C.
-
-   Xmorph loads, saves, warps, and dissolves images, and loads, saves,
-   creates, and manipulates control meshes which determine the warping.
-   Xmorph has help pages built into it, so no external documentation is
-   necessary.
-
-WWW: http://www.colorado-research.com/~gourlay/software/Graphics/Xmorph/
-
-eric.
-erich@FreeBSD.org
+WWW: http://xmorph.sourceforge.net/
diff --git a/graphics/xmorph/pkg-plist b/graphics/xmorph/pkg-plist
index 9ed74c2ff25e..a0cdd8888186 100644
--- a/graphics/xmorph/pkg-plist
+++ b/graphics/xmorph/pkg-plist
@@ -1,35 +1,68 @@
 @comment $FreeBSD$
-%%GTK2%%bin/gtkmorph
+%%GNOME:%%bin/gtkmorph
 bin/morph
 bin/xmorph
 include/xmorph/RgbaImage.h
+include/xmorph/mesh-getext.h
 include/xmorph/mesh.h
 include/xmorph/my_malloc.h
 include/xmorph/relax.h
+include/xmorph/resample.h
 include/xmorph/spl-array.h
 include/xmorph/spline.h
 include/xmorph/tga.h
+include/xmorph/warp-gtk.h
 include/xmorph/warp.h
+include/xmorph/warp2.h
 lib/libmorph.a
 lib/libmorph.so
 lib/libmorph.so.1
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.dest.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.jpg
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.jpg.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.pgm
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.ppm
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.ppm.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/circuit.session
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/grid.pgm
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/grid.ppm
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/grid.ppm.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AA/gtkmorph.session
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD/gtkmorph.session
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD/image1.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD/image1.png.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD/image2.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD/image2.png.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD2/gtkmorph.session
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD2/image1.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD2/image1.png.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD2/image2.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD2/image2.png.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/gtkmorph.session
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/image1.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/image1.png.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/image1.png.meshtmp
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/image2.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/image2.png.mesh
+%%PORTDOCS%%%%EXAMPLESDIR%%/AD_freeborder/image2.png.meshtmp
 share/locale/it/LC_MESSAGES/xmorph.mo
-share/xmorph/example/README
-share/xmorph/example/gtkmorph.session
-share/xmorph/example/image1.png
-share/xmorph/example/image1.png.mesh
-share/xmorph/example/image2.png
-share/xmorph/example/image2.png.mesh
-%%GTK2%%share/xmorph/mpeg.param
-share/xmorph/pixmaps/cursor_left.xpm
-share/xmorph/pixmaps/eraser.xpm
-share/xmorph/pixmaps/example.xpm
-share/xmorph/pixmaps/hand01.xpm
-share/xmorph/pixmaps/howmany.xpm
-share/xmorph/pixmaps/pencil.xpm
-share/xmorph/pixmaps/pencil_y.xpm
-share/xmorph/pixmaps/transform.xpm
-@dirrm share/xmorph/pixmaps
-@dirrm share/xmorph/example
-@dirrm share/xmorph
+%%GNOME:%%%%DATADIR%%/mpeg.param
+%%DATADIR%%/pixmaps/cursor_left.xpm
+%%DATADIR%%/pixmaps/eraser.xpm
+%%DATADIR%%/pixmaps/example.xpm
+%%DATADIR%%/pixmaps/hand01.xpm
+%%DATADIR%%/pixmaps/howmany.xpm
+%%DATADIR%%/pixmaps/pencil.xpm
+%%DATADIR%%/pixmaps/pencil_y.xpm
+%%DATADIR%%/pixmaps/transform.xpm
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/AD_freeborder
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/AD2
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/AD
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/AA
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/xmorph