Attachment 114747 Details for Bug 156456 – file.diff

[patch] file.diff

file.diff (text/plain), 6.41 KB, created by Olivier Duchateau on 2011-04-17 16:40:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2011-04-17 16:40:09 UTC

Size: 6.41 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/xfce4-parole/Makefile xfce4-parole/Makefile
>--- /usr/ports/multimedia/xfce4-parole/Makefile	2011-03-03 11:12:23.000000000 +0100
>+++ xfce4-parole/Makefile	2011-04-17 17:25:02.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	xfce4-parole
>-PORTVERSION=	0.2.0.2
>-PORTREVISION=	4
>+PORTVERSION=	0.2.0.6
> CATEGORIES=	multimedia xfce
> MASTER_SITES=	${MASTER_SITE_XFCE}
> MASTER_SITE_SUBDIR=/src/apps/parole/0.2
>@@ -17,25 +16,53 @@
> MAINTAINER=	miwi@FreeBSD.org
> COMMENT=	Lightweight media player for Xfce4 based on the gstreamer engine
> 
>-LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
>+DATADIR=	${PREFIX}/share/${PORTNAME:S/xfce4-//}
> 
>+LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
>+		notify.1:${PORTSDIR}/devel/libnotify \
>+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
>+
>+USE_AUTOTOOLS=	libtool
> GNU_CONFIGURE=	yes
> INSTALLS_ICONS=	yes
> USE_BZIP2=	yes
>-USE_GSTREAMER=	ffmpeg good theora xvid mp3 faad ogg dvd x264
>+USE_GSTREAMER=	ffmpeg good theora xvid mp3 faad ogg dvd x264 \
>+		flac wavpack soup 
> USE_GMAKE=	yes
>-CONFIGURE_ARGS=	--disable-power-manager-plugin --disable-browser-plugin
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
>-USE_GNOME=	gnomehack intltool intlhack pkgconfig
>-USE_XFCE=	configenv libexo libgui libutil panel
>+CONFIGURE_ARGS=	--disable-power-manager-plugin \
>+		--enable-libnotify \
>+		--enable-taglib \
>+		--disable-gtk-doc-html \
>+		--without-html-dir
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib" \
>+		ac_cv_prog_AWK="${AWK}"
>+USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack pkgconfig \
>+		desktopfileutils
>+USE_XFCE=	configenv libgui libutil
> USE_XORG=	x11 sm
>+USE_LDCONFIG=	yes
>+
>+OPTIONS=	NLS "Enable Native Language Support" on \
>+		CDDA "Enable CD audio support" on
>+
>+.include <bsd.port.pre.mk>
> 
> .if !defined(WITHOUT_NLS)
> USE_GETTEXT=	yes
>+CONFIGURE_ARGS+=	--enable-nls
> PLIST_SUB+=	NLS=""
> .else
> CONFIGURE_ARGS+=	--disable-nls
> PLIST_SUB+=	NLS="@comment "
> .endif
> 
>-.include <bsd.port.mk>
>+.if !defined(WITHOUT_CDDA)
>+LIB_DEPENDS+=	cdio++.0:${PORTSDIR}/sysutils/gstreamer-plugins-cdio
>+USE_GSTREAMER+=	cdaudio
>+.endif
>+
>+post-install:
>+	@-update-desktop-database
>+
>+.include <bsd.port.post.mk>
>diff -urN /usr/ports/multimedia/xfce4-parole/distinfo xfce4-parole/distinfo
>--- /usr/ports/multimedia/xfce4-parole/distinfo	2010-02-12 18:16:18.000000000 +0100
>+++ xfce4-parole/distinfo	2011-04-17 17:24:11.000000000 +0200
>@@ -1,3 +1,2 @@
>-MD5 (xfce4/parole-0.2.0.2.tar.bz2) = c304b07c3f17feefe3879bacd6e54515
>-SHA256 (xfce4/parole-0.2.0.2.tar.bz2) = c6b669cda652ccfb4b5c6c4aab882bf67bb0a8bd3ee4abe42a9b8fb3e6860195
>-SIZE (xfce4/parole-0.2.0.2.tar.bz2) = 644981
>+SHA256 (xfce4/parole-0.2.0.6.tar.bz2) = 1bfcb6ca34eb496bc08ce3ac803a20b4fea566bddca4ce4400d3edf7b25804b6
>+SIZE (xfce4/parole-0.2.0.6.tar.bz2) = 652946
>diff -urN /usr/ports/multimedia/xfce4-parole/files/patch-configure xfce4-parole/files/patch-configure
>--- /usr/ports/multimedia/xfce4-parole/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ xfce4-parole/files/patch-configure	2011-04-17 17:24:11.000000000 +0200
>@@ -0,0 +1,24 @@
>+--- configure.orig	2010-01-25 12:47:28.000000000 +0100
>++++ configure	2011-03-11 17:11:27.000000000 +0100
>+@@ -20717,17 +20717,17 @@
>+ if test "x${prefix}" = "xNONE"; then
>+ 
>+ cat >>confdefs.h <<_ACEOF
>+-#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
>++#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/pixmaps"
>+ _ACEOF
>+ 
>+-  pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
>++  pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/pixmaps"
>+ else
>+ 
>+ cat >>confdefs.h <<_ACEOF
>+-#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
>++#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/pixmaps"
>+ _ACEOF
>+ 
>+-  pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
>++  pixmapsdir="${prefix}/${DATADIRNAME}/pixmaps"
>+ fi
>+ 
>+ 
>diff -urN /usr/ports/multimedia/xfce4-parole/pkg-plist xfce4-parole/pkg-plist
>--- /usr/ports/multimedia/xfce4-parole/pkg-plist	2010-11-08 00:35:55.000000000 +0100
>+++ xfce4-parole/pkg-plist	2011-04-17 17:24:11.000000000 +0200
>@@ -7,10 +7,13 @@
> include/parole/parole-provider-plugin.h
> include/parole/parole-stream.h
> include/parole/parole.h
>+lib/parole-0/stream-properties.a
> lib/parole-0/stream-properties.la
> lib/parole-0/stream-properties.so
>+lib/parole-0/tray-icon.a
> lib/parole-0/tray-icon.la
> lib/parole-0/tray-icon.so
>+lib/parole-0/window-title.a
> lib/parole-0/window-title.la
> lib/parole-0/window-title.so
> share/applications/parole.desktop
>@@ -24,31 +27,38 @@
> %%NLS%%share/locale/cs/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/da/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/de/LC_MESSAGES/parole.mo
>+%%NLS%%share/locale/el/LC_MESSAGES/parole.mo
>+%%NLS%%share/locale/en_GB/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/es/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/eu/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/fr/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/gl/LC_MESSAGES/parole.mo
>+%%NLS%%share/locale/hu/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/id/LC_MESSAGES/parole.mo
>+%%NLS%%share/locale/it/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/ja/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/lv/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/pt/LC_MESSAGES/parole.mo
>+%%NLS%%share/locale/pt_BR/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/sk/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/sv/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/tr/LC_MESSAGES/parole.mo
>+%%NLS%%share/locale/ug/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/uk/LC_MESSAGES/parole.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/parole.mo
>-share/parole/parole-plugins-0/stream-properties.desktop
>-share/parole/parole-plugins-0/system-tray.desktop
>-share/parole/parole-plugins-0/window-title.desktop
>-share/parole/pixmaps/parole.png
>-@dirrm share/parole/pixmaps
>-@dirrm share/parole/parole-plugins-0
>-@dirrm share/parole
>+%%DATADIR%%/parole-plugins-0/stream-properties.desktop
>+%%DATADIR%%/parole-plugins-0/system-tray.desktop
>+%%DATADIR%%/parole-plugins-0/window-title.desktop
>+share/pixmaps/loader.gif
>+share/pixmaps/parole.png
>+@dirrm %%DATADIR%%/parole-plugins-0
>+@dirrm %%DATADIR%%
>+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
>+%%NLS%%@dirrmtry share/locale/ug
> %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
> %%NLS%%@dirrmtry share/locale/ast
>-@dirrmtry share/applications
> @dirrm lib/parole-0
> @dirrm include/parole
> @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 156456: 114747