Index: head/graphics/alpng/Makefile
===================================================================
--- head/graphics/alpng/Makefile	(revision 491935)
+++ head/graphics/alpng/Makefile	(revision 491936)
@@ -1,33 +1,35 @@
 # Created by: Stas Timokhin <stast@bsdportal.ru>
 # $FreeBSD$
 
 PORTNAME=	alpng
 PORTVERSION=	1.3
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}13
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	Library for display PNG images in programs
 
 LIB_DEPENDS=	liballeg.so:devel/allegro
 
+USES=		gmake
+
 HAS_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
-USES=		gmake
 MAKE_ARGS=	CC="${CC}"
 CFLAGS+=	-I${LOCALBASE}/include
+
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	include/alpng.h \
 		lib/libalpng.a
 
 do-configure:
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|g" ${WRKSRC}/makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libalpng.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/src/alpng.h ${STAGEDIR}${PREFIX}/include/
 
 .include <bsd.port.mk>
Index: head/graphics/c-a-i-r/Makefile
===================================================================
--- head/graphics/c-a-i-r/Makefile	(revision 491935)
+++ head/graphics/c-a-i-r/Makefile	(revision 491936)
@@ -1,25 +1,24 @@
 # Created by: buganini@gmail.com
 # $FreeBSD$
 
 PORTNAME=	c-a-i-r
 PORTVERSION=	2.19
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CAIR%20v${PORTVERSION}
 DISTNAME=	CAIR_v${PORTVERSION}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Content Aware Image Resizer is an implementation of seam carving
 
 USES=		dos2unix gmake zip
 DOS2UNIX_GLOB=	*.cpp
 
-MAKE_ARGS+=	CC="${CXX}"
-
-WRKSRC=		${WRKDIR}
+MAKE_ARGS=	CC="${CXX}"
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/cair
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cair ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>