Attachment 145962 Details for Bug 192787 – deskutils_global-menu.diff

[patch] deskutils_global-menu.diff

deskutils_global-menu.diff (text/plain), 6.73 KB, created by tkato432 on 2014-08-18 18:31:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-18 18:31:05 UTC

Size: 6.73 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/global-menu/Makefile deskutils/global-menu/Makefile
>--- /usr/ports/deskutils/global-menu/Makefile	2014-07-24 03:56:35.000000000 +0900
>+++ deskutils/global-menu/Makefile	2014-08-16 11:41:54.000000000 +0900
>@@ -1,61 +1,57 @@
> # Created by: Gustavo Perez
> # $FreeBSD: head/deskutils/global-menu/Makefile 362705 2014-07-23 16:44:27Z bapt $
> 
>-PORTNAME=		gnome-globalmenu
>-PORTVERSION=		0.7.10
>-PORTREVISION=	3
>-CATEGORIES=		deskutils
>-MASTER_SITES=		http://gnome2-globalmenu.googlecode.com/files/
>+PORTNAME=	gnome-globalmenu
>+PORTVERSION=	0.7.10
>+PORTREVISION=	4
>+CATEGORIES=	deskutils
>+MASTER_SITES=	GOOGLE_CODE
>+PROJECTHOST=	gnome2-globalmenu
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=		Global menu for gnome
>+COMMENT=	Global menu bar for GNOME
> 
>-LIB_DEPENDS=		libnotify.so:${PORTSDIR}/devel/libnotify
>+LICENSE=	GPLv2
> 
>-USE_GNOME=		gnomepanel gnomedesktop
>+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
>+
>+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
>+USE_GNOME=	gconf2 gnomemenus libwnck
>+USE_AUTOTOOLS=	autoconf:env automake:env
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-schemas-install
>+INSTALL_TARGET=	install-strip
>+USE_LDCONFIG=	yes
>+INSTALLS_ICONS=	yes
> 
>-USE_BZIP2=		yes
>-USE_LDCONFIG=		yes
>-GNU_CONFIGURE=		yes
>-USES=			gmake pkgconfig
>-USE_AUTOTOOLS=		libtool automake:env autoheader:env
>-INSTALLS_ICONS=		yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS_DEFINE=		XFCE4_PANEL NLS
>-XFCE4_PANEL_DESC=	Xfce panel applet
>-
>-NO_STAGE=	yes
>+GCONF_SCHEMAS=	gnome-globalmenu.schemas
> 
> BROKEN_sparc64=	Leaves files behind on deinstall on sparc64
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MXFCE4_PANEL}
>-USE_XFCE=	panel
>-CONFIGURE_ARGS+=	--with-xfce4-panel
>-PLIST_SUB+=		XFCE4_PANEL=""
>-.else
>-CONFIGURE_ARGS+=	--without-xfce4-panel
>-PLIST_SUB+=		XFCE4_PANEL="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-PLIST_SUB+=		NLS=""
>-.else
>-CONFIGURE_ARGS+=	--disable-nls
>-PLIST_SUB+=		NLS="@comment "
>-.endif
>-
>-MAN1=			gnome-globalmenu.1
>-
>-GCONF_SCHEMAS=		gnome-globalmenu.schemas
>-
>-post-install:
>-		@${INSTALL_DATA} ${WRKSRC}/applet/GlobalMenu_PanelApplet.server \
>-			${LOCALBASE}/libdata/bonobo/servers
>-		@${CAT} ${PKGMESSAGE}
>+OPTIONS_DEFINE=		DOCS GNOME XFCE
>+OPTIONS_DEFAULT=	GNOME
>+OPTIONS_SUB=		yes
>+
>+GNOME_DESC=		Gnome panel applet
>+GNOME_USE=		gnome=gnomepanel
>+GNOME_CONFIGURE_WITH=	gnome-panel
>+XFCE_DESC=		Xfce panel applet
>+XFCE_USE=		xfce=panel
>+XFCE_CONFIGURE_WITH=	xfce4-panel
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e \
>+		'/^doc_DATA/s| COPYING | |' \
>+		${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|@BONOBO_SERVER_DIR@|${PREFIX}/libdata/bonobo/servers|' \
>+		${WRKSRC}/applet/Makefile.in
>+	@${REINPLACE_CMD} -e \
>+		's|@XFCE4_PANEL_PLUGIN_DIR@|${PREFIX}/libexec/xfce4/panel-plugins| ; \
>+		 s|@XFCE4_PANEL_DESKTOP_DIR@|${PREFIX}/share/xfce4/panel-plugins|' \
>+		${WRKSRC}/xfce/Makefile.in
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/deskutils/global-menu/files/patch-makefile.am deskutils/global-menu/files/patch-makefile.am
>--- /usr/ports/deskutils/global-menu/files/patch-makefile.am	2014-06-21 17:54:22.000000000 +0900
>+++ deskutils/global-menu/files/patch-makefile.am	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- libserver/Makefile.am.orig	2010-11-29 16:10:04.000000000 +0200
>-+++ libserver/Makefile.am	2010-11-29 16:10:11.000000000 +0200
>-@@ -31,7 +31,7 @@
>- libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu
>- libglobalmenu_server_include_HEADERS = globalmenu-server.h
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = globalmenu-server.pc
>- 
>- libglobalmenu_server_la_SOURCES = \
>diff -urN /usr/ports/deskutils/global-menu/files/patch-makefile.in deskutils/global-menu/files/patch-makefile.in
>--- /usr/ports/deskutils/global-menu/files/patch-makefile.in	2014-06-21 17:54:22.000000000 +0900
>+++ deskutils/global-menu/files/patch-makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- libserver/Makefile.in.orig	2010-11-29 16:10:57.000000000 +0200
>-+++ libserver/Makefile.in	2010-11-29 16:11:26.000000000 +0200
>-@@ -325,7 +325,7 @@
>- lib_LTLIBRARIES = libglobalmenu-server.la
>- libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu
>- libglobalmenu_server_include_HEADERS = globalmenu-server.h
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = globalmenu-server.pc
>- libglobalmenu_server_la_SOURCES = \
>- 						$(VALASOURCES:.vala=.c) \
>diff -urN /usr/ports/deskutils/global-menu/pkg-plist deskutils/global-menu/pkg-plist
>--- /usr/ports/deskutils/global-menu/pkg-plist	2014-06-21 17:54:22.000000000 +0900
>+++ deskutils/global-menu/pkg-plist	2014-08-16 11:26:50.000000000 +0900
>@@ -1,24 +1,22 @@
> bin/globalmenu-settings
> include/gnome-globalmenu/globalmenu-server.h
>-lib/bonobo/servers/GlobalMenu_PanelApplet.server
>-lib/libglobalmenu-server.la
>+lib/gtk-2.0/modules/libglobalmenu-gnome-panel.so
>+lib/gtk-2.0/modules/libglobalmenu-plugin.so
> lib/libglobalmenu-server.so
> lib/libglobalmenu-server.so.3
>+lib/libglobalmenu-server.so.3.0.0
>+%%GNOME%%libdata/bonobo/servers/GlobalMenu_PanelApplet.server
> libdata/pkgconfig/globalmenu-server.pc
>-libdata/bonobo/servers/GlobalMenu_PanelApplet.server
>-lib/gtk-2.0/modules/libglobalmenu-plugin.so
>-lib/gtk-2.0/modules/libglobalmenu-plugin.la
>-lib/gtk-2.0/modules/libglobalmenu-gnome-panel.so
>-lib/gtk-2.0/modules/libglobalmenu-gnome-panel.la
>-libexec/GlobalMenu.PanelApplet
>-%%DOCSDIR%%/README
>-%%DOCSDIR%%/COPYING
>-%%DOCSDIR%%/ChangeLog
>-%%DOCSDIR%%/AUTHORS
>-%%DOCSDIR%%/INSTALL
>-%%DOCSDIR%%/README.XFCE
>-%%DOCSDIR%%/README.GNOME
>-%%DOCSDIR%%/README.LEGACY
>+%%GNOME%%libexec/GlobalMenu.PanelApplet
>+%%XFCE%%libexec/xfce4/panel-plugins/GlobalMenu.XFCEPlugin
>+man/man1/gnome-globalmenu.1.gz
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/README.GNOME
>+%%PORTDOCS%%%%DOCSDIR%%/README.LEGACY
>+%%PORTDOCS%%%%DOCSDIR%%/README.XFCE
> share/locale/ca/LC_MESSAGES/gnome-globalmenu.mo
> share/locale/da/LC_MESSAGES/gnome-globalmenu.mo
> share/locale/de/LC_MESSAGES/gnome-globalmenu.mo
>@@ -48,10 +46,11 @@
> share/locale/uk/LC_MESSAGES/gnome-globalmenu.mo
> share/locale/zh_CN/LC_MESSAGES/gnome-globalmenu.mo
> share/pixmaps/globalmenu.png
>+%%XFCE%%share/pixmaps/globalmenu-xfce.png
>+%%XFCE%%share/xfce4/panel-plugins/GlobalMenu_XFCEPlugin.desktop
>+%%XFCE%%@dirrmtry share/xfce4/panel-plugins
>+%%XFCE%%@dirrmtry share/xfce4
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+%%XFCE%%@dirrmtry libexec/xfce4/panel-plugins
>+%%XFCE%%@dirrmtry libexec/xfce4
> @dirrm include/gnome-globalmenu
>-@dirrmtry etc/gconf/gconf.xml.defaults
>-@dirrmtry etc/gconf/schemas
>-@dirrmtry etc/gconf
>-@dirrmtry lib/bonobo/servers
>-@dirrmtry libdata/bonobo/servers
>-@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 192787: 145962