diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index 73bd97a1dfab..08a57f2fd382 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -1,55 +1,53 @@
 # ex:ts=8
 # Ports collection makefile for:	qslim
 # Date created:			Jan 6, 2001
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	qslim
-PORTVERSION=	2.0
-PORTREVISION=	3
+PORTVERSION=	2.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://graphics.cs.uiuc.edu/~garland/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SlimKit Surface Modeling Tools
 
+BUILD_DEPENDS=	${LOCALBASE}/include/gfx/gfx.h:${PORTSDIR}/graphics/libgfx
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		forms.1:${PORTSDIR}/x11-toolkits/xforms
 
-CONFIGURE_WRKSRC=	${WRKSRC}/mixkit/build
-BUILD_WRKSRC=	${WRKSRC}/mixkit/src
+CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}/mixkit
+BUILD_WRKSRC=		${WRKDIR}/${DISTNAME}/mixkit/src
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GL=		glut
+USE_GNOME=	gnometarget
+USE_GL=		glu
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	# none
 
-CPPFLAGS=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/X11 ${PTHREAD_CFLAGS}
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive
 
-post-extract:
-	@${RM} -f ${WRKSRC}/mixkit/src/getopt.h
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|\@XFORMS_LIBS\@|-lforms -lformsGL -lXpm|g' \
-		${CONFIGURE_WRKSRC}/mix-config.in
+pre-configure:
+	@(cd ${CONFIGURE_WRKSRC}/../libgfx && ${SETENV} ${CONFIGURE_ENV} \
+	    CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
+	    CXXFLAGS="${CXXFLAGS}" ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
 
 post-build:
-	@(cd ${BUILD_WRKSRC}/../../tools/qslim ; ${GMAKE} all)
-	@(cd ${BUILD_WRKSRC}/../../tools/filters ; ${GMAKE} all)
+	@(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \
+	${GMAKE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/mixkit/src/libmix.a ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qslim ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qvis ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/include/mixkit
 	${INSTALL_DATA} ${WRKSRC}/mixkit/src/*.h ${PREFIX}/include/mixkit
 
 .include <bsd.port.mk>
diff --git a/graphics/qslim/distinfo b/graphics/qslim/distinfo
index 4fa20e211b15..cc704a7776f1 100644
--- a/graphics/qslim/distinfo
+++ b/graphics/qslim/distinfo
@@ -1,3 +1,3 @@
-MD5 (qslim-2.0.tar.gz) = 0795b179309df3b890e65b07621b81ca
-SHA256 (qslim-2.0.tar.gz) = 6b093da157086de437a46c25547150ee942fcfc2076e7bd9e42d833f700e7f0b
-SIZE (qslim-2.0.tar.gz) = 160250
+MD5 (qslim-2.1.tar.gz) = 07dce2db7e577e7852b1bcaa86aa5d0f
+SHA256 (qslim-2.1.tar.gz) = af47fb69f7d1a5a0464b90436c9f7051a78a0fce44591096c3f9838d8f970a2a
+SIZE (qslim-2.1.tar.gz) = 287513
diff --git a/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx b/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx
deleted file mode 100644
index f2e842142240..000000000000
--- a/graphics/qslim/files/patch-mixkit::src::MxAsp.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
---- mixkit/src/MxAsp.cxx.orig	Sat Jan 23 06:50:45 1999
-+++ mixkit/src/MxAsp.cxx	Mon Nov  3 22:09:45 2003
-@@ -53,8 +53,8 @@
- }
- 
- #define asprint(V)\
--out<< *as##.##V##_var; \
--for(i=1; i<size; i++) out << " " << as##.##V##_var[i]
-+out<< *as.V##_var; \
-+for(i=1; i<size; i++) out << " " << as.V##_var[i]
- 
- ostream& MxAspVar::print(ostream& out) const
- {
-@@ -79,7 +79,7 @@
- #define defset(V, T) \
- bool MxAspVar::set_##V(V val, uint i) \
- {\
--     if( type==T && i<size ) { as##.##V##_var[i]=val; return true; } \
-+     if( type==T && i<size ) { as.V##_var[i]=val; return true; } \
-      else  return false; \
- }
- 
-@@ -94,7 +94,7 @@
- #define defget(V, T) \
- V *MxAspVar::get_##V(V *out, uint i) \
- {\
--     if( type==T && i<size ) { *out = as##.##V##_var[i]; return out; } \
-+     if( type==T && i<size ) { *out = as.V##_var[i]; return out; } \
-      else  return NULL; \
- } 
- 
diff --git a/graphics/qslim/pkg-plist b/graphics/qslim/pkg-plist
index e4af9540ce64..9be676835fc4 100644
--- a/graphics/qslim/pkg-plist
+++ b/graphics/qslim/pkg-plist
@@ -1,49 +1,53 @@
 bin/qslim
 bin/qvis
-include/mixkit/MxArcball.h
 include/mixkit/MxAsp.h
 include/mixkit/MxBlock.h
 include/mixkit/MxBlock2.h
 include/mixkit/MxBlock3.h
 include/mixkit/MxBlockModel.h
 include/mixkit/MxCamera.h
 include/mixkit/MxCmdParser.h
+include/mixkit/MxDualModel.h
+include/mixkit/MxDualSlim.h
 include/mixkit/MxDynBlock.h
 include/mixkit/MxEdgeFilter.h
+include/mixkit/MxFaceTree.h
+include/mixkit/MxFeatureFilter.h
+include/mixkit/MxFitFrame.h
+include/mixkit/MxFrame.h
 include/mixkit/MxGL.h
-include/mixkit/MxGLPane.h
 include/mixkit/MxGLUtils.h
+include/mixkit/MxGUI.h
 include/mixkit/MxGeoPrims.h
+include/mixkit/MxGeom2D.h
 include/mixkit/MxGeom3D.h
 include/mixkit/MxHeap.h
-include/mixkit/MxLineModel.h
 include/mixkit/MxManipulator.h
 include/mixkit/MxMat2.h
 include/mixkit/MxMat3.h
 include/mixkit/MxMat4.h
 include/mixkit/MxMath.h
 include/mixkit/MxMatrix.h
 include/mixkit/MxPropSlim.h
 include/mixkit/MxQMetric.h
-include/mixkit/MxQMetric2.h
 include/mixkit/MxQMetric3.h
 include/mixkit/MxQSlim.h
 include/mixkit/MxRaster.h
 include/mixkit/MxSMF.h
 include/mixkit/MxStack.h
+include/mixkit/MxStdGUI.h
 include/mixkit/MxStdModel.h
-include/mixkit/MxStdPane.h
 include/mixkit/MxStdSlim.h
+include/mixkit/MxString.h
 include/mixkit/MxTimer.h
 include/mixkit/MxVec2.h
 include/mixkit/MxVec3.h
 include/mixkit/MxVec4.h
 include/mixkit/MxVector.h
-include/mixkit/mixcfg.h
 include/mixkit/mixio.h
 include/mixkit/mixmops.h
 include/mixkit/mixmsg.h
 include/mixkit/mixvops.h
 include/mixkit/stdmix.h
 lib/libmix.a
 @dirrm include/mixkit