diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-16 00:24:18 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-16 00:24:18 +0800 |
| commit | 5b0ca503893f7f51d997666dcb5c7b3a347db40a (patch) | |
| tree | 5f7bb12dce02a99d4ea7ba84a449ff4c4a23a314 | |
| parent | 0e29f77123507ab77e813ec76b29e819ef77078c (diff) | |
| download | marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.tar marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.tar.gz marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.tar.bz2 marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.tar.lz marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.tar.xz marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.tar.zst marcuscom-ports-5b0ca503893f7f51d997666dcb5c7b3a347db40a.zip | |
Fix plist issue, optionfy gnome-panel depend and set dist-subdir to gnome3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15822 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | net/vinagre3/Makefile | 19 | ||||
| -rw-r--r-- | net/vinagre3/pkg-plist | 5 |
2 files changed, 17 insertions, 7 deletions
diff --git a/net/vinagre3/Makefile b/net/vinagre3/Makefile index 6903651be..eb624a72c 100644 --- a/net/vinagre3/Makefile +++ b/net/vinagre3/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net/vinagre3/Makefile,v 1.2 2011/03/31 02:13:54 mezz Exp $ +# $MCom: ports/net/vinagre3/Makefile,v 1.3 2011/04/08 23:02:14 mezz Exp $ # PORTNAME= vinagre PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome2 +DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC client for the GNOME Desktop @@ -23,8 +24,7 @@ LIB_DEPENDS= gtk-vnc-2.0.0:${PORTSDIR}/net/gtk-vnc3 \ USE_BZIP2= yes USE_GETTEXT= yes -USE_GNOME= gnomeprefix intlhack gnomehack gtk30 libxml2 vte3 \ - gnomepanel3 +USE_GNOME= gnomeprefix intlhack gnomehack gtk30 libxml2 vte3 USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_OMF= yes @@ -37,7 +37,8 @@ GLIB_SCHEMAS= org.gnome.Vinagre.gschema.xml MAN1= vinagre.1 -OPTIONS= TELEPATHY "Enable telepathy integration" on +OPTIONS= TELEPATHY "Enable telepathy integration" on \ + PANEL "Build gnome-panel applet" off .include <bsd.port.pre.mk> @@ -49,6 +50,14 @@ CONFIGURE_ARGS+=--without-telepathy PLIST_SUB+= TELEPATHY="@comment " .endif +.if defined(WITH_PANEL) +USE_GNOME+= gnomepanel3 +PLIST_SUB+= PANEL="" +.else +CONFIGURE_ARGS+=--without-panelapplet +PLIST_SUB+= PANEL="@comment " +.endif + post-install: @-update-desktop-database > /dev/null @-update-mime-database ${PREFIX}/share/mime > /dev/null diff --git a/net/vinagre3/pkg-plist b/net/vinagre3/pkg-plist index 44690dc1f..79d52877e 100644 --- a/net/vinagre3/pkg-plist +++ b/net/vinagre3/pkg-plist @@ -31,16 +31,17 @@ lib/vinagre-3.0/plugins/libvnc.so lib/vinagre-3.0/plugins/reverse-vnc.plugin lib/vinagre-3.0/plugins/vnc.plugin libdata/pkgconfig/vinagre-3.0.pc -libexec/vinagre-applet +%%PANEL%%libexec/vinagre-applet share/applications/vinagre-file.desktop share/applications/vinagre.desktop %%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service -share/dbus-1/services/org.gnome.panel.applet.Vinagre.service +%%PANEL%%share/dbus-1/services/org.gnome.panel.applet.Vinagre.service %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PANEL%%share/gnome-panel/4.0/applets/org.gnome.panel.Vinagre.panel-applet share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png |