From owner-svn-ports-all@FreeBSD.ORG Fri Feb 21 01:55:21 2014 Return-Path: Delivered-To: svn-ports-all@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 89AC3A7; Fri, 21 Feb 2014 01:55:21 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 69FD21B99; Fri, 21 Feb 2014 01:55:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1L1tL55072877; Fri, 21 Feb 2014 01:55:21 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1L1tLgk072875; Fri, 21 Feb 2014 01:55:21 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402210155.s1L1tLgk072875@svn.freebsd.org> From: Martin Wilke Date: Fri, 21 Feb 2014 01:55:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345292 - head/emulators/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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2014 01:55:21 -0000 Author: miwi Date: Fri Feb 21 01:55:20 2014 New Revision: 345292 URL: http://svnweb.freebsd.org/changeset/ports/345292 QAT: https://qat.redports.org/buildarchive/r345292/ Log: - Stage support Modified: head/emulators/mtools/Makefile head/emulators/mtools/pkg-plist Modified: head/emulators/mtools/Makefile ============================================================================== --- head/emulators/mtools/Makefile Fri Feb 21 01:55:10 2014 (r345291) +++ head/emulators/mtools/Makefile Fri Feb 21 01:55:20 2014 (r345292) @@ -21,18 +21,11 @@ CONFIGURE_ARGS= --enable-xdf SUB_FILES= pkg-message -MAN1= mattrib.1 mbadblocks.1 mcat.1 mcd.1 mclasserase.1 mcopy.1 \ - mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 mkmanifest.1 \ - minfo.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \ - mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 \ - mzip.1 -MAN5= mtools.5 INFO= mtools OPTIONS_DEFINE= ICONV X11 OPTIONS_DEFAULT=ICONV X11 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MICONV} @@ -46,7 +39,6 @@ CONFIGURE_ENV+= ac_cv_header_iconv_h=no .if ${PORT_OPTIONS:MX11} USE_XORG= x11 sm ice xau PLIST_SUB= X11="" -MAN1+= floppyd.1 floppyd_installtest.1 .else CONFIGURE_ARGS+= --without-x PLIST_SUB= X11="@comment " @@ -65,10 +57,9 @@ post-patch: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc/mtools.conf.sample - @if [ ! -f ${PREFIX}/etc/mtools.conf ]; then \ - cd ${PREFIX}/etc && ${CP} -p mtools.conf.sample mtools.conf; \ + ${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc/mtools.conf.sample + @if [ ! -f ${STAGEDIR}${PREFIX}/etc/mtools.conf ]; then \ + cd ${STAGEDIR}${PREFIX}/etc && ${CP} -p mtools.conf.sample mtools.conf; \ fi - @${CAT} ${PKGMESSAGE} .include Modified: head/emulators/mtools/pkg-plist ============================================================================== --- head/emulators/mtools/pkg-plist Fri Feb 21 01:55:10 2014 (r345291) +++ head/emulators/mtools/pkg-plist Fri Feb 21 01:55:20 2014 (r345292) @@ -29,6 +29,34 @@ bin/mtoolstest bin/mtype bin/mxtar bin/mzip +man/man1/floppyd.1.gz +man/man1/floppyd_installtest.1.gz +man/man1/mattrib.1.gz +man/man1/mbadblocks.1.gz +man/man1/mcat.1.gz +man/man1/mcd.1.gz +man/man1/mclasserase.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/minfo.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/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/mzip.1.gz +man/man5/mtools.5.gz @unexec if cmp -s %D/etc/mtools.conf %D/etc/mtools.conf.sample; then rm -f %D/etc/mtools.conf; fi etc/mtools.conf.sample @exec if [ ! -f %D/etc/mtools.conf ]; then cp %B/%f %D/etc/mtools.conf; fi