diff --git a/x11/xforms/DESCR b/x11/xforms/DESCR
index 9a213e96289f..79dd5c77755f 100644
--- a/x11/xforms/DESCR
+++ b/x11/xforms/DESCR
@@ -1,5 +1,5 @@
-This is the binary distribution of XForms, a graphical user interface
-toolkit for X Window Systems. It should work under X11 R4, R5 & R6.
+This is the first Open Source distribution of the XForms Library,
+a graphical user interface toolkit for X Windows. XForms is
+licensed under the LGPL (Lesser Gnu Public License) version 2.1.
 
-Documentation on XForms is available from bragg.phys.uwm.edu /pub/xforms
-via anonymous ftp.
+This package is current built without OpenGL support.
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 4549e6965854..0de36a23fb82 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,87 +1,21 @@
-# $NetBSD: Makefile,v 1.38 2001/11/29 01:12:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.39 2002/04/17 04:40:36 fredb Exp $
 #
 
-DISTNAME=       bxform-088
-PKGNAME=	xforms-0.88
-PKGREVISION=       1
-WRKSRC=		${WRKDIR}/xforms
+DISTNAME=	xforms-0.9999
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ncmir.ucsd.edu/pub/xforms/${ARCH_SUBDIR}/
+MASTER_SITES=	ftp://ncmir.ucsd.edu/pub/xforms/OpenSource/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://world.std.com/~xforms/
 COMMENT=	Graphical user interface toolkit for X Window System
 
-LICENSE=	fee-based-commercial-use
+USE_IMAKE=	YES
+USE_X11=	YES
+USE_XPM=	YES
 
-.if (${MACHINE_ARCH} == "arm32")
-ARCH_SUBDIR=    netBSD-arm
-.elif (${MACHINE_ARCH} == "i386")
-ARCH_SUBDIR=    netBSD
-.elif (${MACHINE_ARCH} == "ns32k")
-ARCH_SUBDIR=    netBSD-pc532
-.else
-ARCH_SUBDIR=    netBSD-${MACHINE_ARCH}
-.endif
+MAKE_ENV=	DEPEND_DEFINES="-I${BUILDLINK_DIR}/include"
+SCRIPTS_ENV=	DEPEND_DEFINES="-I${BUILDLINK_DIR}/include"
 
-DIST_SUBDIR=		xforms-${MACHINE_ARCH}
-
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \
-			NetBSD-*-m68k NetBSD-*-mipsel NetBSD-*-ns32k \
-			NetBSD-*-sparc NetBSD-*-powerpc SunOS-*-*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
-DISTNAME=	bxform-088-ELF
-.endif
-.if ${MACHINE_ARCH} == "sparc" && ${OBJECT_FMT} == "ELF"
-DISTNAME=	bxform-088-ELF
-.endif
-
-.if ${OPSYS} == "SunOS"
-DISTNAME=	bxform-088
-.if ${MACHINE_ARCH} == "sparc"
-ARCH_SUBDIR=	sun/Solaris
-.elif ${MACHINE_ARCH} == "i386"
-ARCH_SUBDIR=	solaris-x86/2.7
-.endif
-DIST_SUBDIR=	xforms-${OPSYS}-${MACHINE_ARCH}
-.endif
-
-## Define OBJMACHINE so WRKDIR is defined to be ${MACHINE_ARCH}-specific.
-OBJMACHINE=	YES
-
-USE_X11BASE=	YES
-USE_LIBTOOL=	YES
-MAKEFILE=	${FILESDIR}/Makefile
-PLIST_SRC=	${PKGDIR}/PLIST.mi ${PKGDIR}/PLIST.shlib
-
-CHECK_SHLIBS=	NO	# fdesigner doesn't find libX11 on i386
-# we don't have sources, so don't run this test
-
-# When the XForms API changes and breaks binary-compatibility with the
-# previous version, increment the MAJOR by 1 and reset the MINOR to 0.
-#
-SHLIB_MAJOR=	0
-SHLIB_MINOR=	88
-
-MAKE_ENV+=	SHLIB_MAJOR="${SHLIB_MAJOR}" SHLIB_MINOR="${SHLIB_MINOR}"
-
-# XXX Run-time link editor tries to resolve libGL.so symbols when linking
-# XXX with shared libxforms, but all the packages that requre xforms seem
-# XXX to work OK without -lGL, so for now, remove the shared lib.
-PLIST_SRC=	${PKGDIR}/PLIST.mi
-
-post-install:
-	${RM} -f \
-		${PREFIX}/lib/libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-		${PREFIX}/lib/libforms.so.${SHLIB_MAJOR} \
-		${PREFIX}/lib/libforms.so \
-		${PREFIX}/lib/libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-		${PREFIX}/lib/libxforms.so.${SHLIB_MAJOR} \
-		${PREFIX}/lib/libxforms.so
-
-.include "../../graphics/xpm/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/PLIST b/x11/xforms/PLIST
new file mode 100644
index 000000000000..916bb97c9f83
--- /dev/null
+++ b/x11/xforms/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2002/04/17 04:40:36 fredb Exp $
+bin/fd2ps
+bin/fdesign
+include/X11/forms.h
+lib/libforms.a
+lib/libforms.so
+lib/libforms.so.0
+lib/libforms.so.0.9999
+man/cat1/fd2ps.0
+man/cat1/fdesign.0
diff --git a/x11/xforms/PLIST.mi b/x11/xforms/PLIST.mi
deleted file mode 100644
index ceb91237dbae..000000000000
--- a/x11/xforms/PLIST.mi
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST.mi,v 1.1 2001/10/31 22:29:24 zuntum Exp $
-bin/fd2ps
-bin/fdesign
-include/X11/forms.h
-lib/libforms.a
-lib/libforms.la
-lib/libxforms.a
-lib/libxforms.la
-man/man1/fd2ps.1
-man/man1/fdesign.1
-man/man5/forms.5
-man/man5/xforms.5
diff --git a/x11/xforms/PLIST.shlib b/x11/xforms/PLIST.shlib
deleted file mode 100644
index b8e33a2fd4cc..000000000000
--- a/x11/xforms/PLIST.shlib
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.shlib,v 1.1 2001/10/31 22:29:24 zuntum Exp $
-lib/libforms.so
-lib/libforms.so.0
-lib/libforms.so.0.88
-lib/libxforms.so
-lib/libxforms.so.0
-lib/libxforms.so.0.88
diff --git a/x11/xforms/distinfo b/x11/xforms/distinfo
index a7226a44242d..95dc35e07bd9 100644
--- a/x11/xforms/distinfo
+++ b/x11/xforms/distinfo
@@ -1,26 +1,9 @@
-$NetBSD: distinfo,v 1.5 2001/08/09 13:45:43 wiz Exp $
 
-SHA1 (xforms-alpha/bxform-088.tgz) = a82b5e2d3c9841323e54003c3d2fbf5e506fbd42
-Size (xforms-alpha/bxform-088.tgz) = 1197562 bytes
-SHA1 (xforms-arm32/bxform-088.tgz) = f07e8e0a744278afc2fc86c51b442fab7c36197c
-Size (xforms-arm32/bxform-088.tgz) = 1067594 bytes
-SHA1 (xforms-i386/bxform-088-ELF.tgz) = 3097a16a87d72fda0dca10f3aa9d52d328b83ab5
-Size (xforms-i386/bxform-088-ELF.tgz) = 851405 bytes
-SHA1 (xforms-i386/bxform-088.tgz) = 943f8052846d375ca1eb30d221a5b0777fd19945
-Size (xforms-i386/bxform-088.tgz) = 887615 bytes
-SHA1 (xforms-m68k/bxform-088.tgz) = c1299ff67eaa245d1fe789b8a5b2b7c38506a0e7
-Size (xforms-m68k/bxform-088.tgz) = 842740 bytes
-SHA1 (xforms-mipsel/bxform-088.tgz) = ac279319dd924263b613ac3a3e4462d3c5866b34
-Size (xforms-mipsel/bxform-088.tgz) = 1097766 bytes
-SHA1 (xforms-ns32k/bxform-088.tgz) = 9730944f4534c384e6f994164ccdc9d122dc9d4f
-Size (xforms-ns32k/bxform-088.tgz) = 818317 bytes
-SHA1 (xforms-powerpc/bxform-088.tgz) = 7076c4933054da54affcccd67e995626f3dfbc99
-Size (xforms-powerpc/bxform-088.tgz) = 1014785 bytes
-SHA1 (xforms-sparc/bxform-088-ELF.tgz) = 081be01417707d739cb71f3fa473fdc7e32eced5
-Size (xforms-sparc/bxform-088-ELF.tgz) = 673651 bytes
-SHA1 (xforms-sparc/bxform-088.tgz) = 7c364dad70b65b1b613f54f3b693c958d9c4b27a
-Size (xforms-sparc/bxform-088.tgz) = 1017705 bytes
-SHA1 (xforms-SunOS-i386/bxform-088.tgz) = 724683ad7e9eb2cf99da9dfe558daca910bb8e32
-Size (xforms-SunOS-i386/bxform-088.tgz) = 899727 bytes
-SHA1 (xforms-SunOS-sparc/bxform-088.tgz) = 9b13e36c4440f4d3a84dc232489f06d0b8a8e449
-Size (xforms-SunOS-sparc/bxform-088.tgz) = 1123327 bytes
+
+SHA1 (xforms-0.9999.tgz) = d88d24a37ab4fe37fbcb8b85f0c6a727638db217
+Size (xforms-0.9999.tgz) = 1040128 bytes
+SHA1 (patch-aa) = 70eb79d4e724c8694aa6a5b1b5324cfc45d3c3da
+SHA1 (patch-ab) = 9e0ed487588d7df9293351b37c3a6065df3537a7
+SHA1 (patch-ac) = 618542e755d3ea6a9a7616422fe79cfec7527a96
+SHA1 (patch-ad) = 1cbf52d63b2538008e48e63fab1e090c7c03982d
+SHA1 (patch-ae) = ccf27ff1e0c2f95a26f4b4365825ae7d511081f6
diff --git a/x11/xforms/files/Makefile b/x11/xforms/files/Makefile
deleted file mode 100644
index cf83ce55ebfa..000000000000
--- a/x11/xforms/files/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/03/02 01:26:12 jlam Exp $
-#
-# Makefile using LIBTOOL to generate a shared library from the static one.
-
-SHELL=		/bin/sh
-
-BINDIR=		${PREFIX}/bin
-INCLUDEDIR=	${PREFIX}/include/X11
-LIBDIR=		${PREFIX}/lib
-MANDIR=		${PREFIX}/man
-
-PROGS=		DESIGN/fdesign fd2ps/fd2ps
-INCLUDES=	FORMS/forms.h
-
-MAN1=		DESIGN/fdesign.1 fd2ps/fd2ps.1
-MAN5=		FORMS/xforms.5
-
-all:		libforms.la
-
-libforms.la:	FORMS/libforms.a
-	mkdir -p objects/.libs;						\
-	cd objects/.libs;						\
-	${AR} x ../../FORMS/libforms.a;					\
-	cd ..;								\
-	for file in .libs/*.o; do					\
-		base=`basename $${file} .o`;				\
-		rm -f $${base}.lo;					\
-		( echo "#";						\
-		  echo "# Generated by libtool";			\
-		  echo "#";						\
-		  echo "pic_object=$${file}";				\
-		  echo "non_pic_object=$${file}";			\
-		) > $${base}.lo;					\
-	done
-	${LIBTOOL} --mode=link ${CC} -o ${.TARGET} objects/*.lo		\
-		-rpath ${LIBDIR} -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
-
-install:	install-progs install-includes install-libs install-man
-
-install-progs:	${PROGS}
-	@for file in ${PROGS}; do					\
-		echo "${BSD_INSTALL_PROGRAM} $$file ${BINDIR}";		\
-		${BSD_INSTALL_PROGRAM} $$file ${BINDIR};		\
-	done
-
-install-includes:	${INCLUDES}
-	@for file in ${INCLUDES}; do					\
-		echo "${BSD_INSTALL_MAN} $$file ${INCLUDEDIR}";		\
-		${BSD_INSTALL_MAN} $$file ${INCLUDEDIR};		\
-	done
-
-install-libs:	libforms.la
-	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libforms.la ${LIBDIR}
-	@if [ -f ${LIBDIR}/libforms.a ]; then				\
-		echo "ln -sf libforms.a ${LIBDIR}/libxforms.a";		\
-		ln -sf libforms.a ${LIBDIR}/libxforms.a;		\
-	fi
-	@if [ -f ${LIBDIR}/libforms.la ]; then				\
-		echo "ln -sf libforms.la ${LIBDIR}/libxforms.la";	\
-		ln -sf libforms.la ${LIBDIR}/libxforms.la;		\
-	fi
-	@if [ -f ${LIBDIR}/libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ]; then \
-		echo "ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}	\
-			${LIBDIR}/libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}"; \
-		ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}	\
-			${LIBDIR}/libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
-	fi
-
-install-man:	${MAN1} ${MAN5}
-	@for file in ${MAN1}; do					\
-		echo "${BSD_INSTALL_MAN} $$file ${MANDIR}/man1";	\
-		${BSD_INSTALL_MAN} $$file ${MANDIR}/man1;		\
-	done
-	@for file in ${MAN5}; do					\
-		echo "${BSD_INSTALL_MAN} $$file ${MANDIR}/man5";	\
-		${BSD_INSTALL_MAN} $$file ${MANDIR}/man5;		\
-	done
-	ln -sf xforms.5 ${MANDIR}/man5/forms.5
diff --git a/x11/xforms/patches/patch-aa b/x11/xforms/patches/patch-aa
new file mode 100644
index 000000000000..38e16c531634
--- /dev/null
+++ b/x11/xforms/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.5 2002/04/17 04:40:40 fredb Exp $
+
+--- Imakefile.orig	Tue Apr  2 11:05:09 2002
++++ Imakefile
+@@ -4,12 +4,12 @@
+ #define Optimize YES
+ #define UseSystemXpm YES
+ #define HaveStrerror YES
+-#define StaticLink YES
+-#define BuildGL YES
++#define StaticLink NO
++#define BuildGL NO
+ #define BuildShared YES
+-#define Solaris64Bit YES
++#define Solaris64Bit NO
+ 
+-#define XFormsInstallDir /usr/local
++#define XFormsInstallDir $(PREFIX)
+ #define XFormsLibRev 0.9999
+ 
+ #define OptimizationLevel -O4
diff --git a/x11/xforms/patches/patch-ab b/x11/xforms/patches/patch-ab
new file mode 100644
index 000000000000..62e66ea05830
--- /dev/null
+++ b/x11/xforms/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.3 2002/04/17 04:40:41 fredb Exp $
+
+--- demos/Imakefile.orig	Mon Apr  1 10:56:26 2002
++++ demos/Imakefile
+@@ -106,7 +106,7 @@
+ DEPOBJS		= $(DEPSRCS:.c=.o)
+ PROGRAMS	= $(DEMOSRCS:.c=)
+ 
+-JPEGLIBLOC	= /usr/local/lib
++JPEGLIBLOC	= ${BUILDLINK_DIR}/lib
+ 
+ #if Solaris64Bit
+ LDPRELIB	= -L/usr/openwin/lib/sparcv9
+@@ -120,7 +120,7 @@
+ 
+ FORMSLIBDIR     = $(TOP)/lib
+ FORMSINCDIR     = $(FORMSLIBDIR)       
+-FORMSLIB        = -L$(FORMSLIBDIR) -lforms
++FORMSLIB        = -L$(FORMSLIBDIR) -lforms -ljpeg -lXpm $(LDFLAGS)
+ DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
+ 
+ #if !UseSystemXpm
+@@ -138,7 +138,7 @@
+ 		  -I$(FORMSINCDIR) \
+ 		  -Ifd \
+ 		  -I. \
+-		  -I/usr/local/include \
++		  -I${BUILDLINK_DIR}/include \
+ 		  /* Don't remove this line */
+ 
+ EXTRA_LIBRARIES	= \
diff --git a/x11/xforms/patches/patch-ac b/x11/xforms/patches/patch-ac
new file mode 100644
index 000000000000..e3842f4734ea
--- /dev/null
+++ b/x11/xforms/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2002/04/17 04:40:42 fredb Exp $
+
+--- fd2ps/Imakefile.orig	Tue Apr  2 11:34:02 2002
++++ fd2ps/Imakefile
+@@ -32,7 +32,7 @@
+ 
+ FORMSLIBDIR     = $(TOP)/lib
+ FORMSINCDIR     = $(FORMSLIBDIR)       
+-FORMSLIB        = -L$(FORMSLIBDIR) -lforms
++FORMSLIB        = -L$(FORMSLIBDIR) -lforms -ljpeg -lXpm $(LDFLAGS)
+ DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
+ 
+ #if !UseSystemXpm
+@@ -55,7 +55,7 @@
+ 		  -Ispec \
+ 		  -Ixpm \
+ 		  -I. \
+-		  -I/usr/local/include \
++		  -I${BUILDLINK_DIR}/include \
+ 		  /* Don't remove this line */
+ 
+ EXTRA_LIBRARIES	= \
diff --git a/x11/xforms/patches/patch-ad b/x11/xforms/patches/patch-ad
new file mode 100644
index 000000000000..a0161cc1dbfa
--- /dev/null
+++ b/x11/xforms/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2002/04/17 04:40:43 fredb Exp $
+
+--- fdesign/Imakefile.orig	Tue Apr  2 11:33:21 2002
++++ fdesign/Imakefile
+@@ -59,7 +61,7 @@
+ 
+ FORMSLIBDIR     = $(TOP)/lib
+ FORMSINCDIR     = $(FORMSLIBDIR)       
+-FORMSLIB        = -L$(FORMSLIBDIR) -lforms
++FORMSLIB        = -L$(FORMSLIBDIR) -lforms -ljpeg -lXpm $(LDFLAGS)
+ DEPFORMSLIB     = $(FORMSLIBDIR)/libforms.a
+ 
+ #if !UseSystemXpm
+@@ -80,7 +82,7 @@
+ 		  -Ispec \
+ 		  -Ixpm \
+ 		  -I. \
+-		  -I/usr/local/include \
++		  -I${BUILDLINK_DIR}/include \
+ 		  /* Don't remove this line */
+ 
+ EXTRA_LIBRARIES	= \
diff --git a/x11/xforms/patches/patch-ae b/x11/xforms/patches/patch-ae
new file mode 100644
index 000000000000..79da8589d9c9
--- /dev/null
+++ b/x11/xforms/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/04/17 04:40:43 fredb Exp $
+
+--- lib/Imakefile.orig	Tue Apr  2 11:27:04 2002
++++ lib/Imakefile
+@@ -167,7 +167,7 @@
+ 		  -Ibitmaps \
+ 		  -I. \
+ 		  -Ifd \
+-		  -I/usr/local/include \
++		  -I${BUILDLINK_DIR}/include \
+ 		  /* Do not remove this line */
+ 
+ EXTRA_DEFINES	= \