diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 171c4eb1e347..b6eb39ed0d09 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -25,7 +25,7 @@ LIBS+=		-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/spiralmodular-0.2.2
 
-ia64_BROKEN=	Does not compile on ia64
+BROKEN_ia64=	Does not compile on ia64
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 
diff --git a/audio/spiralsynthmodular/pkg-plist b/audio/spiralsynthmodular/pkg-plist
index aa0c3482b568..a78546b44c7c 100644
--- a/audio/spiralsynthmodular/pkg-plist
+++ b/audio/spiralsynthmodular/pkg-plist
@@ -47,4 +47,3 @@ lib/SpiralPlugins/TrigPlugin.so
 lib/SpiralPlugins/WaveShaperPlugin.so
 lib/SpiralPlugins/WaveTablePlugin.so
 lib/SpiralPlugins/XFadePlugin.so
-@dirrm lib/SpiralPlugins
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 82b33fb07375..5211dd2b276f 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-dps-includes=${LOCALBASE}/include \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-alpha_BROKEN=	Does not compile on alpha
+BROKEN_alpha=	Does not compile on alpha
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/graphics/gtkdps/pkg-plist b/graphics/gtkdps/pkg-plist
index 08262337d632..f3042e3a74d7 100644
--- a/graphics/gtkdps/pkg-plist
+++ b/graphics/gtkdps/pkg-plist
@@ -17,4 +17,3 @@ lib/libgtkDPS.so
 lib/libgtkDPS.so.1.0.0
 share/aclocal/gtkDPS.m4
 %%NLS%%share/locale/ja/LC_MESSAGES/gtkDPS.mo
-@dirrm include/gtkDPS
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index ca8d38d43d6c..7e2b64416ef4 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -12,6 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Photorealistic renderer with Pixar's RenderMan-like interface
 
 LICENSE=	LGPL21 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
@@ -40,7 +41,7 @@ CFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-sparc64_BROKEN=	Does not compile on sparc64
+BROKEN_sparc64=	Does not compile on sparc64
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/graphics/pixie/pkg-plist b/graphics/pixie/pkg-plist
index 874441981c57..5cde23bd11c3 100644
--- a/graphics/pixie/pkg-plist
+++ b/graphics/pixie/pkg-plist
@@ -82,9 +82,3 @@ man/man1/texmake.1.gz
 %%DATADIR%%/shaders/shadowspot.sl
 %%DATADIR%%/shaders/spotlight.sdr
 %%DATADIR%%/shaders/spotlight.sl
-@dirrm %%DATADIR%%/shaders
-@dirrm %%DATADIR%%
-@dirrm lib/pixie/modules
-@dirrm lib/pixie/displays
-@dirrm lib/pixie
-@dirrm include/pixie
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index 6b12be95777d..0c55e21c7d4b 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	\
 		ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \
 		ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/ \
 		ftp://ftp.monash.edu.au/pub/nihongo/
-EXTRACT_SUFX=
+EXTRACT_SUFX=	# empty
 DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
 EXTRACT_ONLY=	${SRCFILES}
 
@@ -47,7 +47,7 @@ DOCSDIR=	${PREFIX}/share/doc/xjdic
 
 NO_WRKSUBDIR=	yes
 
-sparc64_BROKEN=	Fails on sparc64 during installation with error 2
+BROKEN_sparc64=	Fails on sparc64 during installation with error 2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/japanese/edict/pkg-plist b/japanese/edict/pkg-plist
index 3b1f18edab16..4e3a54f3fe01 100644
--- a/japanese/edict/pkg-plist
+++ b/japanese/edict/pkg-plist
@@ -45,7 +45,6 @@ man/man1/xjdic.1.gz
 %%DATADIR%%/romkana.cnv
 %%DATADIR%%/vconj
 %%DATADIR%%/.xjdicrc
-@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/4jword3_inf.txt
 %%PORTDOCS%%%%DOCSDIR%%/aviation.txt
 %%PORTDOCS%%%%DOCSDIR%%/concrete.doc
@@ -63,4 +62,3 @@ man/man1/xjdic.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/lingdic.txt
 %%PORTDOCS%%%%DOCSDIR%%/mktdic.doc
 %%PORTDOCS%%%%DOCSDIR%%/xjdic23.inf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile
index 8e3e2ac30445..6ea9362eaec5 100644
--- a/japanese/vftool/Makefile
+++ b/japanese/vftool/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	1.2
 PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	kiri
+		LOCAL/kiri
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		plib13-euc.tar.gz \
 		jtex-1.52.tar.gz
@@ -27,7 +26,7 @@ FONTSDIR=	${PREFIX}/share/fonts
 JFMDIR=		${WRKDIR}/share/texmf/fonts/tfm/ptex
 TARGETDIRS=	vf-n2a vf-a2n vf-a2bk vf-p2pn
 
-ia64_BROKEN=	Coredump during build on ia64
+BROKEN_ia64=	Coredump during build on ia64
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/japanese/vftool/pkg-plist b/japanese/vftool/pkg-plist
index 76c4418fcd63..65286660caac 100644
--- a/japanese/vftool/pkg-plist
+++ b/japanese/vftool/pkg-plist
@@ -655,8 +655,3 @@ share/fonts/vf-p2pn/tmin6.vf
 share/fonts/vf-p2pn/tmin7.vf
 share/fonts/vf-p2pn/tmin8.vf
 share/fonts/vf-p2pn/tmin9.vf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/fonts/vf-a2bk
-@dirrm share/fonts/vf-a2n
-@dirrm share/fonts/vf-n2a
-@dirrm share/fonts/vf-p2pn