Ticket #41498: patch-lirc_2013Nov30_1.diff

Portfile

@@ -3 +3 @@
 PortSystem 1.0
 
 name            lirc
-version         0.8.3
-revision        2
+version         0.9.0
 categories      sysutils net
 license         GPL-2+
 maintainers     ecronin openmaintainer
@@ -17 +16 @@
 homepage        http://www.lirc.org
 master_sites    sourceforge
 use_bzip2       yes
-checksums       md5 8e78eeded7b31e5ad02e328970437c0f \
-                sha1 4b5aec19fa9ee15bafaeb1f87c154a0d4e045dcc \
-                rmd160 8948efc3e9dc34426ea32a3c63da63c0efa7dce2
+checksums           md5     b232aef26f23fe33ea8305d276637086 \
+                    sha1    8456bf7101d4f2d31d61c5073357a4981b458581 \
+                    rmd160  d8f1cf3a03573be36787e87adc71beba3e678a37
 livecheck.distname  LIRC
 
+patchfiles          patch-osx_patches.diff
+
 configure.args  --with-driver=udp --with-devdir=${prefix}/var/run \
                 --sysconfdir=${prefix}/etc --localstatedir=${prefix}/var \
                 --mandir=${prefix}/share/man
 
+# Build fails with clang
+# see bug report at: https://sourceforge.net/apps/mantisbt/lirc/view.php?id=1
+compiler.blacklist-append *clang*
+
 variant iguanaIR \
     description {Use IguanaIR USB device} {
-    configure.args-delete   --with-driver=udp
-    configure.args-append   --with-driver=iguanaIR
-    depends_lib-append  port:iguanaIR
-    patchfiles-append \
-        patch-daemons-hw_iguanaIR.c.diff \
-        patch-drivers-lirc.h.diff
+    configure.args-replace    --with-driver=udp --with-driver=iguanaIR
+    depends_lib-append        port:iguanaIR
+    patchfiles-append         patch-drivers-lirc.h.diff
 }
 
 post-destroot {
@@ -61 +63 @@
 
 notes "
 After installing you must configure an IR device for lirc to use. Most\
-hardware devices are not supported on Mac OS X (known exceptions: IguanaIR)\;\
-network sources (remote lircd, HD Homerun, etc) are fully supported.
+hardware devices are not supported on Mac OS X (known exceptions: IguanaIR).\
+Network sources (remote lircd, HD Homerun, etc) are fully supported.
 
 Please edit ${prefix}/etc/LaunchDaemons/org.macports.${name}/${name}.wrapper\
 and specify a valid driver or remote lircd to connect to. Examples for\

files/patch-daemons-hw_iguanaIR.c.diff

@@ -1 @@
---- daemons/hw_iguanaIR.c.org   2008-04-06 03:37:11.000000000 -0500
-+++ daemons/hw_iguanaIR.c       2010-01-21 10:04:29.000000000 -0600
-@@ -18,7 +18,11 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <errno.h>
-+#ifdef __APPLE__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- 
- #include "lircd.h"
- #include "ir_remote_types.h"

files/patch-drivers-lirc.h.diff

@@ -1 +1 @@
 --- drivers/lirc.h.org  2008-01-12 15:57:57.000000000 -0600
 +++ drivers/lirc.h      2010-01-21 10:03:23.000000000 -0600
-@@ -8,7 +8,7 @@
+@@ -9,7 +9,7 @@
+ #if defined(__linux__)
+ #include <linux/types.h>
  #include <linux/ioctl.h>
- #else
- #include <sys/types.h>
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__APPLE__)
+-#elif defined(_NetBSD_)
++#elif defined(_NetBSD_) || defined(__APPLE__)
  #include <sys/ioctl.h>
- #endif
- typedef u_int32_t __u32;
+ #elif defined(_CYGWIN_)
+ #define __USE_LINUX_IOCTL_DEFS

files/patch-osx_patches.diff

@@ +1 @@
+Extracted from https://sourceforge.net/u/rico9999/lirc/ci/f7c2830bbd60692feedf0dc8924b795027eaf3af/
+
+--- daemons/ir_remote_types.h
++++ daemons/ir_remote_types.h
+@@ -14,7 +14,20 @@
+ #ifndef IR_REMOTE_TYPES_H
+ #define IR_REMOTE_TYPES_H
+ 
++#if defined(__linux__)
+ #include <sys/types.h>
++#else
++#include <stdint.h>
++typedef int8_t   __s8;
++typedef uint8_t  __u8;
++typedef int16_t  __s16;
++typedef uint16_t __u16;
++typedef int32_t  __s32;
++typedef uint32_t __u32;
++typedef int64_t  __s64;
++typedef uint64_t __u64;
++#endif
++
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <string.h>
+
+--- daemons/lircmd.c
++++ daemons/lircmd.c
+@@ -35,6 +35,16 @@
+ #if defined(__linux__)
+ #include <linux/input.h>
+ #include <linux/uinput.h>
++#else
++#include <stdint.h>
++typedef int8_t   __s8;
++typedef uint8_t  __u8;
++typedef int16_t  __s16;
++typedef uint16_t __u16;
++typedef int32_t  __s32;
++typedef uint32_t __u32;
++typedef int64_t  __s64;
++typedef uint64_t __u64;
+ #endif
+ 
+ #define CLICK_DELAY 50000      /* usecs */