From 6e95bbc8df9dd0b282258af4b9212da4dd74b935 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Tue, 23 Sep 2014 14:29:50 +0000
Subject: Fix build on SunOS (socket libraries, use strerror()).

---
 multimedia/mpeg_encode/Makefile         |  4 +++-
 multimedia/mpeg_encode/distinfo         |  4 ++--
 multimedia/mpeg_encode/patches/patch-ac | 13 ++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index aa960944722..f843d1c38f2 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 09:21:09 asau Exp $
+# $NetBSD: Makefile,v 1.18 2014/09/23 14:29:50 jperkin Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
@@ -15,6 +15,8 @@ WRKSRC=			${WRKDIR}/mpeg_encode
 USE_TOOLS+=		gmake
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+LDFLAGS.SunOS+=	-lsocket -lnsl
+
 post-build:
 	@cd ${WRKSRC}/convert && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
diff --git a/multimedia/mpeg_encode/distinfo b/multimedia/mpeg_encode/distinfo
index ca468328e96..896c53429f3 100644
--- a/multimedia/mpeg_encode/distinfo
+++ b/multimedia/mpeg_encode/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2012/11/01 19:40:08 joerg Exp $
+$NetBSD: distinfo,v 1.10 2014/09/23 14:29:50 jperkin Exp $
 
 SHA1 (mpeg_encode-1.5b-src.tar.gz) = 853cd175f73b8064ce28deb256e4b81159a684ed
 RMD160 (mpeg_encode-1.5b-src.tar.gz) = 24c0a1090076630c292936639c5fb275778f6470
 Size (mpeg_encode-1.5b-src.tar.gz) = 2028724 bytes
 SHA1 (patch-aa) = 04221eb3d4cf85b206d27a2f425719ed7c4a5ec1
 SHA1 (patch-ab) = 19fcf1b6ef88f3cdba29a71eb619e467fa621f4f
-SHA1 (patch-ac) = 152c0bd7737a307d1aa89ae820e219300c124085
+SHA1 (patch-ac) = fe4bcb9082ed830020e3c0e8993664a7dc04af90
 SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8
 SHA1 (patch-ae) = 414b8c45c65892b9e161c285c5c0327103f8f474
 SHA1 (patch-ag) = 8014bf6347a3c95d279f989c027fb2c90e33aa6e
diff --git a/multimedia/mpeg_encode/patches/patch-ac b/multimedia/mpeg_encode/patches/patch-ac
index 72840c4160f..d8094a75f5a 100644
--- a/multimedia/mpeg_encode/patches/patch-ac
+++ b/multimedia/mpeg_encode/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2006/01/03 14:20:41 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2014/09/23 14:29:50 jperkin Exp $
 
 --- libpnmrw.c.orig	1995-08-16 22:24:26.000000000 +0000
 +++ libpnmrw.c
@@ -10,14 +10,21 @@ $NetBSD: patch-ac,v 1.2 2006/01/03 14:20:41 joerg Exp $
  #include "libpnmrw.h"
  
  /* if don't have string.h, try strings.h */
-@@ -126,8 +127,9 @@ static void
+@@ -126,11 +127,16 @@ static void
    pm_perror( reason )
  char* reason;
  {
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__sun)
    extern char* sys_errlist[];
 -  extern int errno;
 +#endif
    char* e;
  
++#ifdef __sun
++  e = strerror(errno);
++#else
    e = sys_errlist[errno];
++#endif
+ 
+   if ( reason != 0 && reason[0] != '\0' )
+     (void) fprintf( stderr, "%s: %s - %s\n", progname, reason, e );
-- 
cgit v1.2.3