Thu Jul 9 12:00:14 2015 UTC ()
Use nbcompat, update some patches.  Fixes build on SunOS.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/audio/ifp-line/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/ifp-line/patches/patch-Makefile_am
diff -r1.1 -r1.2 pkgsrc/audio/ifp-line/patches/patch-Makefile_in
diff -r0 -r1.1 pkgsrc/audio/ifp-line/patches/patch-ifp__routines.c
cvs diff -r1.9 -r1.10 pkgsrc/audio/ifp-line/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/ifp-line/distinfo 2011/07/03 22:04:06 1.9
+++ pkgsrc/audio/ifp-line/distinfo 2015/07/09 12:00:13 1.10
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.9 2011/07/03 22:04:06 dholland Exp $ 1$NetBSD: distinfo,v 1.10 2015/07/09 12:00:13 jperkin Exp $
2 2
3SHA1 (ifp-line-0.3.tar.gz) = e511157878a08fbea6a2c702e726e131dd20cb2f 3SHA1 (ifp-line-0.3.tar.gz) = e511157878a08fbea6a2c702e726e131dd20cb2f
4RMD160 (ifp-line-0.3.tar.gz) = 71fee7e02daeb9b3dc2e7da53236057b9d5a9f63 4RMD160 (ifp-line-0.3.tar.gz) = 71fee7e02daeb9b3dc2e7da53236057b9d5a9f63
5Size (ifp-line-0.3.tar.gz) = 138272 bytes 5Size (ifp-line-0.3.tar.gz) = 138272 bytes
6SHA1 (patch-Makefile_am) = f855283ab54a49c30a08f408a67ffa6c3ac88a72 6SHA1 (patch-Makefile_am) = a273f2e813b43b717155a2dcf7bc1372d23b936b
7SHA1 (patch-Makefile_in) = e196e6d59a3bf8d1af58f4a5f94a3fa16c3af4af 7SHA1 (patch-Makefile_in) = cf64aab56fbf9d7b58535a341c93176a6709b02b
 8SHA1 (patch-ifp__routines.c) = 654fbb77f3404e987e7fb777da7cd0e1e92f4b72
cvs diff -r1.1 -r1.2 pkgsrc/audio/ifp-line/patches/patch-Makefile_am (expand / switch to unified diff)

--- pkgsrc/audio/ifp-line/patches/patch-Makefile_am 2011/07/03 22:04:51 1.1
+++ pkgsrc/audio/ifp-line/patches/patch-Makefile_am 2015/07/09 12:00:14 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Makefile_am,v 1.1 2011/07/03 22:04:51 dholland Exp $ 1$NetBSD: patch-Makefile_am,v 1.2 2015/07/09 12:00:14 jperkin Exp $
2 2
3Avoid confusing make with multiple paths to the same file. 3Avoid confusing make with multiple paths to the same file.
4 4
5--- Makefile.am~ 2005-12-10 07:35:04.000000000 +0000 5--- Makefile.am.orig 2005-12-10 07:35:04.000000000 +0000
6+++ Makefile.am 6+++ Makefile.am
7@@ -5,7 +5,7 @@ EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA 7@@ -5,7 +5,7 @@ EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA
8 bin_PROGRAMS = ifp 8 bin_PROGRAMS = ifp
9 ifp_SOURCES = ifp.c ifp_routines.c ifp_routines.h 9 ifp_SOURCES = ifp.c ifp_routines.c ifp_routines.h
10 ifp_CFLAGS = @LIBUSB_CFLAGS@ 10 ifp_CFLAGS = @LIBUSB_CFLAGS@
11-ifp_LDADD = ./libunicodehack.a @LIBICONV@ @LIBUSB_LIBS@ 11-ifp_LDADD = ./libunicodehack.a @LIBICONV@ @LIBUSB_LIBS@
12+ifp_LDADD = libunicodehack.a @LIBICONV@ @LIBUSB_LIBS@ 12+ifp_LDADD = libunicodehack.a @LIBICONV@ @LIBUSB_LIBS@
13  13
14 noinst_LIBRARIES = libunicodehack.a 14 noinst_LIBRARIES = libunicodehack.a
15 libunicodehack_a_SOURCES = unicodehack.c unicodehack.h 15 libunicodehack_a_SOURCES = unicodehack.c unicodehack.h
cvs diff -r1.1 -r1.2 pkgsrc/audio/ifp-line/patches/patch-Makefile_in (expand / switch to unified diff)

--- pkgsrc/audio/ifp-line/patches/patch-Makefile_in 2011/07/03 22:04:51 1.1
+++ pkgsrc/audio/ifp-line/patches/patch-Makefile_in 2015/07/09 12:00:14 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-Makefile_in,v 1.1 2011/07/03 22:04:51 dholland Exp $ 1$NetBSD: patch-Makefile_in,v 1.2 2015/07/09 12:00:14 jperkin Exp $
2 2
3Avoid confusing make with multiple paths to the same file. 3Avoid confusing make with multiple paths to the same file.
4 4
5--- Makefile.in~ 2005-12-10 08:35:05.000000000 +0000 5--- Makefile.in.orig 2005-12-10 08:35:05.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -70,7 +70,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 7@@ -70,7 +70,7 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
8 PROGRAMS = $(bin_PROGRAMS) 8 PROGRAMS = $(bin_PROGRAMS)
9 am_ifp_OBJECTS = ifp-ifp.$(OBJEXT) ifp-ifp_routines.$(OBJEXT) 9 am_ifp_OBJECTS = ifp-ifp.$(OBJEXT) ifp-ifp_routines.$(OBJEXT)
10 ifp_OBJECTS = $(am_ifp_OBJECTS) 10 ifp_OBJECTS = $(am_ifp_OBJECTS)
11-ifp_DEPENDENCIES = ./libunicodehack.a 11-ifp_DEPENDENCIES = ./libunicodehack.a
12+ifp_DEPENDENCIES = libunicodehack.a 12+ifp_DEPENDENCIES = libunicodehack.a
13 DEFAULT_INCLUDES = -I. -I$(srcdir) -I. 13 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
14 depcomp = $(SHELL) $(top_srcdir)/depcomp 14 depcomp = $(SHELL) $(top_srcdir)/depcomp
15 am__depfiles_maybe = depfiles 15 am__depfiles_maybe = depfiles
16@@ -193,7 +193,7 @@ target_alias = @target_alias@ 16@@ -193,7 +193,7 @@ target_alias = @target_alias@
17 EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA) 17 EXTRA_DIST = $(man1_MANS) $(pkgdata_DATA)
18 ifp_SOURCES = ifp.c ifp_routines.c ifp_routines.h 18 ifp_SOURCES = ifp.c ifp_routines.c ifp_routines.h
File Added: pkgsrc/audio/ifp-line/patches/patch-ifp__routines.c
$NetBSD: patch-ifp__routines.c,v 1.1 2015/07/09 12:00:14 jperkin Exp $

Use nbcompat.

--- ifp_routines.c.orig	2005-12-03 16:55:06.000000000 +0000
+++ ifp_routines.c
@@ -8,7 +8,12 @@ static const char rcsid[] = "$Id: ifp_ro
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <errno.h>
+#if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat.h>
+#include <nbcompat/fts.h>
+#else
 #include <fts.h>
+#endif
 #include <unistd.h>
 
 #include "unicodehack.h"