2 files changed, 59 insertions, 63 deletions

diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index af3a61e0d70d..51b7e5ec4078 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -17,20 +17,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools for manipulating MSDOS files + support 1232KB , Unicode LFN
 
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xdf
 INFO=		mtools
 
-USE_GMAKE=	yes
-
-MAN1=		mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 \
-		mdir.1 mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 \
-		mmove.1 mpartition.1 mrd.1 mread.1 mren.1 mshowfat.1 \
-		mtoolstest.1 mtools.1 mtype.1 mzip.1
-MAN5=		mtools.5
-MLINKS=		mcopy.1 mwrite.1
-
-NO_STAGE=	yes
 post-patch:
 	@cd ${WRKSRC}; \
 	  ${GZCAT} ${DISTDIR}/mtools-3.9.6.PC98.patch.gz | ${PATCH} -d . >/dev/null 2>&1; \
@@ -41,11 +32,16 @@ post-patch:
 	@cd ${WRKSRC}/scripts; for f in ocopy xcopy; do \
 	 if [ ! -f $$f -a -f $$f.orig ]; then ${CP} -p $$f.orig $$f ; fi \
 	 done
+	@${REINPLACE_CMD} -E -e 's,MAN(1|5)DIR),DESTDIR)$$(&,' \
+		-e '/(INSTALL|LN_S|mkinstalldirs)/ s,(bin|info)dir,DESTDIR)$$(&,g' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 	@#	mwrite has been removed by author, but we'll keep it just a bit longer
-	@${LN} -sf ${PREFIX}/bin/mtools ${PREFIX}/bin/mwrite
-	@${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc
+	${LN} -sf ${PREFIX}/bin/mtools ${STAGEDIR}${PREFIX}/bin/mwrite
+	${LN} -sf ${PREFIX}/man/man1/mcopy.1.gz \
+		${STAGEDIR}${PREFIX}/man/man1/mwrite.1.gz
+	${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc
 	@${ECHO} "Please verify ${PREFIX}/etc/mtools.conf for your machine."
 
 .include <bsd.port.mk>
diff --git a/japanese/mtools/pkg-plist b/japanese/mtools/pkg-plist
index 0b6544382312..18ca0b240743 100644
--- a/japanese/mtools/pkg-plist
+++ b/japanese/mtools/pkg-plist
@@ -1,56 +1,56 @@
-bin/mtools
-@exec ln -fs %D/%F %B/mattrib
-@exec ln -fs %D/%F %B/mbadblocks
-@exec ln -fs %D/%F %B/mcat
-@exec ln -fs %D/%F %B/mcd
-@exec ln -fs %D/%F %B/mcopy
-@exec ln -fs %D/%F %B/mdel
-@exec ln -fs %D/%F %B/mdeltree
-@exec ln -fs %D/%F %B/mdir
-@exec ln -fs %D/%F %B/mdu
-@exec ln -fs %D/%F %B/mformat
-@exec ln -fs %D/%F %B/minfo
-@exec ln -fs %D/%F %B/mlabel
-@exec ln -fs %D/%F %B/mmd
-@exec ln -fs %D/%F %B/mmount
-@exec ln -fs %D/%F %B/mmove
-@exec ln -fs %D/%F %B/mpartition
-@exec ln -fs %D/%F %B/mrd
-@exec ln -fs %D/%F %B/mread
-@exec ln -fs %D/%F %B/mren
-@exec ln -fs %D/%F %B/mshowfat
-@exec ln -fs %D/%F %B/mtoolstest
-@exec ln -fs %D/%F %B/mtype
-@exec ln -fs %D/%F %B/mwrite
-@exec ln -fs %D/%F %B/mzip
-@unexec rm %B/mattrib
-@unexec rm %B/mbadblocks
-@unexec rm %B/mcat
-@unexec rm %B/mcd
-@unexec rm %B/mcopy
-@unexec rm %B/mdel
-@unexec rm %B/mdeltree
-@unexec rm %B/mdir
-@unexec rm %B/mdu
-@unexec rm %B/mformat
-@unexec rm %B/minfo
-@unexec rm %B/mlabel
-@unexec rm %B/mmd
-@unexec rm %B/mmount
-@unexec rm %B/mmove
-@unexec rm %B/mpartition
-@unexec rm %B/mrd
-@unexec rm %B/mread
-@unexec rm %B/mren
-@unexec rm %B/mshowfat
-@unexec rm %B/mtoolstest
-@unexec rm %B/mtype
-@unexec rm %B/mwrite
-@unexec rm %B/mzip
+bin/mattrib
+bin/mbadblocks
+bin/mcat
+bin/mcd
 bin/mcheck
 bin/mcomp
+bin/mcopy
+bin/mdel
+bin/mdeltree
+bin/mdir
+bin/mdu
+bin/mformat
+bin/minfo
 bin/mkmanifest
+bin/mlabel
+bin/mmd
+bin/mmount
+bin/mmove
+bin/mpartition
+bin/mrd
+bin/mread
+bin/mren
+bin/mshowfat
+bin/mtools
+bin/mtoolstest
+bin/mtype
+bin/mwrite
 bin/mxtar
+bin/mzip
 etc/mtools.conf
-@comment @exec ln -fs %D/man/man1/mcopy.1.gz %D/man/man1/mwrite.1.gz
-@comment @unexec rm %D/man/man1/mwrite.1.gz
+man/man1/mattrib.1.gz
+man/man1/mbadblocks.1.gz
+man/man1/mcat.1.gz
+man/man1/mcd.1.gz
+man/man1/mcopy.1.gz
+man/man1/mdel.1.gz
+man/man1/mdeltree.1.gz
+man/man1/mdir.1.gz
+man/man1/mdu.1.gz
+man/man1/mformat.1.gz
+man/man1/mkmanifest.1.gz
+man/man1/mlabel.1.gz
+man/man1/mmd.1.gz
+man/man1/mmount.1.gz
+man/man1/mmove.1.gz
+man/man1/mpartition.1.gz
+man/man1/mrd.1.gz
+man/man1/mread.1.gz
+man/man1/mren.1.gz
+man/man1/mshowfat.1.gz
+man/man1/mtools.1.gz
+man/man1/mtoolstest.1.gz
+man/man1/mtype.1.gz
+man/man1/mwrite.1.gz
+man/man1/mzip.1.gz
+man/man5/mtools.5.gz