Attachment #164923 for bug #203828

Lines 340-345 Link Here

(-)Makefile (+1 lines)
340	SUBDIR += gconf-editor	340	SUBDIR += gconf-editor
341	SUBDIR += gdisk	341	SUBDIR += gdisk
342	SUBDIR += gdmap	342	SUBDIR += gdmap
		343	SUBDIR += genisoimage
343	SUBDIR += geomWatch	344	SUBDIR += geomWatch
344	SUBDIR += geomgui	345	SUBDIR += geomgui
345	SUBDIR += getdelta	346	SUBDIR += getdelta





PORTNAME=	cdrkit
PORTVERSION=	1.1.11
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

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]*

SLAVEDIRS=	sysutils/genisoimage

PLIST_SUB?=	CDRKIT="" GENISOIMAGE="@comment "

post-patch:
	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake \
	    ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt




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 18:27:59 UTC
+++ genisoimage/sha256.c
@@ -24,9 +24,9 @@
 
 /* Written by Ulrich Drepper <drepper@redhat.com>, 2007.  */

 #include <sys/types.h>
 
 #include "sha256.h"
--- 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)  */

 
 /* Process the remaining bytes in the buffer and put result from CTX
    in first 32 bytes following RESBUF.
@@ -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)

+  __attribute__ ((__nothrow__));
 
 #endif /* sha256.h */
--- 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)  */
-extern void sha512_init_ctx (struct sha512_ctx *ctx) __THROW;

 
 /* Process the remaining bytes in the buffer and put result from CTX
    in first 64 bytes following RESBUF.
@@ -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)

+  __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"

Lines 1-6 Link Here

(-)cdrkit/files/patch-wodim__CMakeLists.txt (-3 / +3 lines)
1	--- ./wodim/CMakeLists.txt.orig 2007-05-30 21:55:02.000000000 +0400	1	--- wodim/CMakeLists.txt.orig 2009-11-27 22:57:01 UTC
2	+++ ./wodim/CMakeLists.txt 2012-01-14 20:56:17.754839146 +0400	2	+++ wodim/CMakeLists.txt
3	@@ -9,16 +9,6 @@	3	@@ -9,16 +9,6 @@ SET(CDRECORD_COMMON_SRCS cd_misc.c defau
4		4
5	INCLUDE(CheckIncludeFiles)	5	INCLUDE(CheckIncludeFiles)
6		6




%%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




# Created by: Nikolai Lifanov
# $FreeBSD$

PKGNAMESUFFIX=	-genisoimage

COMMENT=	Standalone genisoimage from cdrkit

RUN_DEPENDS=	# nada

CONFLICTS=	# nada

PLIST_SUB=	CDRKIT="@comment " GENISOIMAGE=""

SLAVE_PORT=	cdrkit

MASTERDIR=	${.CURDIR}/../cdrkit

.include "${MASTERDIR}/Makefile"

Return to bug 203828

Lines 3-22 Link Here

(-)cdrkit/Makefile (-3 / +8 lines)
3		3
4	PORTNAME= cdrkit	4	PORTNAME= cdrkit
5	PORTVERSION= 1.1.11	5	PORTVERSION= 1.1.11
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://cdrkit.org/releases/ \	8	MASTER_SITES= http://cdrkit.org/releases/ \
9	http://debburn.alioth.debian.org/	9	http://debburn.alioth.debian.org/
10		10
11	MAINTAINER= jharris@widomaker.com	11	MAINTAINER= jharris@widomaker.com
12	COMMENT= Command-line CD/DVD writing suite	12	COMMENT?= Command-line CD/DVD writing suite
13		13
		14	RUN_DEPENDS?= ${PORTNAME}-genisoimage>0:${PORTSDIR}/sysutils/genisoimage
14	USES= cmake iconv perl5 shebangfix	15	USES= cmake iconv perl5 shebangfix
15	USE_PERL5= run	16	USE_PERL5= run
16	SHEBANG_FILES= 3rd-party/dirsplit/dirsplit	17	SHEBANG_FILES= 3rd-party/dirsplit/dirsplit
17		18
18	CONFLICTS= cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*	19	CONFLICTS?= cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
19		20
		21	SLAVEDIRS= sysutils/genisoimage
		22
		23	PLIST_SUB?= CDRKIT="" GENISOIMAGE="@comment "
		24
20	post-patch:	25	post-patch:
21	@${REINPLACE_CMD} -e 's\|share/man\|man\|' ${WRKSRC}/include/AddSchilyBits.cmake \	26	@${REINPLACE_CMD} -e 's\|share/man\|man\|' ${WRKSRC}/include/AddSchilyBits.cmake \
22	${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt	27	${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt

Lines 3-10 Link Here

(-)cdrkit/files/patch-genisomage (-23 / +23 lines)
3	Use __attribute__ ((__nothrow__)) instead of the linux-ish __THROW (from the	3	Use __attribute__ ((__nothrow__)) instead of the linux-ish __THROW (from the
4	linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.	4	linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD.
5		5
6	--- genisoimage/sha256.c.orig 2009-10-11 12:27:59.000000000 -0600	6	--- genisoimage/sha256.c.orig 2009-10-11 18:27:59 UTC
7	+++ genisoimage/sha256.c 2011-10-27 14:55:25.000000000 -0600	7	+++ genisoimage/sha256.c
8	@@ -24,9 +24,9 @@	8	@@ -24,9 +24,9 @@
9		9
10	/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */	10	/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */
Lines 16-24 Link Here
16	#include <sys/types.h>	16	#include <sys/types.h>
17		17
18	#include "sha256.h"	18	#include "sha256.h"
19	--- genisoimage/sha256.h.orig 2009-05-10 15:49:54.000000000 -0600	19	--- genisoimage/sha256.h.orig 2009-05-10 21:49:54 UTC
20	+++ genisoimage/sha256.h 2011-10-27 14:58:30.000000000 -0600	20	+++ genisoimage/sha256.h
21	@@ -42,14 +42,14 @@	21	@@ -42,14 +42,14 @@ struct sha256_ctx
22		22
23	/* Initialize structure containing state of computation.	23	/* Initialize structure containing state of computation.
24	(FIPS 180-2: 5.3.2) */	24	(FIPS 180-2: 5.3.2) */
Lines 35-41 Link Here
35		35
36	/* Process the remaining bytes in the buffer and put result from CTX	36	/* Process the remaining bytes in the buffer and put result from CTX
37	in first 32 bytes following RESBUF.	37	in first 32 bytes following RESBUF.
38	@@ -57,6 +57,6 @@	38	@@ -57,6 +57,6 @@ extern void sha256_process_bytes (const
39	IMPORTANT: On some systems it is required that RESBUF is correctly	39	IMPORTANT: On some systems it is required that RESBUF is correctly
40	aligned for a 32 bits value. */	40	aligned for a 32 bits value. */
41	extern void sha256_finish_ctx (struct sha256_ctx ctx, void *resbuf)	41	extern void sha256_finish_ctx (struct sha256_ctx ctx, void *resbuf)
Lines 43-52 Link Here
43	+ __attribute__ ((__nothrow__));	43	+ __attribute__ ((__nothrow__));
44		44
45	#endif /* sha256.h */	45	#endif /* sha256.h */
46	--- genisoimage/sha512.h.orig 2009-05-10 15:49:54.000000000 -0600	46	--- genisoimage/sha512.c.orig 2009-10-11 18:27:59 UTC
47	+++ genisoimage/sha512.h 2011-10-27 14:58:35.000000000 -0600	47	+++ genisoimage/sha512.c
48	@@ -42,14 +42,14 @@	48	@@ -24,9 +24,9 @@
49		49
		50	/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */
		51
		52	-#include <endian.h>
		53	#include <stdlib.h>
		54	#include <string.h>
		55	+#include <sys/endian.h>
		56	#include <sys/types.h>
		57
		58	#include "sha512.h"
		59	--- genisoimage/sha512.h.orig 2009-05-10 21:49:54 UTC
		60	+++ genisoimage/sha512.h
		61	@@ -42,14 +42,14 @@ struct sha512_ctx
		62
50	/* Initialize structure containing state of computation.	63	/* Initialize structure containing state of computation.
51	(FIPS 180-2: 5.3.3) */	64	(FIPS 180-2: 5.3.3) */
52	-extern void sha512_init_ctx (struct sha512_ctx *ctx) __THROW;	65	-extern void sha512_init_ctx (struct sha512_ctx *ctx) __THROW;
Lines 62-68 Link Here
62		75
63	/* Process the remaining bytes in the buffer and put result from CTX	76	/* Process the remaining bytes in the buffer and put result from CTX
64	in first 64 bytes following RESBUF.	77	in first 64 bytes following RESBUF.
65	@@ -57,6 +57,6 @@	78	@@ -57,6 +57,6 @@ extern void sha512_process_bytes (const
66	IMPORTANT: On some systems it is required that RESBUF is correctly	79	IMPORTANT: On some systems it is required that RESBUF is correctly
67	aligned for a 64 bits value. */	80	aligned for a 64 bits value. */
68	extern void sha512_finish_ctx (struct sha512_ctx ctx, void *resbuf)	81	extern void sha512_finish_ctx (struct sha512_ctx ctx, void *resbuf)
Lines 70-85 Link Here
70	+ __attribute__ ((__nothrow__));	83	+ __attribute__ ((__nothrow__));
71		84
72	#endif /* sha512.h */	85	#endif /* sha512.h */
73	--- genisoimage/sha512.c.orig 2009-10-11 12:27:59.000000000 -0600
74	+++ genisoimage/sha512.c 2011-10-27 14:59:01.000000000 -0600
75	@@ -24,9 +24,9 @@
76
77	/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */
78
79	-#include <endian.h>
80	#include <stdlib.h>
81	#include <string.h>
82	+#include <sys/endian.h>
83	#include <sys/types.h>
84
85	#include "sha512.h"

Lines 1-30 Link Here

(-)cdrkit/pkg-plist (-30 / +30 lines)
1	bin/genisoimage	1	%%GENISOIMAGE%%bin/genisoimage
2	bin/devdump	2	%%CDRKIT%%bin/devdump
3	bin/isodebug	3	%%CDRKIT%%bin/isodebug
4	bin/isodump	4	%%CDRKIT%%bin/isodump
5	bin/isoinfo	5	%%CDRKIT%%bin/isoinfo
6	bin/isovfy	6	%%CDRKIT%%bin/isovfy
7	bin/wodim	7	%%CDRKIT%%bin/wodim
8	bin/icedax	8	%%CDRKIT%%bin/icedax
9	bin/pitchplay	9	%%CDRKIT%%bin/pitchplay
10	bin/readmult	10	%%CDRKIT%%bin/readmult
11	bin/cdda2mp3	11	%%CDRKIT%%bin/cdda2mp3
12	bin/cdda2ogg	12	%%CDRKIT%%bin/cdda2ogg
13	bin/readom	13	%%CDRKIT%%bin/readom
14	bin/dirsplit	14	%%CDRKIT%%bin/dirsplit
15	sbin/netscsid	15	%%CDRKIT%%sbin/netscsid
16	man/man1/cdda2ogg.1.gz	16	%%CDRKIT%%man/man1/cdda2ogg.1.gz
17	man/man1/devdump.1.gz	17	%%CDRKIT%%man/man1/devdump.1.gz
18	man/man1/dirsplit.1.gz	18	%%CDRKIT%%man/man1/dirsplit.1.gz
19	man/man1/genisoimage.1.gz	19	%%GENISOIMAGE%%man/man1/genisoimage.1.gz
20	man/man1/icedax.1.gz	20	%%CDRKIT%%man/man1/icedax.1.gz
21	man/man1/isodebug.1.gz	21	%%CDRKIT%%man/man1/isodebug.1.gz
22	man/man1/isodump.1.gz	22	%%CDRKIT%%man/man1/isodump.1.gz
23	man/man1/isoinfo.1.gz	23	%%CDRKIT%%man/man1/isoinfo.1.gz
24	man/man1/isovfy.1.gz	24	%%CDRKIT%%man/man1/isovfy.1.gz
25	man/man1/list_audio_tracks.1.gz	25	%%CDRKIT%%man/man1/list_audio_tracks.1.gz
26	man/man1/pitchplay.1.gz	26	%%CDRKIT%%man/man1/pitchplay.1.gz
27	man/man1/readmult.1.gz	27	%%CDRKIT%%man/man1/readmult.1.gz
28	man/man1/readom.1.gz	28	%%CDRKIT%%man/man1/readom.1.gz
29	man/man1/wodim.1.gz	29	%%CDRKIT%%man/man1/wodim.1.gz
30	man/man5/genisoimagerc.5.gz	30	%%GENISOIMAGE%%man/man5/genisoimagerc.5.gz

Line 0 Link Here

(-)genisoimage/Makefile (+18 lines)
	1	# Created by: Nikolai Lifanov
	2	# $FreeBSD$
	3
	4	PKGNAMESUFFIX= -genisoimage
	5
	6	COMMENT= Standalone genisoimage from cdrkit
	7
	8	RUN_DEPENDS= # nada
	9
	10	CONFLICTS= # nada
	11
	12	PLIST_SUB= CDRKIT="@comment " GENISOIMAGE=""
	13
	14	SLAVE_PORT= cdrkit
	15
	16	MASTERDIR= ${.CURDIR}/../cdrkit
	17
	18	.include "${MASTERDIR}/Makefile"