CVS commit: pkgsrc/multimedia/tstools

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Mon Jul  3 11:52:37 UTC 2017

Modified Files:
        pkgsrc/multimedia/tstools: Makefile distinfo
Added Files:
        pkgsrc/multimedia/tstools/patches: patch-Makefile patch-compat.h
            patch-misc.c patch-tsserve.c

Log Message:
fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/tstools/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/tstools/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/tstools/patches/patch-Makefile \
    pkgsrc/multimedia/tstools/patches/patch-compat.h \
    pkgsrc/multimedia/tstools/patches/patch-misc.c \
    pkgsrc/multimedia/tstools/patches/patch-tsserve.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/tstools/Makefile
diff -u pkgsrc/multimedia/tstools/Makefile:1.6 pkgsrc/multimedia/tstools/Makefile:1.7
--- pkgsrc/multimedia/tstools/Makefile:1.6      Sun Dec 21 12:12:42 2014
+++ pkgsrc/multimedia/tstools/Makefile  Mon Jul  3 11:52:37 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/12/21 12:12:42 mef Exp $
+# $NetBSD: Makefile,v 1.7 2017/07/03 11:52:37 wiedi Exp $
 #
 
 DISTNAME=      tstools-1_11
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/_/./}
 CATEGORIES=    multimedia
 MASTER_SITES=  https://tstools.googlecode.com/files/
@@ -17,6 +18,8 @@ MAKE_JOBS_SAFE=               no
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/_/./}
 USE_TOOLS+=    gmake
 
+LDFLAGS.SunOS+=        -lsocket -lnsl -lresolv
+
 TSPROGS=es2ts \
        esdots \
        esfilter \

Index: pkgsrc/multimedia/tstools/distinfo
diff -u pkgsrc/multimedia/tstools/distinfo:1.2 pkgsrc/multimedia/tstools/distinfo:1.3
--- pkgsrc/multimedia/tstools/distinfo:1.2      Tue Nov  3 23:54:33 2015
+++ pkgsrc/multimedia/tstools/distinfo  Mon Jul  3 11:52:37 2017
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:54:33 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/07/03 11:52:37 wiedi Exp $
 
 SHA1 (tstools-1_11.tgz) = fb8e5f59fada384d2d7865f840a0ad28404bde81
 RMD160 (tstools-1_11.tgz) = f4fa0e3f49c9409096608a6bf3849c785de9d3f5
 SHA512 (tstools-1_11.tgz) = 8cc0f5d4ff22bd3151a4fa3012d22ebc36dd3c7546258f9f9ecc2d0513e478aeccd8f5fff7cfd24e647e0e668b0968e780dab4418469c0979ccc6176136d9e26
 Size (tstools-1_11.tgz) = 392616 bytes
+SHA1 (patch-Makefile) = 895018d485d31fdecdc3a4ee9f672b0a3c34e6df
+SHA1 (patch-compat.h) = b08f53225da9830de408dbadbaa51411b2838380
+SHA1 (patch-misc.c) = 17033aa72ee1fc8b2ac8b8870ed0a1f98b9ec01e
+SHA1 (patch-tsserve.c) = 519f2ed14d50c258ca5b7cc747793d280f7fc6e3

Added files:

Index: pkgsrc/multimedia/tstools/patches/patch-Makefile
diff -u /dev/null pkgsrc/multimedia/tstools/patches/patch-Makefile:1.1
--- /dev/null   Mon Jul  3 11:52:37 2017
+++ pkgsrc/multimedia/tstools/patches/patch-Makefile    Mon Jul  3 11:52:37 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2017/07/03 11:52:37 wiedi Exp $
+
+Don't overwrite pkgsrc LDFLAGS
+
+--- Makefile.orig      2008-11-06 23:15:49.000000000 +0000
++++ Makefile
+@@ -80,7 +80,7 @@ else
+ endif
+ 
+ CFLAGS = $(WARNING_FLAGS) $(OPTIMISE_FLAGS) $(LFS_FLAGS) -I. $(PROFILE_FLAGS) $(ARCH_FLAGS)
+-LDFLAGS = -g -lm $(PROFILE_FLAGS) $(ARCH_FLAGS)
++LDFLAGS += -g -lm $(PROFILE_FLAGS) $(ARCH_FLAGS)
+ 
+ # Target directories
+ OBJDIR = obj
Index: pkgsrc/multimedia/tstools/patches/patch-compat.h
diff -u /dev/null pkgsrc/multimedia/tstools/patches/patch-compat.h:1.1
--- /dev/null   Mon Jul  3 11:52:37 2017
+++ pkgsrc/multimedia/tstools/patches/patch-compat.h    Mon Jul  3 11:52:37 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-compat.h,v 1.1 2017/07/03 11:52:37 wiedi Exp $
+
+prevent conflicting offset_t on SunOS
+
+--- compat.h.orig      2008-11-06 23:15:49.000000000 +0000
++++ compat.h
+@@ -113,7 +113,9 @@ typedef uint8_t  byte;
+ //     do both, here, for safety.
+ #include <sys/types.h>
+ #include <unistd.h>
++#if !defined(__sun)
+ typedef off_t offset_t;
++#endif
+ 
+ #if defined(__linux__) && !defined(__USE_FILE_OFFSET64)
+ // If Linux does not have 64 bit support built in, then our offsets will
Index: pkgsrc/multimedia/tstools/patches/patch-misc.c
diff -u /dev/null pkgsrc/multimedia/tstools/patches/patch-misc.c:1.1
--- /dev/null   Mon Jul  3 11:52:37 2017
+++ pkgsrc/multimedia/tstools/patches/patch-misc.c      Mon Jul  3 11:52:37 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-misc.c,v 1.1 2017/07/03 11:52:37 wiedi Exp $
+
+no sin_len on SunOS
+--- misc.c.orig        2008-11-06 23:15:49.000000000 +0000
++++ misc.c
+@@ -1277,7 +1277,7 @@ extern int connect_socket(char *hostname
+   }
+   memcpy(&ipaddr.sin_addr.s_addr, hp->h_addr, hp->h_length);
+   ipaddr.sin_family = hp->h_addrtype;
+-#if !defined(__linux__)
++#if !defined(__linux__) && !defined(__sun)
+   // On BSD, the length is defined in the datastructure
+   ipaddr.sin_len = sizeof(struct sockaddr_in);
+ #endif // __linux__
Index: pkgsrc/multimedia/tstools/patches/patch-tsserve.c
diff -u /dev/null pkgsrc/multimedia/tstools/patches/patch-tsserve.c:1.1
--- /dev/null   Mon Jul  3 11:52:37 2017
+++ pkgsrc/multimedia/tstools/patches/patch-tsserve.c   Mon Jul  3 11:52:37 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-tsserve.c,v 1.1 2017/07/03 11:52:37 wiedi Exp $
+
+no sin_len on SunOS
+--- tsserve.c.orig     2008-11-06 23:15:49.000000000 +0000
++++ tsserve.c
+@@ -3041,7 +3041,7 @@ static int run_server(tsserve_context_p
+ 
+   // Bind it to port `listen_port` on this machine
+   memset(&ipaddr,0,sizeof(ipaddr));
+-#if !defined(__linux__) && !defined(_WIN32)
++#if !defined(__linux__) && !defined(_WIN32) && !defined(__sun)
+   // On BSD, the length is defined in the datastructure
+   ipaddr.sin_len = sizeof(struct sockaddr_in);
+ #endif