diff options
author | nox <nox@FreeBSD.org> | 2012-01-11 04:51:04 +0800 |
---|---|---|
committer | nox <nox@FreeBSD.org> | 2012-01-11 04:51:04 +0800 |
commit | ae3dae6906cec466a8dd225889a6ddd0b7445a5d (patch) | |
tree | 4b2446f5357e95def579b209dd9e66c14116ad04 /multimedia | |
parent | eba4dca893b78bbed011f72eaaf365a89b671aac (diff) | |
download | freebsd-ports-gnome-ae3dae6906cec466a8dd225889a6ddd0b7445a5d.tar.gz freebsd-ports-gnome-ae3dae6906cec466a8dd225889a6ddd0b7445a5d.tar.zst freebsd-ports-gnome-ae3dae6906cec466a8dd225889a6ddd0b7445a5d.zip |
- (Attempt to) fix packaging on i386, and hopefully runtime there too.
- Bump PORTREVISION.
Submitted by: pointyhat via erwin
Diffstat (limited to 'multimedia')
4 files changed, 10 insertions, 9 deletions
diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile index 51b400ed77e1..13062b683288 100644 --- a/multimedia/xbmc-pvr/Makefile +++ b/multimedia/xbmc-pvr/Makefile @@ -7,6 +7,7 @@ PORTNAME= xbmc PORTVERSION= 58 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox PKGNAMESUFFIX= -pvr-ppa-odk @@ -229,9 +230,9 @@ post-patch: ${LN} -s libXBMC_gui-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-x86_64-linux.so ${LN} -s libXBMC_pvr-x86_64-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so .else - ${LN} -s libXBMC_addon-i386-freebsd.so ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon-i486-linux.so - ${LN} -s libXBMC_gui-i386-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-i486-linux.so - ${LN} -s libXBMC_pvr-i386-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-i486-linux.so + ${LN} -s libXBMC_addon-x86-freebsd.so ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon-x86-linux.so + ${LN} -s libXBMC_gui-x86-freebsd.so ${WRKSRC}/addons/library.xbmc.gui/libXBMC_gui-x86-linux.so + ${LN} -s libXBMC_pvr-x86-freebsd.so ${WRKSRC}/addons/library.xbmc.pvr/libXBMC_pvr-x86-linux.so .endif pre-configure: @@ -245,9 +246,9 @@ post-install: ${LN} -s libXBMC_gui-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-x86_64-linux.so ${LN} -s libXBMC_pvr-x86_64-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-x86_64-linux.so .else - ${LN} -s libXBMC_addon-i386-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-i486-linux.so - ${LN} -s libXBMC_gui-i386-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-i486-linux.so - ${LN} -s libXBMC_pvr-i386-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-i486-linux.so + ${LN} -s libXBMC_addon-x86-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.addon/libXBMC_addon-x86-linux.so + ${LN} -s libXBMC_gui-x86-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.gui/libXBMC_gui-x86-linux.so + ${LN} -s libXBMC_pvr-x86-freebsd.so ${PREFIX}/lib/xbmc/addons/library.xbmc.pvr/libXBMC_pvr-x86-linux.so .endif .include <bsd.port.post.mk> diff --git a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h index 0bf0700d9473..802692fd6a1f 100644 --- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h +++ b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.addon-libXBMC_addon.h @@ -25,7 +25,7 @@ #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-arm.so" #else /* !__x86_64__ && !__powerpc__ */ +#ifdef __FreeBSD__ -+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i386-freebsd.so" ++#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86-freebsd.so" +#else #define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-i486-linux.so" +#endif diff --git a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h index 713eaef89290..cdce867cbbdc 100644 --- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h +++ b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.gui-libXBMC_gui.h @@ -23,7 +23,7 @@ +#endif #else /* !__x86_64__ && !__powerpc__ && !_ARMEL */ +#ifdef __FreeBSD__ -+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i386-freebsd.so" ++#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86-freebsd.so" +#else #define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-i486-linux.so" +#endif diff --git a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h index 9cde7f07926e..64509e23ee5c 100644 --- a/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h +++ b/multimedia/xbmc-pvr/files/patch-addons-library.xbmc.pvr-libXBMC_pvr.h @@ -25,7 +25,7 @@ #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-arm.so" #else /* !__x86_64__ && !__powerpc__ */ +#ifdef __FreeBSD__ -+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i386-freebsd.so" ++#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86-freebsd.so" +#else #define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-i486-linux.so" +#endif |