diff options
| author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-08-28 13:25:49 +0000 |
|---|---|---|
| committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-08-28 13:25:49 +0000 |
| commit | 6f3ab834e26b3bf85f3bd7abf18863fdd9597c18 (patch) | |
| tree | 2dc706d4467b745657d9f667e201ad10d9605039 /audio | |
| parent | Update to 0.6.8 (diff) | |
- Fix build on 4.x [1]
- Allow GCC > 3.4
- Respect the vendor's choice of not installing static libraries
Reported by: pointyhat via kris, krion [1]
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gnomoradio/Makefile | 14 | ||||
| -rw-r--r-- | audio/gnomoradio/files/patch-rainbow_sha1.h | 20 | ||||
| -rw-r--r-- | audio/gnomoradio/pkg-plist | 4 |
3 files changed, 31 insertions, 7 deletions
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile index bd6389bcaff2..e9619fb0c59f 100644 --- a/audio/gnomoradio/Makefile +++ b/audio/gnomoradio/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomoradio PORTVERSION= 0.15.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio net MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,7 +23,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ ao:${PORTSDIR}/audio/libao USE_X_PREFIX= yes -USE_GCC= 3.4 +USE_GCC= 3.4+ USE_GNOME= gnomehack gnomeprefix USE_REINPLACE= yes INSTALLS_SHLIB= yes @@ -32,7 +32,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-patch: - @${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|' \ + @${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \ + s|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/roboradio/mp3/Makefile.in +patch-autotools: + @for file in ${LIBTOOLFILES}; do \ + ${REINPLACE_CMD} -e \ + '/^ltmain=/ s|$$ac_aux_dir/ltmain\.sh|${LTMAIN}|g' \ + ${PATCH_WRKSRC}/$$file; \ + done + .include <bsd.port.mk> diff --git a/audio/gnomoradio/files/patch-rainbow_sha1.h b/audio/gnomoradio/files/patch-rainbow_sha1.h new file mode 100644 index 000000000000..293864ccaa8a --- /dev/null +++ b/audio/gnomoradio/files/patch-rainbow_sha1.h @@ -0,0 +1,20 @@ +--- rainbow/sha1.h.orig Tue Aug 16 17:32:22 2005 ++++ rainbow/sha1.h Tue Aug 16 17:33:26 2005 +@@ -22,7 +22,7 @@ + #ifndef _SHA1_H_ + #define _SHA1_H_ + +-#include <stdint.h> ++#include <unistd.h> + /* + * If you do not have the ISO standard stdint.h header file, then you + * must typdef the following: +@@ -57,7 +57,7 @@ + uint32_t Length_High; /* Message length in bits */ + + /* Index into message block array */ +- int_least16_t Message_Block_Index; ++ int16_t Message_Block_Index; + uint8_t Message_Block[64]; /* 512-bit message blocks */ + + int Computed; /* Is the digest computed? */ diff --git a/audio/gnomoradio/pkg-plist b/audio/gnomoradio/pkg-plist index 1ae018e397b8..1eb757c526ed 100644 --- a/audio/gnomoradio/pkg-plist +++ b/audio/gnomoradio/pkg-plist @@ -24,16 +24,12 @@ include/roboradio/song.h include/roboradio/sort-songs.h include/roboradio/state.h include/roboradio/xspf.h -lib/librainbow.a lib/librainbow.so lib/librainbow.so.0 -lib/libroboradio-audio.a lib/libroboradio-audio.so lib/libroboradio-audio.so.0 -lib/libroboradio-mp3.a lib/libroboradio-mp3.so lib/libroboradio-mp3.so.0 -lib/libroboradio.a lib/libroboradio.so lib/libroboradio.so.0 sbin/rainbow-hub |