Wed Sep 14 15:46:02 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.4 -r1.5 pkgsrc/audio/libmpg123/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/audio/libmpg123/distinfo
diff -r0 -r1.1 pkgsrc/audio/libmpg123/patches/patch-ae
cvs diff -r1.4 -r1.5 pkgsrc/audio/libmpg123/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libmpg123/Attic/Makefile 2008/10/15 01:58:53 1.4
+++ pkgsrc/audio/libmpg123/Attic/Makefile 2011/09/14 15:46:01 1.5
@@ -1,28 +1,33 @@ @@ -1,28 +1,33 @@
1# $NetBSD: Makefile,v 1.4 2008/10/15 01:58:53 bjs Exp $ 1# $NetBSD: Makefile,v 1.5 2011/09/14 15:46:01 hans Exp $
2# 2#
3 3
4.include "../../audio/libmpg123/Makefile.common" 4.include "../../audio/libmpg123/Makefile.common"
5 5
6PKGNAME= libmpg123-${LIBMPG123_VERSION} 6PKGNAME= libmpg123-${LIBMPG123_VERSION}
7COMMENT= MPEG layer 1, 2, and 3 decoder library 7COMMENT= MPEG layer 1, 2, and 3 decoder library
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11PKGCONFIG_OVERRIDE+= libmpg123.pc.in 11PKGCONFIG_OVERRIDE+= libmpg123.pc.in
12 12
13AUTO_MKDIRS= yes 13AUTO_MKDIRS= yes
14 14
15BUILD_DIRS= src/libmpg123 15BUILD_DIRS= src/libmpg123
16INSTALL_DIRS= src/libmpg123 16INSTALL_DIRS= src/libmpg123
17 17
18post-extract: 18post-extract:
19 ${ECHO} "#!${CONFIG_SHELL}${.newline}${TRUE}" > \ 19 ${ECHO} "#!${CONFIG_SHELL}${.newline}${TRUE}" > \
20 ${WRKSRC:Q}/libltdl/configure 20 ${WRKSRC:Q}/libltdl/configure
21 21
22post-install: 22post-install:
23 ${INSTALL_DATA} ${WRKSRC:Q}/libmpg123.pc \ 23 ${INSTALL_DATA} ${WRKSRC:Q}/libmpg123.pc \
24 ${DESTDIR:Q}${PREFIX:Q}/lib/pkgconfig 24 ${DESTDIR:Q}${PREFIX:Q}/lib/pkgconfig
25 25
26.include "mpg123-options.mk" 26.include "mpg123-options.mk"
27 27
 28.include "../../mk/bsd.prefs.mk"
 29.if ${OPSYS} == "SunOS"
 30MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text"
 31.endif
 32
28.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/libmpg123/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libmpg123/Attic/distinfo 2008/09/07 00:56:15 1.1.1.1
+++ pkgsrc/audio/libmpg123/Attic/distinfo 2011/09/14 15:46:01 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/09/07 00:56:15 bjs Exp $ 1$NetBSD: distinfo,v 1.2 2011/09/14 15:46:01 hans Exp $
2 2
3SHA1 (mpg123-1.5.1.tar.bz2) = 4e85388294c5c432bd899bb910694dd259e76679 3SHA1 (mpg123-1.5.1.tar.bz2) = 4e85388294c5c432bd899bb910694dd259e76679
4RMD160 (mpg123-1.5.1.tar.bz2) = aeaf5ab770eeb66826d81ba3d840492709b2c7a5 4RMD160 (mpg123-1.5.1.tar.bz2) = aeaf5ab770eeb66826d81ba3d840492709b2c7a5
5Size (mpg123-1.5.1.tar.bz2) = 1033406 bytes 5Size (mpg123-1.5.1.tar.bz2) = 1033406 bytes
6SHA1 (patch-aa) = faf686e1b47bc53ef5155129da2fd0b81632c2f9 6SHA1 (patch-aa) = faf686e1b47bc53ef5155129da2fd0b81632c2f9
7SHA1 (patch-ab) = 7d1d36cf5ea4a3e3d0a43da351ac7e3c97c636bf 7SHA1 (patch-ab) = 7d1d36cf5ea4a3e3d0a43da351ac7e3c97c636bf
8SHA1 (patch-ac) = 751f52278354413e11f857c53e954e2fd56ba06b 8SHA1 (patch-ac) = 751f52278354413e11f857c53e954e2fd56ba06b
9SHA1 (patch-ad) = 2b888b710499308216a90d48036c1d00327033e3 9SHA1 (patch-ad) = 2b888b710499308216a90d48036c1d00327033e3
 10SHA1 (patch-ae) = e9b9b661b85fa66e2c16fa2f6466ea82f7e945e2
File Added: pkgsrc/audio/libmpg123/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.1 2011/09/14 15:46:02 hans Exp $

--- src/libmpg123/Makefile.in.orig	2008-08-29 08:48:07.000000000 +0200
+++ src/libmpg123/Makefile.in	2011-09-13 15:21:13.667526892 +0200
@@ -79,7 +79,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
 SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
 	testcpu.c
 DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \