From owner-svn-ports-head@FreeBSD.ORG Sun May 18 18:13:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 087E5B66; Sun, 18 May 2014 18:13:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD65B2F2F; Sun, 18 May 2014 18:13:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IIDWT0087558; Sun, 18 May 2014 18:13:32 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IIDWxs087556; Sun, 18 May 2014 18:13:32 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201405181813.s4IIDWxs087556@svn.freebsd.org> From: Pawel Pekala Date: Sun, 18 May 2014 18:13:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354445 - head/japanese/mtools X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 18:13:33 -0000 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@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 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 -@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