diff --git a/archivers/heirloom-tar/Makefile b/archivers/heirloom-tar/Makefile
index fd6b01807ae19..4b01f3643af57 100644
--- a/archivers/heirloom-tar/Makefile
+++ b/archivers/heirloom-tar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:48:39 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-tar-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -10,7 +10,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/heirloom-getopt/Makefile b/devel/heirloom-getopt/Makefile
index c13a0d9ca04f2..5d78b12f5732a 100644
--- a/devel/heirloom-getopt/Makefile
+++ b/devel/heirloom-getopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:44:55 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-getopt-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build getopt"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/heirloom-libcommon/Makefile b/devel/heirloom-libcommon/Makefile
index 2532ae5a61f87..0478aadeea998 100644
--- a/devel/heirloom-libcommon/Makefile
+++ b/devel/heirloom-libcommon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:45:14 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-libcommon-${HEIRLOOM_VER}
 CATEGORIES=	devel
@@ -22,7 +22,7 @@ PLIST_SUBST+=	NOUTMPX_H=
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST_SUBST+=	"NO_ALLOCA_H=@comment "
diff --git a/devel/heirloom-what/Makefile b/devel/heirloom-what/Makefile
index 3cc258251bc7f..53bfa3647cec7 100644
--- a/devel/heirloom-what/Makefile
+++ b/devel/heirloom-what/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:45:35 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-what-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build what"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/heirloom-awk/Makefile b/lang/heirloom-awk/Makefile
index bafd6bdb83282..9567a1bc9513b 100644
--- a/lang/heirloom-awk/Makefile
+++ b/lang/heirloom-awk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 01:01:46 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-awk-${HEIRLOOM_VER}
 CATEGORIES=	textproc lang
@@ -10,7 +10,7 @@ NEED_LIBUXRE=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/math/heirloom-factor/Makefile b/math/heirloom-factor/Makefile
index cbe85d1a38ab7..53b5318911947 100644
--- a/math/heirloom-factor/Makefile
+++ b/math/heirloom-factor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:40:58 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-factor-${HEIRLOOM_VER}
 CATEGORIES=	math
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build factor"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/heirloom-units/Makefile b/math/heirloom-units/Makefile
index e94dce335e771..2d0f30442c2fa 100644
--- a/math/heirloom-units/Makefile
+++ b/math/heirloom-units/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:41:17 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:14 cheusov Exp $
 
 PKGNAME=	heirloom-units-${HEIRLOOM_VER}
 CATEGORIES=	math
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build units"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-banner/Makefile b/misc/heirloom-banner/Makefile
index 6572f807a158d..6c326a27c9eb4 100644
--- a/misc/heirloom-banner/Makefile
+++ b/misc/heirloom-banner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:29:52 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-banner-${HEIRLOOM_VER}
 CATEGORIES=	misc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build banner"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-cal/Makefile b/misc/heirloom-cal/Makefile
index f43b17f34af3e..c0473e3350738 100644
--- a/misc/heirloom-cal/Makefile
+++ b/misc/heirloom-cal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:30:15 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-cal-${HEIRLOOM_VER}
 CATEGORIES=	misc time
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build cal"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-calendar/Makefile b/misc/heirloom-calendar/Makefile
index 3f16370858ec6..3cf2bc5d6c1ad 100644
--- a/misc/heirloom-calendar/Makefile
+++ b/misc/heirloom-calendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:30:35 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-calendar-${HEIRLOOM_VER}
 CATEGORIES=	misc time
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build calendar"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-more/Makefile b/misc/heirloom-more/Makefile
index d2219f360deef..652c5a2123638 100644
--- a/misc/heirloom-more/Makefile
+++ b/misc/heirloom-more/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:30:56 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-more-${HEIRLOOM_VER}
 CATEGORIES=	misc sysutils
@@ -11,7 +11,7 @@ NEED_LIBCURSES=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/misc/heirloom-od/Makefile b/misc/heirloom-od/Makefile
index 40fcb77b8db26..fb23b69450e28 100644
--- a/misc/heirloom-od/Makefile
+++ b/misc/heirloom-od/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:31:15 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-od-${HEIRLOOM_VER}
 CATEGORIES=	misc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build od"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-printf/Makefile b/misc/heirloom-printf/Makefile
index ebc39320a8e6c..5170d3e5cb212 100644
--- a/misc/heirloom-printf/Makefile
+++ b/misc/heirloom-printf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:31:35 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-printf-${HEIRLOOM_VER}
 CATEGORIES=	misc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build printf"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-sleep/Makefile b/misc/heirloom-sleep/Makefile
index 02bfdda90ce07..d6bec2001393d 100644
--- a/misc/heirloom-sleep/Makefile
+++ b/misc/heirloom-sleep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:31:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-sleep-${HEIRLOOM_VER}
 CATEGORIES=	misc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build sleep"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-sum/Makefile b/misc/heirloom-sum/Makefile
index 288aa514777c8..e5666d783957f 100644
--- a/misc/heirloom-sum/Makefile
+++ b/misc/heirloom-sum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:32:18 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-sum-${HEIRLOOM_VER}
 CATEGORIES=	misc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build sum"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-tcopy/Makefile b/misc/heirloom-tcopy/Makefile
index d96e9514ecfb3..70df7aa920ca3 100644
--- a/misc/heirloom-tcopy/Makefile
+++ b/misc/heirloom-tcopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:32:41 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:15 cheusov Exp $
 
 PKGNAME=	heirloom-tcopy-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -10,7 +10,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heirloom-time/Makefile b/misc/heirloom-time/Makefile
index af73538060859..e0459ad99928a 100644
--- a/misc/heirloom-time/Makefile
+++ b/misc/heirloom-time/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:33:06 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-time-${HEIRLOOM_VER}
 CATEGORIES=	misc time
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	NetBSD-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/heirloom-news/Makefile b/news/heirloom-news/Makefile
index 11eec14d7b3e1..3d25d1a3f852c 100644
--- a/news/heirloom-news/Makefile
+++ b/news/heirloom-news/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:38:09 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-news-${HEIRLOOM_VER}
 CATEGORIES=	news
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build news"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/heirloom-su/Makefile b/security/heirloom-su/Makefile
index 61122203fae29..f2b708bf0cfae 100644
--- a/security/heirloom-su/Makefile
+++ b/security/heirloom-su/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:36:05 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-su-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -9,7 +9,7 @@ NEED_LIBCRYPT=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-basename/Makefile b/sysutils/heirloom-basename/Makefile
index 7d1b27b64a190..25cac4af60b2c 100644
--- a/sysutils/heirloom-basename/Makefile
+++ b/sysutils/heirloom-basename/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:35:46 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-basename-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build basename"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-cat/Makefile b/sysutils/heirloom-cat/Makefile
index dfb09794e0cc0..3fb12865989fa 100644
--- a/sysutils/heirloom-cat/Makefile
+++ b/sysutils/heirloom-cat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:35:06 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-cat-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build cat"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-chmod/Makefile b/sysutils/heirloom-chmod/Makefile
index 10783fcb7c219..25394befd8215 100644
--- a/sysutils/heirloom-chmod/Makefile
+++ b/sysutils/heirloom-chmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:34:16 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-chmod-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build chmod"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-chown/Makefile b/sysutils/heirloom-chown/Makefile
index e481f9031dce5..d442309d94a45 100644
--- a/sysutils/heirloom-chown/Makefile
+++ b/sysutils/heirloom-chown/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:33:10 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-chown-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build chown"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-cksum/Makefile b/sysutils/heirloom-cksum/Makefile
index 3272f46553d3c..9e5a2cc252140 100644
--- a/sysutils/heirloom-cksum/Makefile
+++ b/sysutils/heirloom-cksum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:32:17 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-cksum-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build cksum"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-cmp/Makefile b/sysutils/heirloom-cmp/Makefile
index fbd629fc3ac77..fd6c5bc0e2961 100644
--- a/sysutils/heirloom-cmp/Makefile
+++ b/sysutils/heirloom-cmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:30:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-cmp-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build cmp"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-copy/Makefile b/sysutils/heirloom-copy/Makefile
index 3921f6653908b..f5e91efa9060f 100644
--- a/sysutils/heirloom-copy/Makefile
+++ b/sysutils/heirloom-copy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:30:19 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:16 cheusov Exp $
 
 PKGNAME=	heirloom-copy-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build copy"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-cp/Makefile b/sysutils/heirloom-cp/Makefile
index 4e042a6db94ff..4b7a21e80c8a6 100644
--- a/sysutils/heirloom-cp/Makefile
+++ b/sysutils/heirloom-cp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:29:21 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-cp-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build cp"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-csplit/Makefile b/sysutils/heirloom-csplit/Makefile
index c5ca1fc0fbf40..e31d64d528527 100644
--- a/sysutils/heirloom-csplit/Makefile
+++ b/sysutils/heirloom-csplit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:28:44 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-csplit-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NEED_LIBUXRE=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/sysutils/heirloom-dd/Makefile b/sysutils/heirloom-dd/Makefile
index 5fbe39daddc6f..462d688002eb6 100644
--- a/sysutils/heirloom-dd/Makefile
+++ b/sysutils/heirloom-dd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:27:41 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-dd-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-dirname/Makefile b/sysutils/heirloom-dirname/Makefile
index 15f75105b9452..f86bd7ee95508 100644
--- a/sysutils/heirloom-dirname/Makefile
+++ b/sysutils/heirloom-dirname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:26:41 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-dirname-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build dirname"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-du/Makefile b/sysutils/heirloom-du/Makefile
index 894ae736f5415..4c62809a89230 100644
--- a/sysutils/heirloom-du/Makefile
+++ b/sysutils/heirloom-du/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:25:08 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-du-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-env/Makefile b/sysutils/heirloom-env/Makefile
index 231c8012bda10..29d56c433dcc5 100644
--- a/sysutils/heirloom-env/Makefile
+++ b/sysutils/heirloom-env/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:24:22 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-env-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build env"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-file/Makefile b/sysutils/heirloom-file/Makefile
index ecc4dd590eb06..6983d154488c4 100644
--- a/sysutils/heirloom-file/Makefile
+++ b/sysutils/heirloom-file/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:41:36 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-file-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build file"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-find/Makefile b/sysutils/heirloom-find/Makefile
index 118a6fd75a9ac..39a91aecb7172 100644
--- a/sysutils/heirloom-find/Makefile
+++ b/sysutils/heirloom-find/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:22:37 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-find-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build find"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-getconf/Makefile b/sysutils/heirloom-getconf/Makefile
index 61a056d91255b..1a4db87899915 100644
--- a/sysutils/heirloom-getconf/Makefile
+++ b/sysutils/heirloom-getconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:48:27 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-getconf-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build getconf"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-groups/Makefile b/sysutils/heirloom-groups/Makefile
index 1639b801667aa..e632503151dc6 100644
--- a/sysutils/heirloom-groups/Makefile
+++ b/sysutils/heirloom-groups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:18:00 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:17 cheusov Exp $
 
 PKGNAME=	heirloom-groups-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build groups"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-hostname/Makefile b/sysutils/heirloom-hostname/Makefile
index 0ecd24511ac91..4245a08b22930 100644
--- a/sysutils/heirloom-hostname/Makefile
+++ b/sysutils/heirloom-hostname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:17:07 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-hostname-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-id/Makefile b/sysutils/heirloom-id/Makefile
index 544465f66118e..5df8533caee67 100644
--- a/sysutils/heirloom-id/Makefile
+++ b/sysutils/heirloom-id/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:16:10 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-id-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build id"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-listusers/Makefile b/sysutils/heirloom-listusers/Makefile
index 969f6630bf6ce..cf968a8f14532 100644
--- a/sysutils/heirloom-listusers/Makefile
+++ b/sysutils/heirloom-listusers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:15:13 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-listusers-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build listusers"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-ln/Makefile b/sysutils/heirloom-ln/Makefile
index dda2e5390a1f1..f839746eb6944 100644
--- a/sysutils/heirloom-ln/Makefile
+++ b/sysutils/heirloom-ln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:14:20 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-ln-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build ln"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-logins/Makefile b/sysutils/heirloom-logins/Makefile
index cefa2b65677ec..89b018fa725a6 100644
--- a/sysutils/heirloom-logins/Makefile
+++ b/sysutils/heirloom-logins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:12:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-logins-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build logins"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-logname/Makefile b/sysutils/heirloom-logname/Makefile
index 5a8a49c4ce28d..f34118e19f25d 100644
--- a/sysutils/heirloom-logname/Makefile
+++ b/sysutils/heirloom-logname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:11:40 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-logname-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build logname"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-ls/Makefile b/sysutils/heirloom-ls/Makefile
index c0ae71ae89135..4015a8f11c38d 100644
--- a/sysutils/heirloom-ls/Makefile
+++ b/sysutils/heirloom-ls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:10:41 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-ls-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -10,7 +10,7 @@ NEED_LIBCURSES=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/sysutils/heirloom-mesg/Makefile b/sysutils/heirloom-mesg/Makefile
index 92d586a068040..012bd83366694 100644
--- a/sysutils/heirloom-mesg/Makefile
+++ b/sysutils/heirloom-mesg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:06:38 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-mesg-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build mesg"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-mkdir/Makefile b/sysutils/heirloom-mkdir/Makefile
index 5db75b0f14f9b..25a21d9f5fef5 100644
--- a/sysutils/heirloom-mkdir/Makefile
+++ b/sysutils/heirloom-mkdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:05:14 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-mkdir-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build mkdir"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-mkfifo/Makefile b/sysutils/heirloom-mkfifo/Makefile
index 572d89f528fb0..868d8082b7714 100644
--- a/sysutils/heirloom-mkfifo/Makefile
+++ b/sysutils/heirloom-mkfifo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:04:32 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:18 cheusov Exp $
 
 PKGNAME=	heirloom-mkfifo-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build mkfifo"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-mknod/Makefile b/sysutils/heirloom-mknod/Makefile
index 91e8710d6e232..82a61438e0b31 100644
--- a/sysutils/heirloom-mknod/Makefile
+++ b/sysutils/heirloom-mknod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:03:38 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-mknod-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-nice/Makefile b/sysutils/heirloom-nice/Makefile
index 7ff1a7304aaf0..5fd771410e799 100644
--- a/sysutils/heirloom-nice/Makefile
+++ b/sysutils/heirloom-nice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:02:50 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-nice-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build nice"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-nohup/Makefile b/sysutils/heirloom-nohup/Makefile
index 088ff0a256c85..478b7795449c1 100644
--- a/sysutils/heirloom-nohup/Makefile
+++ b/sysutils/heirloom-nohup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:01:53 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-nohup-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build nohup"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-pathchk/Makefile b/sysutils/heirloom-pathchk/Makefile
index 7bd8eb3f24a5f..43ec992567170 100644
--- a/sysutils/heirloom-pathchk/Makefile
+++ b/sysutils/heirloom-pathchk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 00:00:29 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-pathchk-${HEIRLOOM_VER}
 CATEGORIES=	sysutils misc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build pathchk"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-pgrep/Makefile b/sysutils/heirloom-pgrep/Makefile
index 5e9317f8e16b4..2acda1a628b8a 100644
--- a/sysutils/heirloom-pgrep/Makefile
+++ b/sysutils/heirloom-pgrep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:59:38 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-pgrep-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -10,7 +10,7 @@ NEED_LIBKVM=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/sysutils/heirloom-priocntl/Makefile b/sysutils/heirloom-priocntl/Makefile
index a5972e2523799..638a197049c4e 100644
--- a/sysutils/heirloom-priocntl/Makefile
+++ b/sysutils/heirloom-priocntl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:57:07 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-priocntl-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -10,7 +10,7 @@ MAKE_FLAGS+=		SUBDIRS="build priocntl"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-ps/Makefile b/sysutils/heirloom-ps/Makefile
index 98ea634727a95..5dcc091eb290b 100644
--- a/sysutils/heirloom-ps/Makefile
+++ b/sysutils/heirloom-ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:53:55 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-ps-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -9,7 +9,7 @@ NEED_LIBKVM=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-psrinfo/Makefile b/sysutils/heirloom-psrinfo/Makefile
index e772ab86fa0c0..0dc53cb7e0cba 100644
--- a/sysutils/heirloom-psrinfo/Makefile
+++ b/sysutils/heirloom-psrinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:52:03 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-psrinfo-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ MAKE_FLAGS+=	SUBDIRS="build psrinfo"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-pwd/Makefile b/sysutils/heirloom-pwd/Makefile
index b76b8636f8043..05da49cdb444f 100644
--- a/sysutils/heirloom-pwd/Makefile
+++ b/sysutils/heirloom-pwd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:50:55 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-pwd-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build pwd"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-renice/Makefile b/sysutils/heirloom-renice/Makefile
index 32545900f5ef9..c09b3050f6474 100644
--- a/sysutils/heirloom-renice/Makefile
+++ b/sysutils/heirloom-renice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:50:11 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:19 cheusov Exp $
 
 PKGNAME=	heirloom-renice-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build renice"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-rm/Makefile b/sysutils/heirloom-rm/Makefile
index fac796c682e3a..62201bc0b4aab 100644
--- a/sysutils/heirloom-rm/Makefile
+++ b/sysutils/heirloom-rm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:48:58 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-rm-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-rmdir/Makefile b/sysutils/heirloom-rmdir/Makefile
index 3f1e7c7de3634..0df67d70b3b7b 100644
--- a/sysutils/heirloom-rmdir/Makefile
+++ b/sysutils/heirloom-rmdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:47:06 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-rmdir-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build rmdir"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-setpgrp/Makefile b/sysutils/heirloom-setpgrp/Makefile
index 8b050f6f128e1..a4d9e8fb1e3df 100644
--- a/sysutils/heirloom-setpgrp/Makefile
+++ b/sysutils/heirloom-setpgrp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:45:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-setpgrp-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-sort/Makefile b/sysutils/heirloom-sort/Makefile
index f7e63c4ff0d4b..5079d326cbfb0 100644
--- a/sysutils/heirloom-sort/Makefile
+++ b/sysutils/heirloom-sort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:44:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-sort-${HEIRLOOM_VER}
 CATEGORIES=	sysutils misc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build sort"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-split/Makefile b/sysutils/heirloom-split/Makefile
index 75e7a3c1a8fb5..fcf7dcac35e2f 100644
--- a/sysutils/heirloom-split/Makefile
+++ b/sysutils/heirloom-split/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:43:12 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-split-${HEIRLOOM_VER}
 CATEGORIES=	misc sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build split"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-stty/Makefile b/sysutils/heirloom-stty/Makefile
index b67f0db579636..5c22f8c433634 100644
--- a/sysutils/heirloom-stty/Makefile
+++ b/sysutils/heirloom-stty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:41:54 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-stty-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-sync/Makefile b/sysutils/heirloom-sync/Makefile
index 1652b8380ca49..4c151ce59b8fb 100644
--- a/sysutils/heirloom-sync/Makefile
+++ b/sysutils/heirloom-sync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:40:40 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:20 cheusov Exp $
 
 PKGNAME=	heirloom-sync-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-tapecntl/Makefile b/sysutils/heirloom-tapecntl/Makefile
index bf10c90b9f13b..b93821f55de9b 100644
--- a/sysutils/heirloom-tapecntl/Makefile
+++ b/sysutils/heirloom-tapecntl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:39:41 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-tapecntl-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-tee/Makefile b/sysutils/heirloom-tee/Makefile
index a53738c0aecfd..4d6a66ac5e1dc 100644
--- a/sysutils/heirloom-tee/Makefile
+++ b/sysutils/heirloom-tee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:38:07 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-tee-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build tee"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-touch/Makefile b/sysutils/heirloom-touch/Makefile
index 77e5044ea0941..62c2637ab8ca0 100644
--- a/sysutils/heirloom-touch/Makefile
+++ b/sysutils/heirloom-touch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:37:20 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-touch-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build touch"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-tsort/Makefile b/sysutils/heirloom-tsort/Makefile
index 8b38558fbcbbc..f8667918ff812 100644
--- a/sysutils/heirloom-tsort/Makefile
+++ b/sysutils/heirloom-tsort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:36:12 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-tsort-${HEIRLOOM_VER}
 CATEGORIES=	sysutils misc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build tsort"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-tty/Makefile b/sysutils/heirloom-tty/Makefile
index 542c197f0e340..6e4bbd1f88b6a 100644
--- a/sysutils/heirloom-tty/Makefile
+++ b/sysutils/heirloom-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:33:04 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-tty-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build tty"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-uname/Makefile b/sysutils/heirloom-uname/Makefile
index 667dd16a52b81..25bd58e544452 100644
--- a/sysutils/heirloom-uname/Makefile
+++ b/sysutils/heirloom-uname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:32:13 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-uname-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-users/Makefile b/sysutils/heirloom-users/Makefile
index c532c3e3d1ba0..94e4fe1b6f487 100644
--- a/sysutils/heirloom-users/Makefile
+++ b/sysutils/heirloom-users/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:30:56 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-users-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-who/Makefile b/sysutils/heirloom-who/Makefile
index 08258241a43a0..67636b9cfb0d9 100644
--- a/sysutils/heirloom-who/Makefile
+++ b/sysutils/heirloom-who/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:29:24 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-who-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-whoami/Makefile b/sysutils/heirloom-whoami/Makefile
index 548014fa6fb07..f8e0a7c9df3e4 100644
--- a/sysutils/heirloom-whoami/Makefile
+++ b/sysutils/heirloom-whoami/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:28:35 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-whoami-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build whoami"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-whodo/Makefile b/sysutils/heirloom-whodo/Makefile
index a454bdfa8d258..95dc26b526244 100644
--- a/sysutils/heirloom-whodo/Makefile
+++ b/sysutils/heirloom-whodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:26:21 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-whodo-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ NEED_LIBKVM=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-xargs/Makefile b/sysutils/heirloom-xargs/Makefile
index 6758ee49bc0a3..a434f82aacdf9 100644
--- a/sysutils/heirloom-xargs/Makefile
+++ b/sysutils/heirloom-xargs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:21:26 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:21 cheusov Exp $
 
 PKGNAME=	heirloom-xargs-${HEIRLOOM_VER}
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build xargs"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/heirloom-yes/Makefile b/sysutils/heirloom-yes/Makefile
index 54b5637105008..f5eb6113ffd1f 100644
--- a/sysutils/heirloom-yes/Makefile
+++ b/sysutils/heirloom-yes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/27 23:16:26 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-yes-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build yes"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-bdiff/Makefile b/textproc/heirloom-bdiff/Makefile
index 4b9dfefa15d60..ab5af0bc2773a 100644
--- a/textproc/heirloom-bdiff/Makefile
+++ b/textproc/heirloom-bdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:11:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-bdiff-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build bdiff"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-bfs/Makefile b/textproc/heirloom-bfs/Makefile
index c3cb2bfe33f1e..5bca26f00c987 100644
--- a/textproc/heirloom-bfs/Makefile
+++ b/textproc/heirloom-bfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:12:07 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-bfs-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build bfs"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-col/Makefile b/textproc/heirloom-col/Makefile
index ad044b81ce9f0..65f307107504a 100644
--- a/textproc/heirloom-col/Makefile
+++ b/textproc/heirloom-col/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:12:31 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-col-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build col"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-comm/Makefile b/textproc/heirloom-comm/Makefile
index f87efb7b9d06c..2e29efc49b11e 100644
--- a/textproc/heirloom-comm/Makefile
+++ b/textproc/heirloom-comm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:12:51 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-comm-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build comm"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-cut/Makefile b/textproc/heirloom-cut/Makefile
index f1f376bd0d4e7..c31812271845a 100644
--- a/textproc/heirloom-cut/Makefile
+++ b/textproc/heirloom-cut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:13:10 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-cut-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build cut"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-diff3/Makefile b/textproc/heirloom-diff3/Makefile
index ff20b99477c51..44dcd821a4760 100644
--- a/textproc/heirloom-diff3/Makefile
+++ b/textproc/heirloom-diff3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:13:30 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-diff3-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build diff3"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-ed/Makefile b/textproc/heirloom-ed/Makefile
index 9abf59a39c36d..e30cd36ff8bf8 100644
--- a/textproc/heirloom-ed/Makefile
+++ b/textproc/heirloom-ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:13:49 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-ed-${HEIRLOOM_VER}
 CATEGORIES=	textproc editors
@@ -10,7 +10,7 @@ NEED_LIBUXRE=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/textproc/heirloom-fmt/Makefile b/textproc/heirloom-fmt/Makefile
index 4f4df3b841f9f..771fcd37c1638 100644
--- a/textproc/heirloom-fmt/Makefile
+++ b/textproc/heirloom-fmt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:14:08 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-fmt-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build fmt"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-fold/Makefile b/textproc/heirloom-fold/Makefile
index 1e2ca167f9c11..26b5aedcaef76 100644
--- a/textproc/heirloom-fold/Makefile
+++ b/textproc/heirloom-fold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:14:28 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:22 cheusov Exp $
 
 PKGNAME=	heirloom-fold-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build fold"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-grep/Makefile b/textproc/heirloom-grep/Makefile
index 4d0cb1c1e6713..18509bedae27d 100644
--- a/textproc/heirloom-grep/Makefile
+++ b/textproc/heirloom-grep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:14:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-grep-${HEIRLOOM_VER}
 CATEGORIES=	textproc sysutils
@@ -9,7 +9,7 @@ NEED_LIBUXRE=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/textproc/heirloom-head/Makefile b/textproc/heirloom-head/Makefile
index 4ba06db3d9a68..c53989cafa272 100644
--- a/textproc/heirloom-head/Makefile
+++ b/textproc/heirloom-head/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:15:12 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-head-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build head"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-join/Makefile b/textproc/heirloom-join/Makefile
index 4fe11cf14ad90..5b07e6259db46 100644
--- a/textproc/heirloom-join/Makefile
+++ b/textproc/heirloom-join/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:15:31 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-join-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build join"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-line/Makefile b/textproc/heirloom-line/Makefile
index 94b40662c6732..e37564597de47 100644
--- a/textproc/heirloom-line/Makefile
+++ b/textproc/heirloom-line/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:15:50 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-line-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build line"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-nl/Makefile b/textproc/heirloom-nl/Makefile
index 9c8f5bd76e73c..48e08ee4fc29f 100644
--- a/textproc/heirloom-nl/Makefile
+++ b/textproc/heirloom-nl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:16:09 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-nl-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -9,7 +9,7 @@ NEED_LIBUXRE=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/textproc/heirloom-paste/Makefile b/textproc/heirloom-paste/Makefile
index fbde9c19431a3..9595e56bda40e 100644
--- a/textproc/heirloom-paste/Makefile
+++ b/textproc/heirloom-paste/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:16:28 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-paste-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build paste"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-pg/Makefile b/textproc/heirloom-pg/Makefile
index 5a44436380e28..4287aeec84584 100644
--- a/textproc/heirloom-pg/Makefile
+++ b/textproc/heirloom-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:16:47 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-pg-${HEIRLOOM_VER}
 CATEGORIES=	textproc print
@@ -10,7 +10,7 @@ NEED_LIBCURSES=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/textproc/heirloom-pr/Makefile b/textproc/heirloom-pr/Makefile
index 69a95f48769f0..cb1ca032ec673 100644
--- a/textproc/heirloom-pr/Makefile
+++ b/textproc/heirloom-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:17:06 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-pr-${HEIRLOOM_VER}
 CATEGORIES=	textproc print
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build pr"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-sdiff/Makefile b/textproc/heirloom-sdiff/Makefile
index da2cfa60a027b..bcba274171494 100644
--- a/textproc/heirloom-sdiff/Makefile
+++ b/textproc/heirloom-sdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:17:25 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-sdiff-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build sdiff"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-sed/Makefile b/textproc/heirloom-sed/Makefile
index 1bfe88fc9082f..fa3bd67f9c256 100644
--- a/textproc/heirloom-sed/Makefile
+++ b/textproc/heirloom-sed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:17:44 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:23 cheusov Exp $
 
 PKGNAME=	heirloom-sed-${HEIRLOOM_VER}
 CATEGORIES=	textproc lang
@@ -10,7 +10,7 @@ NEED_LIBUXRE=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../devel/libuxre/buildlink3.mk"
diff --git a/textproc/heirloom-tail/Makefile b/textproc/heirloom-tail/Makefile
index c7f448a9f8c97..070193efde017 100644
--- a/textproc/heirloom-tail/Makefile
+++ b/textproc/heirloom-tail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:18:03 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:24 cheusov Exp $
 
 PKGNAME=	heirloom-tail-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build tail"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-tr/Makefile b/textproc/heirloom-tr/Makefile
index 04ce961949f6d..8f6c96974cd3c 100644
--- a/textproc/heirloom-tr/Makefile
+++ b/textproc/heirloom-tr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:18:23 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:24 cheusov Exp $
 
 PKGNAME=	heirloom-tr-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build tr"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-ul/Makefile b/textproc/heirloom-ul/Makefile
index a736dc210b81c..b3b5873993c62 100644
--- a/textproc/heirloom-ul/Makefile
+++ b/textproc/heirloom-ul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:18:50 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:24 cheusov Exp $
 
 PKGNAME=	heirloom-ul-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -10,7 +10,7 @@ NEED_LIBCURSES=	1
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
diff --git a/textproc/heirloom-uniq/Makefile b/textproc/heirloom-uniq/Makefile
index 5d0c6252ae13b..2bcadfc2d4269 100644
--- a/textproc/heirloom-uniq/Makefile
+++ b/textproc/heirloom-uniq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:19:10 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:24 cheusov Exp $
 
 PKGNAME=	heirloom-uniq-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -8,7 +8,7 @@ MAKE_FLAGS+=	SUBDIRS="build uniq"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/heirloom-wc/Makefile b/textproc/heirloom-wc/Makefile
index a86077f0d014a..25623fbfbc8b4 100644
--- a/textproc/heirloom-wc/Makefile
+++ b/textproc/heirloom-wc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:19:29 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:24 cheusov Exp $
 
 PKGNAME=	heirloom-wc-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -7,7 +7,7 @@ MAKE_FLAGS+=	SUBDIRS="build wc"
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/heirloom-date/Makefile b/time/heirloom-date/Makefile
index 0ebd1109c790e..5a259dd903fa3 100644
--- a/time/heirloom-date/Makefile
+++ b/time/heirloom-date/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/28 08:22:22 cheusov Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/28 10:15:24 cheusov Exp $
 
 PKGNAME=	heirloom-date-${HEIRLOOM_VER}
 CATEGORIES=	textproc
@@ -9,7 +9,7 @@ NOT_FOR_PLATFORM+=	Interix-*-*
 
 .include "../../sysutils/heirloom-doc/Makefile.common"
 
-DESCR_SRC+=	DESCR
+DESCR_SRC+=	${.CURDIR}/DESCR
 
 .include "../../devel/heirloom-libcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"