From yuri.pankov@gmail.com  Sat Jan 14 17:14:19 2012
Return-Path: <yuri.pankov@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 674061065670;
	Sat, 14 Jan 2012 17:14:19 +0000 (UTC)
	(envelope-from yuri.pankov@gmail.com)
Received: from procyon.xvoid.org (procyon.xvoid.org [IPv6:2001:470:28:4ba:20c:29ff:feb6:11bc])
	by mx1.freebsd.org (Postfix) with ESMTP id BC13B8FC17;
	Sat, 14 Jan 2012 17:14:18 +0000 (UTC)
Received: from sirius.xvoid.org (sirius.xvoid.org [IPv6:2001:470:28:4ba:20c:29ff:fe62:9a22])
	by procyon.xvoid.org (8.14.5/8.14.5) with ESMTP id q0EHEHKS040174;
	Sat, 14 Jan 2012 21:14:17 +0400 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Received: from sirius.xvoid.org (sirius.xvoid.org [IPv6:::1])
	by sirius.xvoid.org (8.14.5/8.14.5) with ESMTP id q0EHEHxa060381;
	Sat, 14 Jan 2012 21:14:17 +0400 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Received: (from yuri@localhost)
	by sirius.xvoid.org (8.14.5/8.14.5/Submit) id q0EHEHGg060380;
	Sat, 14 Jan 2012 21:14:17 +0400 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Message-Id: <201201141714.q0EHEHGg060380@sirius.xvoid.org>
Date: Sat, 14 Jan 2012 21:14:17 +0400 (MSK)
From: Yuri Pankov <yuri.pankov@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: pav@freebsd.org
Subject: [PATCH] sysutils/cdrkit: Fix build in presence of capability.h
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         164126
>Category:       ports
>Synopsis:       [PATCH] sysutils/cdrkit: Fix build in presence of capability.h
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 14 17:20:11 UTC 2012
>Closed-Date:    Sun Jan 15 20:20:16 UTC 2012
>Last-Modified:  Sun Jan 15 20:30:10 UTC 2012
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jan 14 17:20:22 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164126 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sun Jan 15 20:18:10 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164126 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164126: commit references a PR
Date: Sun, 15 Jan 2012 20:20:15 +0000 (UTC)

 pav         2012-01-15 20:20:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/cdrkit      Makefile 
   Added files:
     sysutils/cdrkit/files patch-wodim__CMakeLists.txt 
   Log:
   - Unbreak on 9.X
   
   PR:             ports/164126
   Submitted by:   Yuri Pankov <yuri.pankov@gmail.com>
   
   Revision  Changes    Path
   1.14      +1 -7      ports/sysutils/cdrkit/Makefile
   1.1       +19 -0     ports/sysutils/cdrkit/files/patch-wodim__CMakeLists.txt (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
