2 files changed, 17 insertions, 19 deletions

diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 6c14d4ee501f..edc67c4d83ae 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afterstep-i18n
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP:S/$/:afterstep/} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -49,10 +49,8 @@ pre-patch:
 post-patch:
 	@ ${CP} ${WRKSRC}/sample.steprc ${WRKSRC}/sample.steprc.ja_JP.EUC
 	@ ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/steprc.ja.diff
-	@ for i in ${SRCDIRS}; do \
-		cd ${WRKSRC}/$$i; \
-		${MV} Imakefile Imakefile.orig; \
-		${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig  >  Imakefile; \
+	for i in ${SRCDIRS}; do \
+		${REINPLACE_CMD} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' ${WRKSRC}/$${i}/Imakefile ; \
 	done
 
 pre-build:
@@ -72,12 +70,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.steprc.ja_JP.EUC ${AFTERSTEPDIR}/system.steprc.ja_JP.EUC
 
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/afterstep
+	@ ${MKDIR} ${DOCSDIR}
 .for i in CHANGES CREDITS README README.8bit INSTALL FAQ module-interface.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/afterstep
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .for i in CHANGES.I18N README.I18N README.I18N.jis
-	${INSTALL_DATA} ${WRKDIR}/$i ${PREFIX}/share/doc/afterstep
+	${INSTALL_DATA} ${WRKDIR}/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/x11-wm/afterstep-i18n/pkg-plist b/x11-wm/afterstep-i18n/pkg-plist
index 1b9970f9de8e..e5433116b3b1 100644
--- a/x11-wm/afterstep-i18n/pkg-plist
+++ b/x11-wm/afterstep-i18n/pkg-plist
@@ -55,15 +55,15 @@ include/X11/pixmaps/ja-netscape4.xpm
 @dirrm lib/X11/afterstep/backgrounds
 @dirrm lib/X11/afterstep/sounds
 @dirrm lib/X11/afterstep
-share/doc/afterstep/CHANGES
-share/doc/afterstep/CREDITS
-share/doc/afterstep/README
-share/doc/afterstep/README.8bit
-share/doc/afterstep/FAQ
-share/doc/afterstep/INSTALL
-share/doc/afterstep/module-interface.txt
-share/doc/afterstep/CHANGES.I18N
-share/doc/afterstep/README.I18N
-share/doc/afterstep/README.I18N.jis
-@dirrm share/doc/afterstep
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.8bit
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/module-interface.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.I18N
+%%PORTDOCS%%%%DOCSDIR%%/README.I18N
+%%PORTDOCS%%%%DOCSDIR%%/README.I18N.jis
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry include/X11/pixmaps