ports/164126: [PATCH] sysutils/cdrkit: Fix build in presence of capability.h

Yuri Pankov yuri.pankov at gmail.com
Sat Jan 14 17:20:12 UTC 2012


>Number:         164126
>Category:       ports
>Synopsis:       [PATCH] sysutils/cdrkit: Fix build in presence of capability.h
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 14 17:20:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Yuri Pankov
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD sirius.xvoid.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r229702: Fri Jan  6 19:49:41
>Description:
Fix build on 9.x and newer by removing the check for capability.h (all the cap_* stuff seems to be #ifdef'ed _linux_ in wodim source anyway).

Added file(s):
- files/patch-wodim__CMakeLists.txt

Port maintainer (pav at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- cdrkit-1.1.9_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/cdrkit/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	23 Sep 2011 22:25:23 -0000	1.13
+++ Makefile	14 Jan 2012 16:59:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdrkit
 PORTVERSION=	1.1.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cdrkit.org/releases/ \
 		http://debburn.alioth.debian.org/
@@ -27,10 +27,6 @@
 
 .include <bsd.port.pre.mk>
 
-.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
Index: files/patch-wodim__CMakeLists.txt
===================================================================
RCS file: files/patch-wodim__CMakeLists.txt
diff -N files/patch-wodim__CMakeLists.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-wodim__CMakeLists.txt	14 Jan 2012 16:59:17 -0000
@@ -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 )
--- cdrkit-1.1.9_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list