svn commit: r354445 - head/japanese/mtools

[Pawel Pekala]

Author: pawel
Date: Sun May 18 18:13:32 2014
New Revision: 354445
URL: http://svnweb.freebsd.org/changeset/ports/354445
QAT: https://qat.redports.org/buildarchive/r354445/

Log:
  - Add staging support
  - Convert to USES=gmake
  - Don't create links in pkg-plist with @exec, they are created
    during build
  - Unmute install commands

Modified:
  head/japanese/mtools/Makefile
  head/japanese/mtools/pkg-plist

Modified: head/japanese/mtools/Makefile
==============================================================================
--- head/japanese/mtools/Makefile	Sun May 18 17:25:18 2014	(r354444)
+++ head/japanese/mtools/Makefile	Sun May 18 18:13:32 2014	(r354445)
@@ -17,20 +17,11 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports at 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>

Modified: head/japanese/mtools/pkg-plist
==============================================================================
--- head/japanese/mtools/pkg-plist	Sun May 18 17:25:18 2014	(r354444)
+++ head/japanese/mtools/pkg-plist	Sun May 18 18:13:32 2014	(r354445)
@@ -1,56 +1,56 @@
-bin/mtools
- at exec ln -fs %D/%F %B/mattrib
- at exec ln -fs %D/%F %B/mbadblocks
- at exec ln -fs %D/%F %B/mcat
- at exec ln -fs %D/%F %B/mcd
- at exec ln -fs %D/%F %B/mcopy
- at exec ln -fs %D/%F %B/mdel
- at exec ln -fs %D/%F %B/mdeltree
- at exec ln -fs %D/%F %B/mdir
- at exec ln -fs %D/%F %B/mdu
- at exec ln -fs %D/%F %B/mformat
- at exec ln -fs %D/%F %B/minfo
- at exec ln -fs %D/%F %B/mlabel
- at exec ln -fs %D/%F %B/mmd
- at exec ln -fs %D/%F %B/mmount
- at exec ln -fs %D/%F %B/mmove
- at exec ln -fs %D/%F %B/mpartition
- at exec ln -fs %D/%F %B/mrd
- at exec ln -fs %D/%F %B/mread
- at exec ln -fs %D/%F %B/mren
- at exec ln -fs %D/%F %B/mshowfat
- at exec ln -fs %D/%F %B/mtoolstest
- at exec ln -fs %D/%F %B/mtype
- at exec ln -fs %D/%F %B/mwrite
- at exec ln -fs %D/%F %B/mzip
- at unexec rm %B/mattrib
- at unexec rm %B/mbadblocks
- at unexec rm %B/mcat
- at unexec rm %B/mcd
- at unexec rm %B/mcopy
- at unexec rm %B/mdel
- at unexec rm %B/mdeltree
- at unexec rm %B/mdir
- at unexec rm %B/mdu
- at unexec rm %B/mformat
- at unexec rm %B/minfo
- at unexec rm %B/mlabel
- at unexec rm %B/mmd
- at unexec rm %B/mmount
- at unexec rm %B/mmove
- at unexec rm %B/mpartition
- at unexec rm %B/mrd
- at unexec rm %B/mread
- at unexec rm %B/mren
- at unexec rm %B/mshowfat
- at unexec rm %B/mtoolstest
- at unexec rm %B/mtype
- at unexec rm %B/mwrite
- at 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
- at comment @exec ln -fs %D/man/man1/mcopy.1.gz %D/man/man1/mwrite.1.gz
- at 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