From c66f201e348048d7f318a41ed111661a596b9324 Mon Sep 17 00:00:00 2001 From: pav Date: Sun, 15 Jan 2012 20:20:06 +0000 Subject: - Unbreak on 9.X PR: ports/164126 Submitted by: Yuri Pankov --- sysutils/cdrkit/Makefile | 8 +------- sysutils/cdrkit/files/patch-wodim__CMakeLists.txt | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 sysutils/cdrkit/files/patch-wodim__CMakeLists.txt (limited to 'sysutils/cdrkit') diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile index 94b79122d522..8ff67cfa9caf 100644 --- a/sysutils/cdrkit/Makefile +++ b/sysutils/cdrkit/Makefile @@ -25,12 +25,6 @@ MAN5= genisoimagerc.5 CONFLICTS= cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]* -.include - -.if ${OSVERSION} >= 900000 -BROKEN= does not link on 9.X -.endif - post-patch: @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/include/AddSchilyBits.cmake \ ${WRKSRC}/3rd-party/dirsplit/CMakeLists.txt @@ -39,4 +33,4 @@ post-patch: ${WRKSRC}/include/schily.h @${REINPLACE_CMD} -e 's|getdelim|wodim_getdelim|g' ${WRKSRC}/wodim/cue.c -.include +.include diff --git a/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt b/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt new file mode 100644 index 000000000000..8b903293d368 --- /dev/null +++ b/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt @@ -0,0 +1,19 @@ +--- ./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 @@ + + INCLUDE(CheckIncludeFiles) + +-#force libcap usage on Linux +-CHECK_INCLUDE_FILES("sys/capability.h" HAVE_SYS_CAPABILITY_H) +-IF(HAVE_SYS_CAPABILITY_H) +- LIST(APPEND EXTRA_LIBS cap) +-ELSE(HAVE_SYS_CAPABILITY_H) +- IF(CMAKE_SYSTEM_NAME MATCHES "Linux") +- MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.") +- ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +-ENDIF(HAVE_SYS_CAPABILITY_H) +- + LINK_DIRECTORIES(../librols ../libusal ../libedc) + + ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE -DDRV_DVD -DFIFO -DAUINFO -DUSE_LARGEFILES ) -- cgit