cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move to /usr/local/NX.

Browse Source 
Remove bogus call to gtk-update-icon-cache.

ok jasper@
This commit is contained in:
ajacoutot 2011-03-02 06:57:08 +00:00
parent 86f20f78f4
commit 9b6d11463a
5 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x11/nx/opennx/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2010/11/22 08:37:03 espie Exp $
# $OpenBSD: Makefile,v 1.13 2011/03/02 06:57:08 ajacoutot Exp $
COMMENT= OSS replacement for Nomachine's nxclient
DISTNAME= opennx-0.16
REVISION= 3
REVISION= 4
CATEGORIES= sysutils
@ -12,10 +12,16 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opennx/}
USE_LIBTOOL= Yes
WANTLIB += ICE SM X11 Xau Xdmcp Xext Xmu Xt c m pthread pthread-stubs
WANTLIB += stdc++ xcb wx_base wx_base_net wx_base_xml wx_gtk2_adv
WANTLIB += wx_gtk2_core wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext
WANTLIB += wx_gtk2_xrc
WANTLIB += GL ICE SDL SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm
WANTLIB += atk-1.0 c cairo drm expat fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 iconv intl jpeg m mspack pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += pthread-stubs sndio stdc++ tiff usbhid wx_base wx_base_net
WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_core wx_gtk2_html wx_gtk2_qa
WANTLIB += wx_gtk2_richtext wx_gtk2_xrc xcb xcb-render xcb-shm
WANTLIB += z
LIB_DEPENDS= x11/wxWidgets
BUILD_DEPENDS= archivers/zip \
@ -45,5 +51,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/share/applnk/network-gnome/${file} \
${PREFIX}/share/applications
.endfor
ln -s ${TRUEPREFIX}/NX/bin/opennx ${PREFIX}/bin/opennx
.include <bsd.port.mk>

6
x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-admin-gnome_desktop
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-share_applnk_network-gnome_opennx-admin-gnome_desktop,v 1.1.1.1 2008/06/13 17:14:42 jasper Exp $
$OpenBSD: patch-share_applnk_network-gnome_opennx-admin-gnome_desktop,v 1.2 2011/03/02 06:57:08 ajacoutot Exp $
--- share/applnk/network-gnome/opennx-admin-gnome.desktop.orig Fri May 23 12:00:07 2008
+++ share/applnk/network-gnome/opennx-admin-gnome.desktop Fri May 23 12:00:34 2008
@@ -1,9 +1,8 @@
@ -7,8 +7,8 @@ $OpenBSD: patch-share_applnk_network-gnome_opennx-admin-gnome_desktop,v 1.1.1.1
Comment=Launch session administrator
-Exec=/usr/NX/bin/opennx --admin
-Icon=/usr/NX/share/icons/opennx-admin.png
+Exec=${PREFIX}/bin/opennx --admin
+Icon=${PREFIX}/share/icons/opennx-admin.png
+Exec=${PREFIX}/NX/bin/opennx --admin
+Icon=${PREFIX}/NX/share/icons/opennx-admin.png
Name=OpenNX Session Administrator
Type=Application
Categories=Application;Network

6
x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-gnome_desktop
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-share_applnk_network-gnome_opennx-gnome_desktop,v 1.1.1.1 2008/06/13 17:14:42 jasper Exp $
$OpenBSD: patch-share_applnk_network-gnome_opennx-gnome_desktop,v 1.2 2011/03/02 06:57:08 ajacoutot Exp $
--- share/applnk/network-gnome/opennx-gnome.desktop.orig Fri May 23 12:00:07 2008
+++ share/applnk/network-gnome/opennx-gnome.desktop Fri May 23 12:00:43 2008
@@ -1,10 +1,9 @@
@ -7,8 +7,8 @@ $OpenBSD: patch-share_applnk_network-gnome_opennx-gnome_desktop,v 1.1.1.1 2008/0
Comment=Connect to a remote NX server
-Exec=/usr/NX/bin/opennx
-Icon=/usr/NX/share/icons/nx.png
+Exec=${PREFIX}/bin/opennx
+Icon=${PREFIX}/share/icons/nx.png
+Exec=${PREFIX}/NX/bin/opennx
+Icon=${PREFIX}/NX/share/icons/nx.png
Name=OpenNX client
Type=Application
MimeType=application/nx-session

6
x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop,v 1.1.1.1 2008/06/13 17:14:42 jasper Exp $
$OpenBSD: patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop,v 1.2 2011/03/02 06:57:08 ajacoutot Exp $
--- share/applnk/network-gnome/opennx-wizard-gnome.desktop.orig Fri May 23 12:00:07 2008
+++ share/applnk/network-gnome/opennx-wizard-gnome.desktop Fri May 23 12:00:50 2008
@@ -1,9 +1,8 @@
@ -7,8 +7,8 @@ $OpenBSD: patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop,v 1.1.1.1
Comment=Launch connection wizard
-Exec=/usr/NX/bin/opennx --wizard
-Icon=/usr/NX/share/icons/opennx-wizard.png
+Exec=${PREFIX}/bin/opennx --wizard
+Icon=${PREFIX}/share/icons/opennx-wizard.png
+Exec=${PREFIX}/NX/bin/opennx --wizard
+Icon=${PREFIX}/NX/share/icons/opennx-wizard.png
Name=OpenNX Connection Wizard
Type=Application
Categories=Application;Network

30
x11/nx/opennx/pkg/PLIST
View File

@ -1,20 +1,22 @@
@comment $OpenBSD: PLIST,v 1.3 2009/12/21 20:46:02 ajacoutot Exp $
@bin bin/opennx
@bin bin/watchreader
@comment $OpenBSD: PLIST,v 1.4 2011/03/02 06:57:08 ajacoutot Exp $
@bin NX/bin/opennx
@bin NX/bin/watchreader
NX/share/
NX/share/cups/
NX/share/cups/mime.convs
NX/share/cups/mime.types
NX/share/icons/
NX/share/icons/nx-desktop.png
NX/share/icons/nx.png
NX/share/icons/opennx-admin.png
NX/share/icons/opennx-wizard.png
NX/share/keyboards
NX/share/keys/
NX/share/keys/server.id_dsa.key
bin/opennx
share/applications/opennx-admin-gnome.desktop
share/applications/opennx-gnome.desktop
share/applications/opennx-wizard-gnome.desktop
share/cups/mime.convs
share/cups/mime.types
share/icons/nx-desktop.png
share/icons/nx.png
share/icons/opennx-admin.png
share/icons/opennx-wizard.png
share/keyboards
share/keys/
share/keys/server.id_dsa.key
share/locale/de/LC_MESSAGES/opennx.mo
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true