1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00

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
This commit is contained in:
Volker Stolz 2005-02-25 15:12:06 +00:00
parent 65b4b64c01
commit 5e91c03981
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=129772
5 changed files with 10 additions and 23 deletions

View File

@ -29,4 +29,6 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --enable-prefer-ape CONFIGURE_ARGS+= --enable-prefer-ape
.endif .endif
PLIST_FILES= lib/bmp/General/libbmp_scrobbler.so
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
lib/bmp/General/libbmp_scrobbler.so
@unexec rmdir %D/lib/bmp/General 2> /dev/null || true

View File

@ -36,7 +36,9 @@ INPUT_PLUGINS= cdaudio,mpg123
OUTPUT_PLUGINS= OSS OUTPUT_PLUGINS= OSS
VISUALIZATION_PLUGINS= blur_scope 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> .include <bsd.port.pre.mk>
@ -60,7 +62,7 @@ CONFIGURE_ARGS+= --disable-vorbis
PLIST_SUB+= VORBISPLUGIN:="@comment " PLIST_SUB+= VORBISPLUGIN:="@comment "
.endif .endif
.if ${HAVE_GNOME:Mesound}!="" .if defined(WITH_ESOUND)
USE_GNOME+= esound USE_GNOME+= esound
OUTPUT_PLUGINS+= esd OUTPUT_PLUGINS+= esd
PLIST_SUB+= ESDPLUGIN:="" PLIST_SUB+= ESDPLUGIN:=""
@ -91,24 +93,6 @@ post-extract:
${WRKSRC}/Visualization/blur_scope/Makefile.in ${WRKSRC}/Visualization/blur_scope/Makefile.in
.endif .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: post-patch:
@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in
@ -119,6 +103,7 @@ post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
post-install: post-install:
@${MKDIR} ${PREFIX}/lib/bmp/General
@${MKDIR} ${PREFIX}/share/beep/Skins @${MKDIR} ${PREFIX}/share/beep/Skins
@${CAT} ${PKGMESSAGE} @${CAT} ${PKGMESSAGE}

View File

@ -71,6 +71,7 @@ share/locale/sk/LC_MESSAGES/bmp.mo
share/locale/sv/LC_MESSAGES/bmp.mo share/locale/sv/LC_MESSAGES/bmp.mo
share/locale/zh_CN/LC_MESSAGES/bmp.mo share/locale/zh_CN/LC_MESSAGES/bmp.mo
@unexec rmdir %D/share/applications 2>/dev/null || true @unexec rmdir %D/share/applications 2>/dev/null || true
@exec mkdir -p %D/share/beep/Skins
@dirrm share/beep/Skins @dirrm share/beep/Skins
@dirrm share/beep @dirrm share/beep
@dirrm share/bmp/Skins/Default @dirrm share/bmp/Skins/Default
@ -81,5 +82,7 @@ share/locale/zh_CN/LC_MESSAGES/bmp.mo
@dirrm lib/bmp/Visualization @dirrm lib/bmp/Visualization
@dirrm lib/bmp/Output @dirrm lib/bmp/Output
@dirrm lib/bmp/Input @dirrm lib/bmp/Input
@exec mkdir -p %D/lib/bmp/General
@dirrm lib/bmp/General
@dirrm lib/bmp @dirrm lib/bmp
@dirrm include/bmp @dirrm include/bmp

View File

@ -22,4 +22,3 @@ share/bmp/status_docklet/timetre-idle.xpm
share/bmp/status_docklet/timetre-paused-anim.xpm share/bmp/status_docklet/timetre-paused-anim.xpm
share/bmp/status_docklet/timetre-playing-anim.xpm share/bmp/status_docklet/timetre-playing-anim.xpm
@dirrm share/bmp/status_docklet @dirrm share/bmp/status_docklet
@dirrm lib/bmp/General