Index: head/devel/ptmalloc/Makefile
===================================================================
--- head/devel/ptmalloc/Makefile	(revision 461565)
+++ head/devel/ptmalloc/Makefile	(revision 461566)
@@ -1,36 +1,30 @@
 # Created by: is grammatically incorrect in this context.
 # $FreeBSD$
 
 PORTNAME=	ptmalloc
 PORTVERSION=	3.0
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.malloc.de/malloc/
 DISTNAME=	${PORTNAME}3-current
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Alternative threads-aware malloc
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}3
-
 USES=		gmake
+WRKSRC=		${WRKDIR}/${PORTNAME}3
+USE_LDCONFIG=	yes
 ALL_TARGET=	posix
+TEST_TARGET=	check
 
-INCDIR=		include/${PORTNAME}
-PLIST_SUB=	INCDIR=${INCDIR}
-
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${INCDIR}
-	${INSTALL_DATA} ${WRKSRC}/malloc-2.8.3.h ${STAGEDIR}${PREFIX}/${INCDIR}/malloc.h
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/malloc-2.8.3.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}/malloc.h
 	${INSTALL_DATA} ${WRKSRC}/libptmalloc3.a ${STAGEDIR}${PREFIX}/lib/libptmalloc.a
 	${INSTALL_LIB} ${WRKSRC}/ptmalloc3.so ${STAGEDIR}${PREFIX}/lib/libptmalloc.so.3
 	${LN} -sf libptmalloc.so.3 ${STAGEDIR}${PREFIX}/lib/libptmalloc.so
-
-regression-test: build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
 .include <bsd.port.mk>
Index: head/devel/ptmalloc/pkg-plist
===================================================================
--- head/devel/ptmalloc/pkg-plist	(revision 461565)
+++ head/devel/ptmalloc/pkg-plist	(revision 461566)
@@ -1,4 +1,4 @@
-%%INCDIR%%/malloc.h
+include/ptmalloc/malloc.h
 lib/libptmalloc.a
 lib/libptmalloc.so
 lib/libptmalloc.so.3