Index: head/japanese/another-htmllint/Makefile
===================================================================
--- head/japanese/another-htmllint/Makefile	(revision 491933)
+++ head/japanese/another-htmllint/Makefile	(revision 491934)
@@ -1,59 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	another-htmllint
 PORTVERSION=	20111128
 PORTREVISION=	2
 CATEGORIES=	japanese www
 MASTER_SITES=	http://openlab.ring.gr.jp/k16/htmllint/archives/
 DISTNAME=	htmllint
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Another HTML-lint (all messages are written in Japanese)
 
 LICENSE=	AnotherHTMLlint
 LICENSE_NAME=	Another HTML-lint License
 LICENSE_TEXT=	See http://openlab.ring.gr.jp/k16/htmllint/index.html (Written in Japanese)
 LICENSE_PERMS=	no-dist-sell no-pkg-sell
 
 RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
 		p5-libwww>=0:www/p5-libwww \
 		ja-p5-Jcode>=0:japanese/p5-Jcode
 
 USES=		dos2unix perl5 shebangfix zip
-WRKSRC=		${WRKDIR}
 DOS2UNIX_FILES=	readme.txt
 SHEBANG_FILES=	htmllint.cgi tagslist.cgi
+
+NO_ARCH=	yes
+NO_WRKSUBDIR=	yes
 SUB_FILES=	htmllint pkg-message
-SUB_LIST+=	PERL=${PERL}
-NO_ARCH=	YES
+SUB_LIST=	PERL=${PERL}
 
 OPTIONS_DEFINE=	W3M
 W3M_DESC=	Use w3m to show rendering result
 W3M_RUN_DEPENDS=	w3m>0:www/w3m
 
 PM=		htmllint.pm RFC2396.pm htmllint.env
 RULE=		*.rul
 HTML=		*.cgi *.html *.gif *.css
 SEDSUB=		${SED} -i.bak -e 's@%%PREFIX%%@${PREFIX}@ ; s@%%DATADIR%%@${DATADIR}@'
 
 # Please set this!
 HTMLLINT_ADMIN?=	webmaster@example.com
 
 do-build:
 	@${SEDSUB} ${WRKSRC}/htmllintenv
 	@${MV} ${WRKSRC}/htmllintenv ${WRKSRC}/htmllint.env
 	@${SEDSUB} ${WRKSRC}/htmllint.cgi
 	@${SED} -i.bak -e 's|^</address>|</address><br>Maintained by <address>${HTMLLINT_ADMIN}</address>|' ${WRKSRC}/*.html
 
 do-build-W3M-on:
 	@${SED} -i.bak -e 's|^#$$W3M|$$W3M|' ${WRKSRC}/htmllint.env
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/rule ${STAGEDIR}${DATADIR}/html
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} htmllint ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${HTML} ${STAGEDIR}${DATADIR}/html
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PM} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${RULE} ${STAGEDIR}${DATADIR}/rule
 
 .include <bsd.port.mk>
Index: head/japanese/p5-PDFJ/Makefile
===================================================================
--- head/japanese/p5-PDFJ/Makefile	(revision 491933)
+++ head/japanese/p5-PDFJ/Makefile	(revision 491934)
@@ -1,32 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	PDFJ
 PORTVERSION=	0.90
 PORTREVISION=	3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://hp1.jonex.ne.jp/%7Enakajima.yasushi/archives/
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	PDFJ module provides methods to generate Japanese PDF file
 
 USES=		perl5 shebangfix zip:infozip
 USE_PERL5=	configure
-WRKSRC=		${WRKDIR}
 EXTRACT_BEFORE_ARGS=	-qo -a
 SHEBANG_FILES=	util/xpdfj.pl
+
+NO_WRKSUBDIR=	yes
 
 .include <bsd.port.pre.mk>
 
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/util/xpdfj.pl ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/macro
 	${INSTALL_DATA} ${WRKSRC}/macro/*.inc ${STAGEDIR}${DATADIR}/macro
 
 .include <bsd.port.post.mk>