diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-02-25 15:12:06 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-02-25 15:12:06 +0000 |
| commit | 5e91c039817d127510f1b8e7f12a22875d3ba1e6 (patch) | |
| tree | 985b9b7fdfda9e0eef0ff84fca6526fd05de2ab0 /multimedia/beep-media-player | |
| parent | 65b4b64c012129f42a174e63d9a00582a04219ab (diff) | |
| download | ports-5e91c039817d127510f1b8e7f12a22875d3ba1e6.tar.gz ports-5e91c039817d127510f1b8e7f12a22875d3ba1e6.zip | |
Fix "ownership" of lib/bmp/General and make the plugins respect the new
world order (i.e. they shouldn't try to remove this directory)
Induced by PR: ports/77618
Submitted by: beep-media-player maintainer
Notes
Notes:
svn path=/head/; revision=129772
Diffstat (limited to 'multimedia/beep-media-player')
| -rw-r--r-- | multimedia/beep-media-player/Makefile | 25 | ||||
| -rw-r--r-- | multimedia/beep-media-player/pkg-plist | 3 |
2 files changed, 8 insertions, 20 deletions
diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index c0ec9cc264c8..05bddf710e89 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -36,7 +36,9 @@ INPUT_PLUGINS= cdaudio,mpg123 OUTPUT_PLUGINS= OSS VISUALIZATION_PLUGINS= blur_scope -PLIST_SUB= DATADIR="share" +OPTIONS= VORBIS "Enable Ogg Vorbis support" on \ + ESOUND "Enable Esound support" off \ + 3DNOW "Enable 3DNow! optimized decoding routines" on .include <bsd.port.pre.mk> @@ -60,7 +62,7 @@ CONFIGURE_ARGS+= --disable-vorbis PLIST_SUB+= VORBISPLUGIN:="@comment " .endif -.if ${HAVE_GNOME:Mesound}!="" +.if defined(WITH_ESOUND) USE_GNOME+= esound OUTPUT_PLUGINS+= esd PLIST_SUB+= ESDPLUGIN:="" @@ -91,24 +93,6 @@ post-extract: ${WRKSRC}/Visualization/blur_scope/Makefile.in .endif -pre-extract: -.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 ) || ${HAVE_GNOME:Mesound}!="" - @${ECHO_MSG} -.if !defined(WITHOUT_MIKMOD) - @${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD." -.endif -.if !defined(WITHOUT_VORBIS) - @${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS." -.endif -.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 - @${ECHO_MSG} "You can disable 3DNow! optimized decoding routines by defining WITHOUT_3DNOW." -.endif -.if ${HAVE_GNOME:Mesound}!="" - @${ECHO_MSG} "You can disable support for esound by defining WITHOUT_GNOME=esound." -.endif - @${ECHO_MSG} -.endif - post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in @@ -119,6 +103,7 @@ post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f post-install: + @${MKDIR} ${PREFIX}/lib/bmp/General @${MKDIR} ${PREFIX}/share/beep/Skins @${CAT} ${PKGMESSAGE} diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist index dd9849275525..036ec5c44007 100644 --- a/multimedia/beep-media-player/pkg-plist +++ b/multimedia/beep-media-player/pkg-plist @@ -71,6 +71,7 @@ share/locale/sk/LC_MESSAGES/bmp.mo share/locale/sv/LC_MESSAGES/bmp.mo share/locale/zh_CN/LC_MESSAGES/bmp.mo @unexec rmdir %D/share/applications 2>/dev/null || true +@exec mkdir -p %D/share/beep/Skins @dirrm share/beep/Skins @dirrm share/beep @dirrm share/bmp/Skins/Default @@ -81,5 +82,7 @@ share/locale/zh_CN/LC_MESSAGES/bmp.mo @dirrm lib/bmp/Visualization @dirrm lib/bmp/Output @dirrm lib/bmp/Input +@exec mkdir -p %D/lib/bmp/General +@dirrm lib/bmp/General @dirrm lib/bmp @dirrm include/bmp |