From owner-svn-ports-head@FreeBSD.ORG Wed Jun 18 12:10:23 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 21D92A90; Wed, 18 Jun 2014 12:10:23 +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 040DE2992; Wed, 18 Jun 2014 12:10:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5ICAMO4018676; Wed, 18 Jun 2014 12:10:22 GMT (envelope-from sanpei@svn.freebsd.org) Received: (from sanpei@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5ICAMhP018673; Wed, 18 Jun 2014 12:10:22 GMT (envelope-from sanpei@svn.freebsd.org) Message-Id: <201406181210.s5ICAMhP018673@svn.freebsd.org> From: MIHIRA Sanpei Yoshiro Date: Wed, 18 Jun 2014 12:10:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358245 - head/sysutils/cdrdao 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: Wed, 18 Jun 2014 12:10:23 -0000 Author: sanpei Date: Wed Jun 18 12:10:22 2014 New Revision: 358245 URL: http://svnweb.freebsd.org/changeset/ports/358245 QAT: https://qat.redports.org/buildarchive/r358245/ Log: support stage. Modified: head/sysutils/cdrdao/Makefile head/sysutils/cdrdao/pkg-plist Modified: head/sysutils/cdrdao/Makefile ============================================================================== --- head/sysutils/cdrdao/Makefile Wed Jun 18 12:09:46 2014 (r358244) +++ head/sysutils/cdrdao/Makefile Wed Jun 18 12:10:22 2014 (r358245) @@ -28,10 +28,8 @@ LIB_DEPENDS+= ${MP3OGG_LIB_DEPENDS} \ gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26 RUN_DEPENDS+= ${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \ ${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info -MAN1= gcdmaster.1 CONFIGURE_ARGS+= --with-lame=no .else -MAN1= cdrdao.1 cue2toc.1 toc2cddb.1 toc2cue.1 CONFIGURE_ARGS+= --with-xdao=no .if defined(WITH_TOC2MP3) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame @@ -61,7 +59,6 @@ CONFIGURE_ARGS+= --without-pcctsbin --wi MAKE_ENV= CCOM=cc LANG=C SCSILIBTARGET= ${ARCH:S/powerpc64/powerpc/}-freebsd-cc -NO_STAGE= yes .include pre-everything:: @@ -121,46 +118,46 @@ post-patch: do-install: .if ${PORTNAME} == "gcdmaster" - @${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/xdao/gcdmaster ${STAGEDIR}${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/xdao/gcdmaster.man \ - ${PREFIX}/man/man1/gcdmaster.1 + ${STAGEDIR}${PREFIX}/man/man1/gcdmaster.1 @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster-doc.png \ - ${LOCALBASE}/share/pixmaps/document-icons + ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.applications \ - ${LOCALBASE}/share/application-registry + ${STAGEDIR}${LOCALBASE}/share/application-registry @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.desktop \ - ${LOCALBASE}/share/applications + ${STAGEDIR}${LOCALBASE}/share/applications @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.keys \ - ${LOCALBASE}/share/mime-info + ${STAGEDIR}${LOCALBASE}/share/mime-info @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.mime \ - ${LOCALBASE}/share/mime-info + ${STAGEDIR}${LOCALBASE}/share/mime-info @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.png \ - ${LOCALBASE}/share/pixmaps + ${STAGEDIR}${LOCALBASE}/share/pixmaps @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.schemas \ - ${LOCALBASE}/etc/gconf/schemas + ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas @${INSTALL_DATA} ${WRKSRC}/xdao/gcdmaster.xml \ - ${LOCALBASE}/share/mime/packages - @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${DATADIR} + ${STAGEDIR}${LOCALBASE}/share/mime/packages + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/xdao/glade/Preferences.glade ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/xdao/glade/ProjectChooser.glade ${STAGEDIR}${DATADIR} .else - @${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${PREFIX}/man/man1/cdrdao.1 - @${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${PREFIX}/man/man1 - @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${PREFIX}/man/man1 - @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${PREFIX}/man/man1 - @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${DATADIR}/drivers + @${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man ${STAGEDIR}${PREFIX}/man/man1/cdrdao.1 + @${INSTALL_PROGRAM} ${WRKSRC}/utils/cue2toc ${STAGEDIR}${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/utils/cue2toc.1 ${STAGEDIR}${PREFIX}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cddb ${STAGEDIR}${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/utils/toc2cddb.1 ${STAGEDIR}${PREFIX}/man/man1 + @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2cue ${STAGEDIR}${PREFIX}/bin + @${INSTALL_MAN} ${WRKSRC}/utils/toc2cue.1 ${STAGEDIR}${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/dao/cdrdao.drivers ${STAGEDIR}${DATADIR}/drivers .if defined(WITH_TOC2MP3) - @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/utils/toc2mp3 ${STAGEDIR}{PREFIX}/bin .endif .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in CREDITS ChangeLog README README.PlexDAE - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif .endif Modified: head/sysutils/cdrdao/pkg-plist ============================================================================== --- head/sysutils/cdrdao/pkg-plist Wed Jun 18 12:09:46 2014 (r358244) +++ head/sysutils/cdrdao/pkg-plist Wed Jun 18 12:10:22 2014 (r358245) @@ -4,10 +4,14 @@ bin/toc2cddb bin/toc2cue %%TOC2MP3%%bin/toc2mp3 @unexec if [ -f %D/etc/cdrdao.conf ]; then echo "If permanently deleting this package, %D/etc/cdrdao.conf must be removed manually."; fi +man/man1/cdrdao.1.gz +man/man1/cue2toc.1.gz +man/man1/toc2cddb.1.gz +man/man1/toc2cue.1.gz %%DATADIR%%/drivers -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/CREDITS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.PlexDAE -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%