Module Name:	pkgsrc
Committed By:	adrianp
Date:		Sat Jun  4 19:05:38 UTC 2005

Modified Files:
	pkgsrc/sysutils/cdrdao: Makefile distinfo
Added Files:
	pkgsrc/sysutils/cdrdao: Makefile.common PLIST.cdrdao PLIST.gcdmaster
	pkgsrc/sysutils/cdrdao/patches: patch-ai patch-aj

Log Message:
- Merge gcdmaster and cdrdao files but keep them as separate packages


To generate a diff of this commit:
cvs rdiff -r1.23 -r1.24 pkgsrc/sysutils/cdrdao/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/sysutils/cdrdao/Makefile.common \
    pkgsrc/sysutils/cdrdao/PLIST.cdrdao \
    pkgsrc/sysutils/cdrdao/PLIST.gcdmaster
cvs rdiff -r1.12 -r1.13 pkgsrc/sysutils/cdrdao/distinfo
cvs rdiff -r0 -r1.1 pkgsrc/sysutils/cdrdao/patches/patch-ai \
    pkgsrc/sysutils/cdrdao/patches/patch-aj

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.