[pkgsrc/trunk]: pkgsrc/sysutils/cdrdao untangle cdrdao and gcdmaster so that ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db7fbc985a93
branches:  trunk
changeset: 497041:db7fbc985a93
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Jul 19 16:33:57 2005 +0000

description:
untangle cdrdao and gcdmaster so that PKGREVISIONs can be set
individually, and avoid unnecessary tricks with the PLIST location

diffstat:

 sysutils/cdrdao/Makefile        |   9 ++-----
 sysutils/cdrdao/Makefile.common |   8 +++++-
 sysutils/cdrdao/PLIST           |  42 +++++++++++++++++++++++++++++++++++++++++
 sysutils/cdrdao/PLIST.cdrdao    |  42 -----------------------------------------
 sysutils/cdrdao/PLIST.gcdmaster |   5 ----
 5 files changed, 51 insertions(+), 55 deletions(-)

diffs (148 lines):

diff -r f0d12e79365d -r db7fbc985a93 sysutils/cdrdao/Makefile
--- a/sysutils/cdrdao/Makefile  Tue Jul 19 16:27:56 2005 +0000
+++ b/sysutils/cdrdao/Makefile  Tue Jul 19 16:33:57 2005 +0000
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2005/06/04 19:05:38 adrianp Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/19 16:33:57 drochner Exp $
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
+PKGREVISION=           2
+
 PKGNAME=               cdrdao-${CDRDAO_VER}
 
 COMMENT=               Records audio or data CD-Rs in disk-at-once (DAO) mode
 
-PKGDIR=                        ${.CURDIR}/../../sysutils/cdrdao
-FILESDIR=              ${PKGDIR}/files
-PATCHDIR=              ${PKGDIR}/patches
-DISTINFO_FILE=         ${PKGDIR}/distinfo
-PLIST_SRC=             ${PKGDIR}/PLIST.cdrdao
 CONFIGURE_ARGS+=       --without-xdao
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
diff -r f0d12e79365d -r db7fbc985a93 sysutils/cdrdao/Makefile.common
--- a/sysutils/cdrdao/Makefile.common   Tue Jul 19 16:27:56 2005 +0000
+++ b/sysutils/cdrdao/Makefile.common   Tue Jul 19 16:33:57 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2005/06/15 21:45:13 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/07/19 16:33:57 drochner Exp $
 
 DISTNAME=              cdrdao-${CDRDAO_VER}
-PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
@@ -9,6 +8,11 @@
 HOMEPAGE=              http://cdrdao.sourceforge.net/
 COMMENT=               Records audio or data CD-Rs in disk-at-once (DAO) mode
 
+CDRDAODIR=             ${.CURDIR}/../../sysutils/cdrdao
+FILESDIR=              ${CDRDAODIR}/files
+PATCHDIR=              ${CDRDAODIR}/patches
+DISTINFO_FILE=         ${CDRDAODIR}/distinfo
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 CDRDAO_VER=            1.2.0
diff -r f0d12e79365d -r db7fbc985a93 sysutils/cdrdao/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/cdrdao/PLIST     Tue Jul 19 16:33:57 2005 +0000
@@ -0,0 +1,42 @@
+@comment $NetBSD: PLIST,v 1.6 2005/07/19 16:33:57 drochner Exp $
+bin/cdrdao
+bin/cue2toc
+bin/toc2cddb
+bin/toc2cue
+man/man1/cdrdao.1
+man/man1/cue2toc.1
+share/cdrdao/drivers
+share/doc/cdrdao/README
+share/doc/cdrdao/README.PlexDAE
+share/doc/cdrdao/testtocs/cdtext.toc
+share/doc/cdrdao/testtocs/data1.toc
+share/doc/cdrdao/testtocs/data2.toc
+share/doc/cdrdao/testtocs/data3.toc
+share/doc/cdrdao/testtocs/data4.toc
+share/doc/cdrdao/testtocs/data5.toc
+share/doc/cdrdao/testtocs/data6.toc
+share/doc/cdrdao/testtocs/data7.toc
+share/doc/cdrdao/testtocs/mode1_rw.toc
+share/doc/cdrdao/testtocs/mode1_rw_raw.toc
+share/doc/cdrdao/testtocs/t1.toc
+share/doc/cdrdao/testtocs/t2.toc
+share/doc/cdrdao/testtocs/t3.toc
+share/doc/cdrdao/testtocs/t4.toc
+share/doc/cdrdao/testtocs/t5.toc
+share/doc/cdrdao/testtocs/t6.toc
+share/doc/cdrdao/testtocs/t7.toc
+share/doc/cdrdao/testtocs/t8.toc
+share/doc/cdrdao/testtocs/t9.toc
+share/examples/cdrdao/mp32dao.pl
+share/examples/cdrdao/psxcopy/Makefile
+share/examples/cdrdao/psxcopy/README
+share/examples/cdrdao/psxcopy/cdjob.c
+share/examples/cdrdao/psxcopy/psxdump.c
+share/examples/cdrdao/psxcopy/read-psx
+share/examples/cdrdao/psxcopy/write-psx
+share/examples/cdrdao/wav2dao.pl
+@dirrm share/examples/cdrdao/psxcopy
+@dirrm share/examples/cdrdao
+@dirrm share/doc/cdrdao/testtocs
+@dirrm share/doc/cdrdao
+@dirrm share/cdrdao
diff -r f0d12e79365d -r db7fbc985a93 sysutils/cdrdao/PLIST.cdrdao
--- a/sysutils/cdrdao/PLIST.cdrdao      Tue Jul 19 16:27:56 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-@comment $NetBSD: PLIST.cdrdao,v 1.1 2005/06/04 19:05:38 adrianp Exp $
-bin/cdrdao
-bin/cue2toc
-bin/toc2cddb
-bin/toc2cue
-man/man1/cdrdao.1
-man/man1/cue2toc.1
-share/cdrdao/drivers
-share/doc/cdrdao/README
-share/doc/cdrdao/README.PlexDAE
-share/doc/cdrdao/testtocs/cdtext.toc
-share/doc/cdrdao/testtocs/data1.toc
-share/doc/cdrdao/testtocs/data2.toc
-share/doc/cdrdao/testtocs/data3.toc
-share/doc/cdrdao/testtocs/data4.toc
-share/doc/cdrdao/testtocs/data5.toc
-share/doc/cdrdao/testtocs/data6.toc
-share/doc/cdrdao/testtocs/data7.toc
-share/doc/cdrdao/testtocs/mode1_rw.toc
-share/doc/cdrdao/testtocs/mode1_rw_raw.toc
-share/doc/cdrdao/testtocs/t1.toc
-share/doc/cdrdao/testtocs/t2.toc
-share/doc/cdrdao/testtocs/t3.toc
-share/doc/cdrdao/testtocs/t4.toc
-share/doc/cdrdao/testtocs/t5.toc
-share/doc/cdrdao/testtocs/t6.toc
-share/doc/cdrdao/testtocs/t7.toc
-share/doc/cdrdao/testtocs/t8.toc
-share/doc/cdrdao/testtocs/t9.toc
-share/examples/cdrdao/mp32dao.pl
-share/examples/cdrdao/psxcopy/Makefile
-share/examples/cdrdao/psxcopy/README
-share/examples/cdrdao/psxcopy/cdjob.c
-share/examples/cdrdao/psxcopy/psxdump.c
-share/examples/cdrdao/psxcopy/read-psx
-share/examples/cdrdao/psxcopy/write-psx
-share/examples/cdrdao/wav2dao.pl
-@dirrm share/examples/cdrdao/psxcopy
-@dirrm share/examples/cdrdao
-@dirrm share/doc/cdrdao/testtocs
-@dirrm share/doc/cdrdao
-@dirrm share/cdrdao
diff -r f0d12e79365d -r db7fbc985a93 sysutils/cdrdao/PLIST.gcdmaster
--- a/sysutils/cdrdao/PLIST.gcdmaster   Tue Jul 19 16:27:56 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.gcdmaster,v 1.1 2005/06/04 19:05:38 adrianp Exp $
-bin/gcdmaster
-man/man1/gcdmaster.1
-share/applications/gcdmaster.desktop
-share/pixmaps/gcdmaster.png