Tue Sep 23 13:49:30 2014 UTC ()
Avoid versioned symbols on SunOS to fix dependencies.

Bump PKGREVISION as package previously built, was just missing symbols.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/audio/libxmp/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/libxmp/distinfo
diff -r0 -r1.1 pkgsrc/audio/libxmp/patches/patch-src_common.h
cvs diff -r1.6 -r1.7 pkgsrc/audio/libxmp/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libxmp/Makefile 2014/04/14 07:28:14 1.6
+++ pkgsrc/audio/libxmp/Makefile 2014/09/23 13:49:30 1.7
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.6 2014/04/14 07:28:14 adam Exp $ 1# $NetBSD: Makefile,v 1.7 2014/09/23 13:49:30 jperkin Exp $
2 2
3DISTNAME= libxmp-4.2.7 3DISTNAME= libxmp-4.2.7
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
6 7
7MAINTAINER= rxg@NetBSD.org 8MAINTAINER= rxg@NetBSD.org
8HOMEPAGE= http://xmp.sourceforge.net/ 9HOMEPAGE= http://xmp.sourceforge.net/
9COMMENT= Player for many different Amiga and PC module formats 10COMMENT= Player for many different Amiga and PC module formats
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12USE_TOOLS+= gmake pkg-config 13USE_TOOLS+= gmake pkg-config
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14 15
15INSTALLATION_DIRS= bin lib 16INSTALLATION_DIRS= bin lib
16INSTALL_MAKE_FLAGS+= INSTALL=${INSTALL:Q} 17INSTALL_MAKE_FLAGS+= INSTALL=${INSTALL:Q}
cvs diff -r1.5 -r1.6 pkgsrc/audio/libxmp/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libxmp/distinfo 2014/04/14 07:28:14 1.5
+++ pkgsrc/audio/libxmp/distinfo 2014/09/23 13:49:30 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2014/04/14 07:28:14 adam Exp $ 1$NetBSD: distinfo,v 1.6 2014/09/23 13:49:30 jperkin Exp $
2 2
3SHA1 (libxmp-4.2.7.tar.gz) = cc7b1340bd8664d933311d23550ae4279abf2ecc 3SHA1 (libxmp-4.2.7.tar.gz) = cc7b1340bd8664d933311d23550ae4279abf2ecc
4RMD160 (libxmp-4.2.7.tar.gz) = 6fa2a6624dc470a8e8e8c660f1ad899039452f2a 4RMD160 (libxmp-4.2.7.tar.gz) = 6fa2a6624dc470a8e8e8c660f1ad899039452f2a
5Size (libxmp-4.2.7.tar.gz) = 605579 bytes 5Size (libxmp-4.2.7.tar.gz) = 605579 bytes
6SHA1 (patch-include_xmp.h) = 235dbcae39926fcacb07eea5dde4b64a6064dca9 6SHA1 (patch-include_xmp.h) = 235dbcae39926fcacb07eea5dde4b64a6064dca9
 7SHA1 (patch-src_common.h) = c6e2f51264422e7cf2bdf55cd3621c09c7000510
File Added: pkgsrc/audio/libxmp/patches/patch-src_common.h
$NetBSD: patch-src_common.h,v 1.1 2014/09/23 13:49:30 jperkin Exp $

Avoid versioned symbols on SunOS

--- src/common.h.orig	2014-04-05 22:49:14.000000000 +0000
+++ src/common.h
@@ -10,7 +10,7 @@
 #include "xmp.h"
 
 #if defined(__GNUC__) || defined(__clang__)
-#if !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__) && !defined(__AMIGA__) && !defined(B_BEOS_VERSION) && !defined(__ATHEOS__)
+#if !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__) && !defined(__AMIGA__) && !defined(B_BEOS_VERSION) && !defined(__ATHEOS__) && !defined(__sun)
 #define USE_VERSIONED_SYMBOLS
 #endif
 #endif