diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2012-04-08 16:26:14 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2012-04-08 16:26:14 +0000 |
commit | feac48bd45edcfe259527430c83af463c779e214 (patch) | |
tree | 403a53ecf5818ec070eb68424395d2d3ef6736d6 | |
parent | 141a17e4837c6451a342b610941abb43e6de744c (diff) | |
download | ports-feac48bd45edcfe259527430c83af463c779e214.tar.gz ports-feac48bd45edcfe259527430c83af463c779e214.zip |
- Fix build
PR: 166016
Submitted by: Ports Fury
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=294387
-rw-r--r-- | audio/timidity++-xaw/Makefile | 4 | ||||
-rw-r--r-- | audio/timidity++-xaw/pkg-plist | 5 | ||||
-rw-r--r-- | audio/timidity++/Makefile.interface | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/audio/timidity++-xaw/Makefile b/audio/timidity++-xaw/Makefile index 090546d9bd74..4d0e5ee586ba 100644 --- a/audio/timidity++-xaw/Makefile +++ b/audio/timidity++-xaw/Makefile @@ -12,8 +12,4 @@ COMMENT= Xaw interface for TiMidity++ MASTERDIR= ${.CURDIR}/../../audio/timidity++ -PLIST_SUB= REALPREFIX=${PREFIX} - -BROKEN= does not install properly after X11BASE removal - .include "${MASTERDIR}/Makefile" diff --git a/audio/timidity++-xaw/pkg-plist b/audio/timidity++-xaw/pkg-plist index 6df2562f5b50..aa48fb9ddb83 100644 --- a/audio/timidity++-xaw/pkg-plist +++ b/audio/timidity++-xaw/pkg-plist @@ -1,8 +1,6 @@ -@cwd %%X11BASE%% +bin/xawmidi lib/X11/app-defaults/TiMidity lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity -@cwd %%REALPREFIX%% -bin/xawmidi %%TIMID_LIBDIR%%/bitmaps/back.xbm %%TIMID_LIBDIR%%/bitmaps/fwrd.xbm %%TIMID_LIBDIR%%/bitmaps/next.xbm @@ -18,6 +16,5 @@ bin/xawmidi %%PORTDOCS%%%%DOCSDIR%%/README.xaw %%PORTDOCS%%share/doc/ja/timidity++/README.xaw @dirrm %%TIMID_LIBDIR%%/bitmaps -@cwd %%X11BASE%% @dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults @dirrmtry lib/X11/%%EUCJP_LOCALE%% diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface index 0eeb8bc0589d..1f692e28ea99 100644 --- a/audio/timidity++/Makefile.interface +++ b/audio/timidity++/Makefile.interface @@ -117,11 +117,11 @@ post-install:: ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR} .endif .if ${INTERFACE} == "xaw" - @${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults + @${MKDIR} ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \ - ${X11BASE}/lib/X11/app-defaults/TiMidity + ${PREFIX}/lib/X11/app-defaults/TiMidity ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \ - ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity + ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity .endif .if defined(LINK) ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK} |