diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/beep-media-player/Makefile | 13 | ||||
| -rw-r--r-- | multimedia/beep-media-player/files/patch-ltmain.sh | 51 | ||||
| -rw-r--r-- | multimedia/beep-media-player/pkg-plist | 2 |
3 files changed, 7 insertions, 59 deletions
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index fc7fd8d20b8d..dc2fabf57754 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -7,7 +7,7 @@ PORTNAME= beep-media-player PORTVERSION= 0.9.6.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -18,14 +18,13 @@ MAINTAINER= flynn@energyhq.es.eu.org COMMENT= GTK2 mp3 player USE_GNOME= gtk20 -USE_ICONV= yes WANT_GNOME= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 +LIBTOOLFILES= configure libbeep/configure USE_GMAKE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ INPUT_PLUGINS="${INPUT_PLUGINS}" \ @@ -75,7 +74,7 @@ CONFIGURE_ARGS+= --disable-esd PLIST_SUB+= ESDPLUGIN:="@comment " .endif -.if ${MACHINE_ARCH} != "i386" +.if ${ARCH} != "i386" WITHOUT_3DNOW= yes .endif @@ -111,8 +110,8 @@ pre-extract: .endif post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\(datadir\)/aclocal|(prefix)/share/aclocal|g' + @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ + ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \ diff --git a/multimedia/beep-media-player/files/patch-ltmain.sh b/multimedia/beep-media-player/files/patch-ltmain.sh deleted file mode 100644 index b56ac9ca9ad7..000000000000 --- a/multimedia/beep-media-player/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Nov 25 16:42:46 2003 -+++ ltmain.sh Sun Feb 8 00:05:54 2004 -@@ -1280,7 +1280,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ - continue - ;; - -+ -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; -+ - -module) - module=yes -+ build_old_libs=no - continue - ;; - -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist index dadbd155e4ac..a5d4a745a201 100644 --- a/multimedia/beep-media-player/pkg-plist +++ b/multimedia/beep-media-player/pkg-plist @@ -17,7 +17,7 @@ lib/bmp/Input/libmpg123.so lib/bmp/Output/libOSS.so %%ESDPLUGIN:%%lib/bmp/Output/libesdout.so lib/bmp/Visualization/libbscope.so -lib/pkgconfig/beep.pc +libdata/pkgconfig/beep.pc share/aclocal/beep.m4 share/bmp/Skins/Default/Avs.bmp share/bmp/Skins/Default/Balance.bmp |