Separate cdrkit into cdrkit and genisoimage

Previously, cdrkit conflicted with cdrtools and dvd+rw-tools.
The split allows for genisoimage to be installed without removing
cdrtools and dvd+rw-tools.

PR:		203828
Submitted by:	lifanov@mail.lifanov.com
Approved by:	maintainer timeout

4 files changed, 65 insertions, 59 deletions

diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index 68067771a589..bc0c5f301df8 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -3,19 +3,25 @@
 
 PORTNAME=	cdrkit
 PORTVERSION=	1.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cdrkit.org/releases/ \
 		http://debburn.alioth.debian.org/
 
 MAINTAINER=	jharris@widomaker.com
-COMMENT=	Command-line CD/DVD writing suite
+COMMENT?=	Command-line CD/DVD writing suite
+
+RUN_DEPENDS?=	${PORTNAME}-genisoimage>0:${PORTSDIR}/sysutils/genisoimage
 
 USES=		cmake iconv perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	3rd-party/dirsplit/dirsplit
 
-CONFLICTS=	cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
+CONFLICTS?=	cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
+
+SLAVEDIRS=	sysutils/genisoimage
+
+PLIST_SUB?=	CDRKIT="" GENISOIMAGE="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake \
diff --git a/sysutils/cdrkit/files/patch-genisomage b/sysutils/cdrkit/files/patch-genisomage
index 597de213aa9e..cab4b7357ef2 100644
--- a/sysutils/cdrkit/files/patch-genisomage
+++ b/sysutils/cdrkit/files/patch-genisomage
@@ -3,8 +3,8 @@ Use <sys/endian.h> instead of the linux-ish <endian.h>
 Use __attribute__ ((__nothrow__)) instead of the linux-ish __THROW (from the
 linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
 
---- genisoimage/sha256.c.orig	2009-10-11 12:27:59.000000000 -0600
-+++ genisoimage/sha256.c	2011-10-27 14:55:25.000000000 -0600
+--- genisoimage/sha256.c.orig	2009-10-11 18:27:59 UTC
++++ genisoimage/sha256.c
 @@ -24,9 +24,9 @@
  
  /* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
@@ -16,9 +16,9 @@ linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
  #include <sys/types.h>
  
  #include "sha256.h"
---- genisoimage/sha256.h.orig	2009-05-10 15:49:54.000000000 -0600
-+++ genisoimage/sha256.h	2011-10-27 14:58:30.000000000 -0600
-@@ -42,14 +42,14 @@
+--- genisoimage/sha256.h.orig	2009-05-10 21:49:54 UTC
++++ genisoimage/sha256.h
+@@ -42,14 +42,14 @@ struct sha256_ctx
  
  /* Initialize structure containing state of computation.
     (FIPS 180-2: 5.3.2)  */
@@ -35,7 +35,7 @@ linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
  
  /* Process the remaining bytes in the buffer and put result from CTX
     in first 32 bytes following RESBUF.
-@@ -57,6 +57,6 @@
+@@ -57,6 +57,6 @@ extern void sha256_process_bytes (const 
     IMPORTANT: On some systems it is required that RESBUF is correctly
     aligned for a 32 bits value.  */
  extern void *sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf)
@@ -43,9 +43,22 @@ linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
 +  __attribute__ ((__nothrow__));
  
  #endif /* sha256.h */
---- genisoimage/sha512.h.orig	2009-05-10 15:49:54.000000000 -0600
-+++ genisoimage/sha512.h	2011-10-27 14:58:35.000000000 -0600
-@@ -42,14 +42,14 @@
+--- genisoimage/sha512.c.orig	2009-10-11 18:27:59 UTC
++++ genisoimage/sha512.c
+@@ -24,9 +24,9 @@
+ 
+ /* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
+ 
+-#include <endian.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/endian.h>
+ #include <sys/types.h>
+ 
+ #include "sha512.h"
+--- genisoimage/sha512.h.orig	2009-05-10 21:49:54 UTC
++++ genisoimage/sha512.h
+@@ -42,14 +42,14 @@ struct sha512_ctx
  
  /* Initialize structure containing state of computation.
     (FIPS 180-2: 5.3.3)  */
@@ -62,7 +75,7 @@ linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
  
  /* Process the remaining bytes in the buffer and put result from CTX
     in first 64 bytes following RESBUF.
-@@ -57,6 +57,6 @@
+@@ -57,6 +57,6 @@ extern void sha512_process_bytes (const 
     IMPORTANT: On some systems it is required that RESBUF is correctly
     aligned for a 64 bits value.  */
  extern void *sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf)
@@ -70,16 +83,3 @@ linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
 +  __attribute__ ((__nothrow__));
  
  #endif /* sha512.h */
---- genisoimage/sha512.c.orig	2009-10-11 12:27:59.000000000 -0600
-+++ genisoimage/sha512.c	2011-10-27 14:59:01.000000000 -0600
-@@ -24,9 +24,9 @@
- 
- /* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */
- 
--#include <endian.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/endian.h>
- #include <sys/types.h>
- 
- #include "sha512.h"
diff --git a/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt b/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt
index 8b903293d368..0d4f7f6e964e 100644
--- a/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt
+++ b/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./wodim/CMakeLists.txt.orig	2007-05-30 21:55:02.000000000 +0400
-+++ ./wodim/CMakeLists.txt	2012-01-14 20:56:17.754839146 +0400
-@@ -9,16 +9,6 @@
+--- wodim/CMakeLists.txt.orig	2009-11-27 22:57:01 UTC
++++ wodim/CMakeLists.txt
+@@ -9,16 +9,6 @@ SET(CDRECORD_COMMON_SRCS cd_misc.c defau
  
  INCLUDE(CheckIncludeFiles)
  
diff --git a/sysutils/cdrkit/pkg-plist b/sysutils/cdrkit/pkg-plist
index e743969b5060..e7bcb46c85d1 100644
--- a/sysutils/cdrkit/pkg-plist
+++ b/sysutils/cdrkit/pkg-plist
@@ -1,30 +1,30 @@
-bin/genisoimage
-bin/devdump
-bin/isodebug
-bin/isodump
-bin/isoinfo
-bin/isovfy
-bin/wodim
-bin/icedax
-bin/pitchplay
-bin/readmult
-bin/cdda2mp3
-bin/cdda2ogg
-bin/readom
-bin/dirsplit
-sbin/netscsid
-man/man1/cdda2ogg.1.gz
-man/man1/devdump.1.gz
-man/man1/dirsplit.1.gz
-man/man1/genisoimage.1.gz
-man/man1/icedax.1.gz
-man/man1/isodebug.1.gz
-man/man1/isodump.1.gz
-man/man1/isoinfo.1.gz
-man/man1/isovfy.1.gz
-man/man1/list_audio_tracks.1.gz
-man/man1/pitchplay.1.gz
-man/man1/readmult.1.gz
-man/man1/readom.1.gz
-man/man1/wodim.1.gz
-man/man5/genisoimagerc.5.gz
+%%GENISOIMAGE%%bin/genisoimage
+%%CDRKIT%%bin/devdump
+%%CDRKIT%%bin/isodebug
+%%CDRKIT%%bin/isodump
+%%CDRKIT%%bin/isoinfo
+%%CDRKIT%%bin/isovfy
+%%CDRKIT%%bin/wodim
+%%CDRKIT%%bin/icedax
+%%CDRKIT%%bin/pitchplay
+%%CDRKIT%%bin/readmult
+%%CDRKIT%%bin/cdda2mp3
+%%CDRKIT%%bin/cdda2ogg
+%%CDRKIT%%bin/readom
+%%CDRKIT%%bin/dirsplit
+%%CDRKIT%%sbin/netscsid
+%%CDRKIT%%man/man1/cdda2ogg.1.gz
+%%CDRKIT%%man/man1/devdump.1.gz
+%%CDRKIT%%man/man1/dirsplit.1.gz
+%%GENISOIMAGE%%man/man1/genisoimage.1.gz
+%%CDRKIT%%man/man1/icedax.1.gz
+%%CDRKIT%%man/man1/isodebug.1.gz
+%%CDRKIT%%man/man1/isodump.1.gz
+%%CDRKIT%%man/man1/isoinfo.1.gz
+%%CDRKIT%%man/man1/isovfy.1.gz
+%%CDRKIT%%man/man1/list_audio_tracks.1.gz
+%%CDRKIT%%man/man1/pitchplay.1.gz
+%%CDRKIT%%man/man1/readmult.1.gz
+%%CDRKIT%%man/man1/readom.1.gz
+%%CDRKIT%%man/man1/wodim.1.gz
+%%GENISOIMAGE%%man/man5/genisoimagerc.5.gz