--- x11-wm/aewm/Makefile	Wed Jan 30 19:38:43 2002
+++ x11-wm/aewm/Makefile	Mon Feb  4 02:21:52 2002
@@ -6,15 +6,17 @@ 
 #
 
 PORTNAME=	aewm
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.red-bean.com/~decklin/aewm/
 
 MAINTAINER=	trevor@FreeBSD.org
 
+ALL_TARGET=	aewm
 BINS=		aewm
 DOCDIR=		share/doc/${PORTNAME}
 DOCS=		Changelog README TODO
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}"
 MAN1=		aewm.1
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
@@ -23,20 +25,20 @@ 
 pre-install:
 	${ECHO_CMD} bin/aewm > ${PLIST}
 .if !defined(NOPORTDOCS)
-	for i in ${DOCS}; \
-		do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
-	done
+.for i in ${DOCS}
+	${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
+.endfor
 	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aewm ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/aewm.1x ${PREFIX}/man/man1/aewm.1
+	${INSTALL_MAN} ${WRKSRC}/aewm.1x ${MANPREFIX}/man/man1/aewm.1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCDIR}
-	for i in ${DOCS}; \
-		do ${INSTALL_DATA} ${WRKSRC}/$${i} ${PREFIX}/${DOCDIR}; \
-	done
+.for i in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
--- x11-wm/aewm/distinfo	Thu Jan 11 10:35:35 2001
+++ x11-wm/aewm/distinfo	Mon Feb  4 02:16:30 2002
@@ -1, +1, @@ 
-MD5 (aewm-1.1.2.tar.gz) = 3eca52e76888f768b96d17dcb84b57cc
+MD5 (aewm-1.2.0.tar.gz) = 613a22ef5e4c00a4821641d0d92492b2
--- x11-wm/aewm/files/patch-Makefile	Mon Jan  8 06:52:37 2001
+++ x11-wm/aewm/files/patch-Makefile	Thu Jan  1 09:00:00 1970
@@ -1,17 +0,0 @@ 
---- Makefile.orig	Mon Jan  1 21:43:57 2001
-+++ Makefile	Sun Jan  7 13:40:03 2001
-@@ -25,12 +25,11 @@
- 
- # This should be set to the location of the X installation you want to
- # compile against.
--XROOT = /usr/X11R6
-+XROOT = $(X11BASE)
- 
- # --------------------------------------------------------------------
- 
--CC       = gcc
--CFLAGS   = -g -O2 -Wall
-+CC       ?= gcc
- 
- BINDIR   = $(DESTDIR)$(XROOT)/bin
- MANDIR   = $(DESTDIR)$(XROOT)/man/man1