Changeset 79953
- Timestamp:
- 06/30/11 01:25:06 (4 years ago)
- Location:
- trunk/dports/audio/daapd
- Files:
-
- 2 added
- 4 edited
-
Portfile (modified) (3 diffs)
-
files/patch-daaplib-src-makefile (modified) (2 diffs)
-
files/patch-ip_acl.c (added)
-
files/patch-libhttpd-Site.mm.in (added)
-
files/patch-makefile (modified) (3 diffs)
-
files/patch-select.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dports/audio/daapd/Portfile
r69503 r79953 27 27 port:howl 28 28 29 patchfiles patch-daapd.cc patch-daapd.8 patch-daaplib-src-makefile patch-select.h patch-makefile 29 patchfiles patch-daapd.cc patch-daapd.8 patch-daaplib-src-makefile \ 30 patch-select.h patch-makefile patch-ip_acl.c \ 31 patch-libhttpd-Site.mm.in 30 32 31 33 post-extract { 32 34 # Convert DOS to UNIX line endings so we can patch 33 35 reinplace "s|\r||g" ${worksrcpath}/daaplib/src/makefile 36 } 37 38 if {${configure.compiler} != "gcc-4.0"} { 39 configure.cxxflags-append -ffriend-injection 34 40 } 35 41 … … 39 45 ${worksrcpath}/daaplib/src/makefile \ 40 46 ${worksrcpath}/makefile 47 reinplace s|@CXX@|${configure.cxx}|g ${worksrcpath}/makefile \ 48 ${worksrcpath}/daaplib/src/makefile 49 reinplace "s|@CFLAGS@|${configure.cxxflags} ${configure.cxx_archflags}|g" \ 50 ${worksrcpath}/makefile \ 51 ${worksrcpath}/daaplib/src/makefile 41 52 } 42 53 … … 49 60 50 61 use_configure no 62 use_parallel_build no 51 63 52 64 livecheck.type regex -
trunk/dports/audio/daapd/files/patch-daaplib-src-makefile
r69504 r79953 1 --- daaplib/src/makefile.orig 2006-03-05 07:39:36.000000000 -0600 2 +++ daaplib/src/makefile 2010-07-07 22:49:56.000000000 -0500 3 @@ -8,8 +8,8 @@ 1 --- daaplib/src/makefile.orig 2011-06-30 13:03:38.000000000 +1000 2 +++ daaplib/src/makefile 2011-06-30 13:06:05.000000000 +1000 3 @@ -1,4 +1,4 @@ 4 -CC = g++ 5 +CC = @CXX@ 6 AR = ar 7 CP = cp 8 RM = rm 9 @@ -8,10 +8,10 @@ 4 10 5 11 LIBS = … … 10 16 +INCDEPLOY = @PREFIX@/include 11 17 INCPATH = ../include 12 CFLAGS = -Wall -Wno-multichar 18 -CFLAGS = -Wall -Wno-multichar 19 +CFLAGS = @CFLAGS@ -Wall -Wno-multichar 13 20 21 .cpp.o: 22 $(CC) $(CFLAGS) -I$(INCPATH) -c $< -
trunk/dports/audio/daapd/files/patch-makefile
r69503 r79953 1 --- makefile.orig 2006-03-05 07:39:37.000000000 -0600 2 +++ makefile 2010-07-07 23:09:13.000000000 -0500 3 @@ -14,16 +14,16 @@ 1 --- makefile.orig 2006-03-06 00:39:37.000000000 +1100 2 +++ makefile 2011-06-30 13:31:16.000000000 +1000 3 @@ -8,22 +8,22 @@ 4 # no need to touch anything below this line 5 # ----------------------------------------- 6 7 -CC = g++ 8 +CC = @CXX@ 9 MAKE = $(MAKE_COMMAND) 10 TARGET = daapd 4 11 DEPS = daaplib_ libhttpd_ 5 12 OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o util.o … … 12 19 +INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I@PREFIX@/include 13 20 +DEPLOY = @PREFIX@ 14 +CFLAGS = -Wall -Wno-multichar $(PTHREAD_CFLAGS)21 +CFLAGS = @CFLAGS@ -Wall -Wno-multichar $(PTHREAD_CFLAGS) 15 22 16 23 # HOWL … … 24 31 HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) 25 32 INCPATH := $(INCPATH) -I$(HOWLRECENT) 33 @@ -71,7 +71,7 @@ 34 cd daaplib/src && $(MAKE) 35 36 libhttpd_: 37 - if test ! -e libhttpd/Site.mm; then cd libhttpd && ./configure; fi 38 + if test ! -e libhttpd/Site.mm; then cd libhttpd && env CC="$(CC)" CXX="$(CC)" CFLAGS="$(CFLAGS)" ./configure; fi 39 cd libhttpd && $(MAKE) 40 41 clean: -
trunk/dports/audio/daapd/files/patch-select.h
r69503 r79953 1 --- libhttpd/src/select.h.orig 20 06-03-05 08:00:38.000000000 -06002 +++ libhttpd/src/select.h 201 0-07-07 22:45:33.000000000 -05001 --- libhttpd/src/select.h.orig 2011-06-30 17:41:19.000000000 +1000 2 +++ libhttpd/src/select.h 2011-06-30 17:37:20.000000000 +1000 3 3 @@ -38,7 +38,7 @@ 4 4 … … 6 6 #ifndef _SOCKLEN_T 7 7 - typedef int socklen_t; 8 + typedef __uint32_t socklen_t;8 + typedef unsigned int socklen_t; 9 9 #define _SOCKLEN_T 10 10 #endif 11 11 #endif 12 @@ -68,6 +68,8 @@ struct Client { 13 14 struct httpd; 15 16 +#define NULL_ITERATOR static_cast<ClientIterator>(0) 17 + 18 class Clients { 19 protected: 20 std::list<Client> clientList; 21 @@ -81,7 +83,7 @@ protected: 22 c++; 23 } 24 25 - return 0; 26 + return NULL_ITERATOR; 27 } 28 29 30 @@ -154,7 +156,7 @@ public: 31 32 void erase( const int fDesc ) { 33 ClientIterator c; 34 - if ((c = locateFDesc(fDesc)) != 0) { 35 + if ((c = locateFDesc(fDesc)) != NULL_ITERATOR) { 36 clientList.erase(c); 37 close(fDesc); 38 } 39 @@ -162,14 +164,14 @@ public: 40 41 void finish( const int fDesc ) { 42 ClientIterator c; 43 - if ((c = locateFDesc(fDesc)) != 0) { 44 + if ((c = locateFDesc(fDesc)) != NULL_ITERATOR) { 45 c->finished = true; 46 } 47 } 48 49 void address( const int fDesc, char address[HTTP_IP_ADDR_LEN] ) { 50 ClientIterator c; 51 - if ((c = locateFDesc(fDesc)) != 0) { 52 + if ((c = locateFDesc(fDesc)) != NULL_ITERATOR) { 53 strncpy(address, c->address, HTTP_IP_ADDR_LEN); 54 } 55 } 56 @@ -180,7 +182,7 @@ public: 57 58 int readBuf(const int fDesc, char *destBuf, const uint len) { 59 ClientIterator c; 60 - if ((c = locateFDesc(fDesc)) == 0) { 61 + if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { 62 // printf("unknown client id %d\n", fDesc); 63 return 0; 64 } 65 @@ -192,7 +194,7 @@ public: 66 67 int readLine(const int fDesc, char *destBuf, const uint len) { 68 ClientIterator c; 69 - if ((c = locateFDesc(fDesc)) == 0) { 70 + if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { 71 // printf("unknown client id %d\n", fDesc); 72 return 0; 73 } 74 @@ -217,7 +219,7 @@ public: 75 int handleWrite(int socket) { 76 int bytesWritten; 77 ClientIterator c; 78 - if ((c = locateFDesc(socket)) == 0) { 79 + if ((c = locateFDesc(socket)) == NULL_ITERATOR) { 80 // printf("unknown client id %d\n", socket); 81 return 2; 82 } 83 @@ -260,7 +262,7 @@ public: 84 return 1; 85 } else { 86 ClientIterator c; 87 - if ((c = locateFDesc(fDesc)) == 0) { 88 + if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { 89 // printf("unknown client id %d\n", fDesc); 90 return 2; 91 } 92 @@ -304,7 +306,7 @@ public: 93 94 void doWrite(const int fDesc, const char* string, const uint len) { 95 ClientIterator c; 96 - if ((c = locateFDesc(fDesc)) == 0) { 97 + if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { 98 //printf("unknown client id %d\n", fDesc); 99 return; 100 } 101 @@ -318,7 +320,7 @@ public: 102 103 void doWrite(const int fDesc, const char* string) { 104 ClientIterator c; 105 - if ((c = locateFDesc(fDesc)) == 0) { 106 + if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { 107 //printf("unknown client id %d\n", fDesc); 108 return; 109 } 110 @@ -351,7 +353,7 @@ public: 111 112 void queueFile(const int socket, const int pendingFile ) { 113 ClientIterator c; 114 - if ((c = locateFDesc(socket)) == 0) { 115 + if ((c = locateFDesc(socket)) == NULL_ITERATOR) { 116 // printf("unknown client id %d\n", socket); 117 return; 118 } 119 @@ -360,7 +362,7 @@ public: 120 121 void subscribe(const int fDesc) { 122 ClientIterator c; 123 - if ((c = locateFDesc(fDesc)) == 0) { 124 + if ((c = locateFDesc(fDesc)) == NULL_ITERATOR) { 125 //printf("unknown client id %d\n", fDesc); 126 return; 127 }
Note: See TracChangeset
for help on using the changeset viewer.