diff -urN /usr/ports/x11-wm/ctwm/Makefile x11-wm/ctwm/Makefile
--- /usr/ports/x11-wm/ctwm/Makefile	Fri Aug  9 23:11:25 2002
+++ x11-wm/ctwm/Makefile	Fri Aug  9 23:45:10 2002
@@ -7,6 +7,7 @@
 
 PORTNAME=	ctwm
 PORTVERSION=	3.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://slpc1.epfl.ch/public/software/ctwm/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
diff -urN /usr/ports/x11-wm/ctwm/files/patch-aa x11-wm/ctwm/files/patch-aa
--- /usr/ports/x11-wm/ctwm/files/patch-aa	Fri Aug  9 23:11:25 2002
+++ x11-wm/ctwm/files/patch-aa	Fri Aug  9 23:47:48 2002
@@ -1,9 +1,17 @@
 $FreeBSD: ports/x11-wm/ctwm/files/patch-aa,v 1.8 2002/08/08 06:23:55 glewis Exp $
 
-*** Imakefile.orig	Mon May 15 21:47:10 2000
---- Imakefile	Sat Sep 22 11:50:14 2001
+*** Imakefile.orig	Wed Dec 12 00:38:52 2001
+--- Imakefile	Fri Aug  9 23:45:46 2002
 ***************
-*** 19,26 ****
+*** 11,26 ****
+  #undef  USE_SOUND
+  #define XPM
+  #define USEM4
+! #undef X11R6
+! #undef I18N
+  
+           YFLAGS = -d
+          DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM
@@ -12,7 +20,15 @@
   
        XPMDEFINES = -DXPM
            XPMLIB = $(XPMLIBDIR) -lXpm
---- 19,26 ----
+--- 11,26 ----
+  #undef  USE_SOUND
+  #define XPM
+  #define USEM4
+! #define X11R6
+! #define I18N
+  
+           YFLAGS = -d
+          DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM