From 54051a02fd4c0f7923a8212ad868c2c827733c00 Mon Sep 17 00:00:00 2001
From: hans <hans>
Date: Wed, 14 Sep 2011 15:44:23 +0000
Subject: Fix build on SunOS.

---
 audio/mpg123/Makefile         |  6 +++++-
 audio/mpg123/distinfo         |  3 ++-
 audio/mpg123/patches/patch-ai | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 audio/mpg123/patches/patch-ai

(limited to 'audio/mpg123')

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index e871b6e1f79..6a6cf7c5ea5 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2010/05/12 13:16:15 martin Exp $
+# $NetBSD: Makefile,v 1.50 2011/09/14 15:46:49 hans Exp $
 
 PKGNAME=	${DISTNAME:C/[^[:alnum:]]*//}
 COMMENT=	MPEG layer 1, 2, and 3 audio player
@@ -36,6 +36,10 @@ CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 .endif
 
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
+.endif
+
 # MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers
 .include "Makefile.common"
 
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 87dff6fa097..f054e88c084 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2010/10/26 21:06:44 zafer Exp $
+$NetBSD: distinfo,v 1.33 2011/09/14 15:46:49 hans Exp $
 
 SHA1 (mpg123-1.12.5.tar.bz2) = 476cb47a9b6570684b5af536beedf2026522e5f8
 RMD160 (mpg123-1.12.5.tar.bz2) = a59b0f7506b004c6e7d048ebef57090e1eb857af
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 9700187dc38af7d4b7f4f3332d76556d2cb7f418
 SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a
 SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
 SHA1 (patch-ah) = 86754993466714cb2208a9291b72e8e03dde19c7
+SHA1 (patch-ai) = 9ce00cfa1dac387ea7b5df19fa4b1483b598748f
diff --git a/audio/mpg123/patches/patch-ai b/audio/mpg123/patches/patch-ai
new file mode 100644
index 00000000000..69e6c42c600
--- /dev/null
+++ b/audio/mpg123/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.7 2011/09/14 15:46:49 hans Exp $
+
+--- src/libmpg123/Makefile.in.orig	2010-10-04 08:34:18.000000000 +0200
++++ src/libmpg123/Makefile.in	2011-09-13 15:28:48.954583152 +0200
+@@ -79,7 +79,7 @@ am_libmpg123_la_OBJECTS = compat.lo pars
+ libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS)
+ libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@
++	$(libmpg123_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
+ testcpu_SOURCES = testcpu.c
+ testcpu_OBJECTS = testcpu.$(OBJEXT)
+ testcpu_DEPENDENCIES = getcpuflags.$(OBJEXT)
+@@ -100,7 +100,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++	$(LDFLAGS) $(SunOS_LDFLAGS) -o $@
+ SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
+ 	testcpu.c
+ DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
-- 
cgit v1.2.3