From 2de50ee664473338135ad0071d70a359f32450de Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Tue, 5 Dec 2006 14:26:28 +0000
Subject: Fix build under NetBSD-i386 3.1 and eventually other Unix versions.
 Changes based on a patch by Juan Romero Pardines.

---
 multimedia/avidemux/distinfo         |  4 +++-
 multimedia/avidemux/patches/patch-ac | 42 ++++++++++++++++++++++++++++++++++++
 multimedia/avidemux/patches/patch-ad | 22 +++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/avidemux/patches/patch-ac
 create mode 100644 multimedia/avidemux/patches/patch-ad

diff --git a/multimedia/avidemux/distinfo b/multimedia/avidemux/distinfo
index e90626d475d..20e06a87b91 100644
--- a/multimedia/avidemux/distinfo
+++ b/multimedia/avidemux/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2006/12/03 10:33:02 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2006/12/05 14:26:28 tron Exp $
 
 SHA1 (avidemux_2.3.0.tar.gz) = 40a51db22593d910224dac91b512489a6af499fb
 RMD160 (avidemux_2.3.0.tar.gz) = 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e
 Size (avidemux_2.3.0.tar.gz) = 4750919 bytes
 SHA1 (patch-aa) = a320cdadfeb563af3ced0f1adc15da9b2d22c262
 SHA1 (patch-ab) = 744c90178da28af2e214d57211b4d631a06d8b2e
+SHA1 (patch-ac) = 7872afd5a1eebd6bd57de65a1cfac1ac4e3149ee
+SHA1 (patch-ad) = 3a0b32c90471d4589f50afca9495eff2b2b74fcb
diff --git a/multimedia/avidemux/patches/patch-ac b/multimedia/avidemux/patches/patch-ac
new file mode 100644
index 00000000000..237cc4d8550
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-ac
@@ -0,0 +1,42 @@
+$NetBSD: patch-ac,v 1.3 2006/12/05 14:26:28 tron Exp $
+
+--- avidemux/ADM_script/DirectorySearch.h.orig	2006-10-08 15:40:42.000000000 +0100
++++ avidemux/ADM_script/DirectorySearch.h	2006-12-05 13:58:39.000000000 +0000
+@@ -14,7 +14,9 @@
+ #if _MSC_VER > 1000
+ #pragma once
+ #endif // _MSC_VER > 1000
+-#if !defined( __unix__) && !defined(__maxosx__)
++#include <sys/types.h>
++#include <sys/param.h>
++#if !defined(BSD) && !defined( __unix__) && !defined(__macosx__)
+ #include <io.h>
+ #else
+ #include <sys/types.h>
+@@ -26,7 +28,7 @@
+ // create a non file bit for unix
+ #define _A_NONFILE	0x03
+ 
+-#if defined( __unix__) && !defined(__maxosx__)
++#if (defined(__unix__) || defined(BSD)) && !defined(__macosx__)
+ 
+ // wrap the file mode bits
+ #define _A_NORMAL	0x00
+@@ -50,6 +52,7 @@
+ 
+ class CDirectorySearch
+ {
++private:
+ public:
+ 	const char * GetExtension();
+ 	bool IsExtension(const char *pExtension);
+@@ -102,8 +105,7 @@
+ 	long m_hSearch;
+ 	_finddata_t m_fdData;
+ 	std::string m_sDirectory;
+-private:
+-#ifdef __unix__
++#if defined(__unix__) || defined(BSD)
+ 	// prototypes
+ 	int _findfirst(const char *path,_finddata_t *pfdData);
+ 	int _findnext(unsigned long int hDir,_finddata_t *pfdData);
diff --git a/multimedia/avidemux/patches/patch-ad b/multimedia/avidemux/patches/patch-ad
new file mode 100644
index 00000000000..ebe1fc60db1
--- /dev/null
+++ b/multimedia/avidemux/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2006/12/05 14:26:28 tron Exp $
+
+--- avidemux/ADM_script/DirectorySearch.cpp.orig	2006-10-08 15:40:42.000000000 +0100
++++ avidemux/ADM_script/DirectorySearch.cpp	2006-12-05 14:05:00.000000000 +0000
+@@ -14,7 +14,7 @@
+ // Construction/Destruction
+ //////////////////////////////////////////////////////////////////////
+ 
+-#ifdef __unix__
++#if defined(__unix__) || defined(BSD)
+ int CDirectorySearch::_findnext(unsigned long int hDir,_finddata_t *pfdData)
+ {// begin _findnext
+ 	if(!hDir || hDir == 0xFFFFFFFF)
+@@ -29,7 +29,7 @@
+ 	strncpy(pfdData->name,pEntry->d_name,pEntry->d_reclen);
+ 	// append NULL terminator
+ 	pfdData->name[pEntry->d_reclen] = '\0';
+-#elif __FreeBSD__
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ 	strncpy(pfdData->name,pEntry->d_name,pEntry->d_namlen);
+ 	// append NULL terminator
+ 	pfdData->name[pEntry->d_namlen] = '\0';
-- 
cgit v1.2.3