[105676] trunk/dports/audio/xmp

[ciserlohn at macports.org]

Revision: 105676
          https://trac.macports.org/changeset/105676
Author:   ciserlohn at macports.org
Date:     2013-05-01 08:29:32 -0700 (Wed, 01 May 2013)
Log Message:
-----------
xmp/libxmp: update to version 4.0.4/4.1.1 (#38974; maintainer)

Modified Paths:
--------------
    trunk/dports/audio/xmp/Portfile

Removed Paths:
-------------
    trunk/dports/audio/xmp/files/patch-src-common.h.diff
    trunk/dports/audio/xmp/files/patch-src-control.c.diff

Modified: trunk/dports/audio/xmp/Portfile
===================================================================
--- trunk/dports/audio/xmp/Portfile	2013-05-01 14:23:03 UTC (rev 105675)
+++ trunk/dports/audio/xmp/Portfile	2013-05-01 15:29:32 UTC (rev 105676)
@@ -20,7 +20,7 @@
 universal_variant   no
 
 if {${subport} == ${name}} {
-    version             4.0.3
+    version             4.0.4
     license             GPL-2+
 
     long_description    The Extended Module Player is a portable \
@@ -32,8 +32,8 @@
                         (XM), and Impulse Tracker (IT).
 
     master_sites        sourceforge:project/xmp/xmp/${version}
-    checksums           rmd160  366262b03255a099fd75c5c452815495d1b84995 \
-                        sha256  e67dd83e38168df965a384dbe1b032c4a23a57f4b4f26095df329161c47acf75
+    checksums           rmd160  22858b576428e776bb38c2ee378af12071445495 \
+                        sha256  f4cccffb03197e02818a092fca967f3d2cc88f01d4ff2a179d93796a7c0d8998
 
     depends_lib         port:libxmp
 
@@ -57,7 +57,7 @@
 }
 
 subport libxmp {
-    version             4.1.0
+    version             4.1.1
     license             LGPL-2.1+
 
     long_description    Libxmp is a library that renders module files to \
@@ -68,12 +68,9 @@
 
     master_sites        sourceforge:project/xmp/libxmp/${version}
     distname            ${subport}-${version}
-    checksums           rmd160  2b94458d3903fe00bf6a4c05c47cc8e0e47547a3 \
-                        sha256  23b932edcfc43ba6f0200e626fb5448572a0d525fc8c3122b2a099d5f987be7d
-
-    patchfiles          patch-src-common.h.diff \
-                        patch-src-control.c.diff
-
+    checksums           rmd160  eb9ce3207919aa3e231fc8d9ad46d4477725763c \
+                        sha256  1509d7c04fcb3ae873aad35c9f84056049a6d63b19936af38cf93ecb794c33b1
+                        
     # Switch to warning that Clang recognizes.
     if {[string first clang ${configure.compiler}] != -1} {
         patchfiles-append patch-configure.diff

Deleted: trunk/dports/audio/xmp/files/patch-src-common.h.diff
===================================================================
--- trunk/dports/audio/xmp/files/patch-src-common.h.diff	2013-05-01 14:23:03 UTC (rev 105675)
+++ trunk/dports/audio/xmp/files/patch-src-common.h.diff	2013-05-01 15:29:32 UTC (rev 105676)
@@ -1,17 +0,0 @@
---- ./src/common.h.orig	2013-04-21 20:30:02.110649091 +0200
-+++ ./src/common.h	2013-04-21 20:30:22.957668244 +0200
-@@ -124,14 +124,6 @@
- 
- #endif	/* !_MSC_VER */
- 
--#ifdef HAVE_STRLCPY
--#define strncpy strlcpy
--#endif
--
--#ifdef HAVE_STRLCAT
--#define strncpy strlcat
--#endif
--
- /* Quirks */
- #define QUIRK_S3MLOOP	(1 << 0)	/* S3M loop mode */
- #define QUIRK_ENVFADE	(1 << 1)	/* Fade at end of envelope */

Deleted: trunk/dports/audio/xmp/files/patch-src-control.c.diff
===================================================================
--- trunk/dports/audio/xmp/files/patch-src-control.c.diff	2013-05-01 14:23:03 UTC (rev 105675)
+++ trunk/dports/audio/xmp/files/patch-src-control.c.diff	2013-05-01 15:29:32 UTC (rev 105676)
@@ -1,36 +0,0 @@
-*** src/control.c~	2013-04-22 19:07:53.000000000 -0500
---- src/control.c	2013-04-22 19:08:42.000000000 -0500
-***************
-*** 213,219 ****
-  	return ret;
-  }
-  
-! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID)
-  extern int xmp_set_player_v41__(xmp_context, int, int)
-  	__attribute__((alias("xmp_set_player_v40__")));
-  
---- 213,219 ----
-  	return ret;
-  }
-  
-! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__)
-  extern int xmp_set_player_v41__(xmp_context, int, int)
-  	__attribute__((alias("xmp_set_player_v40__")));
-  
-***************
-*** 280,286 ****
-  	return ret;
-  }
-  
-! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID)
-  extern int xmp_get_player_v41__(xmp_context, int)
-  	__attribute__((alias("xmp_get_player_v40__")));
-  
---- 280,286 ----
-  	return ret;
-  }
-  
-! #if defined(__GNUC__) && !defined(WIN32) && !defined(ANDROID) && !defined(__APPLE__)
-  extern int xmp_get_player_v41__(xmp_context, int)
-  	__attribute__((alias("xmp_get_player_v40__")));
-  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130501/dd2e6a9f/attachment.html>