Ticket #30635: despotify-20110115.diff

File despotify-20110115.diff, 6.0 KB (added by ryandesign (Ryan Carsten Schmidt), 13 years ago)

proposed patch

  • files/patch-Makefile.diff

     
    1 --- Makefile.orig       2009-03-08 00:06:25.000000000 +0100
    2 +++ Makefile    2009-03-08 00:06:42.000000000 +0100
    3 @@ -46,7 +46,7 @@
    4  
    5  
    6  
    7 -CLIENTS = clients/despotify clients/gateway clients/simple
    8 +CLIENTS = clients/despotify
    9  SUBDIRS = lib $(CLIENTS)
    10  
    11  .PHONY: all clean $(SUBDIRS) install uninstall

  • files/patch-Makefile.local.mk.dist.diff

     
    1 --- Makefile.local.mk.dist.orig 2009-03-07 22:40:55.000000000 +0100
    2 +++ Makefile.local.mk.dist      2009-03-07 22:40:56.000000000 +0100
    3 @@ -15,3 +15,7 @@
    4  ## Add more CFLAGS
    5  # CFLAGS += -DDEBUG_SNDQUEUE
    6  # CFLAGS += -DDEBUG_PACKETS
     1Index: Makefile.local.mk.dist
     2===================================================================
     3--- Makefile.local.mk.dist      (revision 515)
     4+++ Makefile.local.mk.dist      (working copy)
     5@@ -31,5 +31,5 @@
     6 
     7 ## If you're on Mac OS X and have installed libvorbisfile
     8 ## via 'port install ..', try uncommenting these lines
     9-# CFLAGS += -I/opt/local/include
     10-# LDFLAGS += -L/opt/local/lib
    711+CFLAGS += -I@PREFIX@/include
    812+LDFLAGS += -L@PREFIX@/lib
    9 +
    10 +

  • files/patch-clients-despotify-local.mk.diff

     
    1 --- clients/despotify/local.mk.orig     2009-03-07 23:17:52.000000000 +0100
    2 +++ clients/despotify/local.mk  2009-03-07 23:18:49.000000000 +0100
    3 @@ -36,8 +36,8 @@
    4         rm -f $(DESPOTIFY_OBJS) Makefile.dep
    5  
    6  install: despotify
    7 -       @echo "Copying despotify binary to /usr/bin/despotify"
    8 -       $(LT) --mode=install install despotify /usr/bin/despotify
    9 +       @echo "Copying despotify binary to @DESTROOT@@PREFIX@/bin/despotify"
    10 +       $(LT) --mode=install install despotify @DESTROOT@@PREFIX@/bin/despotify
    11  
    12  uninstall:
    13         @echo "Removing despotify..."

  • files/patch-lib-sndqueue.h.diff

     
     1Index: lib/sndqueue.h
     2===================================================================
     3--- lib/sndqueue.h      (revision 515)
     4+++ lib/sndqueue.h      (working copy)
     5@@ -13,9 +13,12 @@
     6 
     7 #if defined(__linux__)
     8        #include <endian.h>
     9-#endif
     10-#if defined(__FreeBSD__)
     11+#elif defined(__APPLE__)
     12        #include <machine/endian.h>
     13+       #define __BYTE_ORDER BYTE_ORDER
     14+       #define __LITTLE_ENDIAN LITTLE_ENDIAN
     15+#elif defined(__FreeBSD__)
     16+       #include <machine/endian.h>
     17        #define __BYTE_ORDER _BYTE_ORDER
     18        #define __LITTLE_ENDIAN _LITTLE_ENDIAN
     19 #endif

  • files/patch-lib-local.mk.diff

     
    1 --- lib/local.mk.orig   2009-03-08 01:20:15.000000000 +0100
    2 +++ lib/local.mk        2009-03-08 01:21:51.000000000 +0100
    3 @@ -5,7 +5,7 @@
    4  LIB_OBJS = aes.lo audio.lo auth.lo buffer.lo channel.lo commands.lo dns.lo esbuf.lo handlers.lo keyexchange.lo packet.lo playlist.lo puzzle.lo session.lo shn.lo sndqueue.lo util.lo xml.lo network.lo despotify.lo sha1.lo hmac.lo
     1Index: lib/local.mk
     2===================================================================
     3--- lib/local.mk        (revision 515)
     4+++ lib/local.mk        (working copy)
     5@@ -4,7 +4,7 @@
    56 
    6  CFLAGS += -Igstapp/
     7 LIB_OBJS = aes.lo auth.lo buf.lo cache.lo channel.lo commands.lo dns.lo ezxml.lo handlers.lo keyexchange.lo packet.lo puzzle.lo session.lo shn.lo sndqueue.lo util.lo network.lo despotify.lo sha1.lo hmac.lo xml.lo
     8 
    79-LDFLAGS += -rpath /usr/lib
    810+LDFLAGS += -rpath @PREFIX@/lib
     11 LDCONFIG = ldconfig
    912 
    1013 .PHONY: all clean install uninstall
    11  
    12 @@ -83,9 +83,8 @@
    13         $(LT) --mode=clean rm -f $(LIB_OBJS) Makefile.dep
    14  
    15  install: libdespotify.la
    16 -       # install despotify.h /usr/include
    17 -       $(LT) --mode=install install libdespotify.la /usr/lib/libdespotify.la
    18 -       ldconfig -n /usr/lib
    19 +       # install despotify.h @DESTROOT@@PREFIX@/include
    20 +       $(LT) --mode=install install libdespotify.la @DESTROOT@@PREFIX@/lib/libdespotify.la
    21  
    22  uninstall:
    23         # rm -f /usr/include/despotify.h

  • Portfile

     
    44PortSystem          1.0
    55
    66name                despotify
    7 version             20090307
    8 revision        1
     7version             20110115
    98categories          multimedia
    109maintainers         carljohancrafoord.se:mail
    1110description         Open source Spotify client
    … …  
    2120
    2221fetch.type          svn
    2322svn.url             https://despotify.svn.sourceforge.net/svnroot/despotify/src
    24 svn.revision        164
     23svn.revision        515
    2524
    2625worksrcdir          src
    2726
    28 patchfiles          patch-Makefile.diff \
    29                     patch-Makefile.local.mk.dist.diff \
    30                     patch-clients-despotify-local.mk.diff \
    31                     patch-lib-local.mk.diff
     27patchfiles          patch-Makefile.local.mk.dist.diff \
     28                    patch-lib-local.mk.diff \
     29                    patch-lib-sndqueue.h.diff
    3230
    3331post-patch {
    3432    reinplace s|@PREFIX@|${prefix}|g \
    3533        ${worksrcpath}/Makefile.local.mk.dist \
    36         ${worksrcpath}/clients/despotify/local.mk \
    3734        ${worksrcpath}/lib/local.mk
    3835}
    3936
    4037use_configure       no
    4138
    42 pre-destroot {
    43     reinplace s|@DESTROOT@|${destroot}|g \
    44         ${worksrcpath}/clients/despotify/local.mk \
    45         ${worksrcpath}/lib/local.mk
    46 }
     39build.args          CC="${configure.cc} ${configure.cc_archflags}" \
     40                    CLIENT_DESPOTIFY=1
     41
     42destroot.args       INSTALL_PREFIX=${destroot}${prefix}