diff --git a/x11/nx/opennx/Makefile b/x11/nx/opennx/Makefile index 1ac24070bb5..2511f2fdb4c 100644 --- a/x11/nx/opennx/Makefile +++ b/x11/nx/opennx/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.20 2011/09/27 09:00:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.21 2012/01/03 16:46:36 sebastia Exp $ COMMENT= OSS replacement for Nomachine's nxclient -DISTNAME= opennx-0.16 -REVISION= 11 +DISTNAME= opennx-0.16.0.658 CATEGORIES= sysutils @@ -34,29 +33,29 @@ BUILD_DEPENDS= archivers/zip \ RUN_DEPENDS= devel/desktop-file-utils \ print/cups \ security/opensc \ + x11/nx/nxproxy \ x11/nx/nxssh +WRKDIST = ${WRKDIR}/opennx-0.16 CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include" + CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" -DOT_DESKTOP= opennx-admin-gnome.desktop \ - opennx-wizard-gnome.desktop \ - opennx-gnome.desktop +DOT_DESKTOP= innovidata-opennx-admin.desktop \ + innovidata-opennx-wizard.desktop \ + innovidata-opennx.desktop pre-configure: - ${SUBST_CMD} ${WRKSRC}/opennxApp.cpp + ${SUBST_CMD} ${WRKSRC}/opennxApp.cpp \ + ${WRKSRC}/Makefile.in post-build: - cd ${WRKSRC}/share/applnk/network-gnome && \ + cd ${WRKSRC}/extres/xdg && \ ${SUBST_CMD} ${DOT_DESKTOP} post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications -.for file in ${DOT_DESKTOP} - ${INSTALL_DATA} ${WRKSRC}/share/applnk/network-gnome/${file} \ - ${PREFIX}/share/applications -.endfor ln -s ${TRUEPREFIX}/NX/bin/opennx ${PREFIX}/bin/opennx + rm ${PREFIX}/share/applications/*beforesubst \ + ${PREFIX}/share/applications/*orig .include diff --git a/x11/nx/opennx/distinfo b/x11/nx/opennx/distinfo index 3bae0d6c7bd..3c0daf25771 100644 --- a/x11/nx/opennx/distinfo +++ b/x11/nx/opennx/distinfo @@ -1,5 +1,5 @@ -MD5 (nx/opennx-0.16.tar.gz) = CmrVT7u7ZF4qMytukohcWw== -RMD160 (nx/opennx-0.16.tar.gz) = uVqYPCjRZR2Mvll8aqi7hL6H+zY= -SHA1 (nx/opennx-0.16.tar.gz) = P41iwX8WUe/27JyohyHJqV9EPVQ= -SHA256 (nx/opennx-0.16.tar.gz) = dP1ndbd91QRtHuYQKr6KhVxeBDQyafW1h4IlmOxQ7tk= -SIZE (nx/opennx-0.16.tar.gz) = 1040560 +MD5 (nx/opennx-0.16.0.658.tar.gz) = yzoFWJ1Sn/4ZzWBiBkgzFQ== +RMD160 (nx/opennx-0.16.0.658.tar.gz) = o84zl03T5sexkhHTk+yc9tiny7c= +SHA1 (nx/opennx-0.16.0.658.tar.gz) = GwzR6IP1Olg2hsqUrhKvq4l2E2s= +SHA256 (nx/opennx-0.16.0.658.tar.gz) = GQ1lzEvxoowV9eGwMKctaOdEMHWDng6h024vCo1vob4= +SIZE (nx/opennx-0.16.0.658.tar.gz) = 5588256 diff --git a/x11/nx/opennx/patches/patch-Makefile_in b/x11/nx/opennx/patches/patch-Makefile_in index 20460d594fc..058e115d08a 100644 --- a/x11/nx/opennx/patches/patch-Makefile_in +++ b/x11/nx/opennx/patches/patch-Makefile_in @@ -1,12 +1,34 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2009/08/25 17:52:43 jasper Exp $ ---- Makefile.in.orig Fri Jul 10 14:48:59 2009 -+++ Makefile.in Tue Aug 25 19:34:11 2009 -@@ -2074,7 +2074,7 @@ info: info-recursive +$OpenBSD: patch-Makefile_in,v 1.3 2012/01/03 16:46:36 sebastia Exp $ +--- Makefile.in.orig Wed Dec 21 11:02:25 2011 ++++ Makefile.in Fri Dec 30 11:18:44 2011 +@@ -2698,24 +2698,24 @@ PulseAudio.cpp: $(PULSEHEADERS) - info-am: + install-data-local: + $(MAKE) -C po stamp-po install-data-yes +- $(INSTALL) -d $(DESTDIR)$(datadir)/icons ++ $(INSTALL) -d $(DESTDIR)${PREFIX}/share/icons/hicolor + cd $(top_srcdir)/extres && \ + for d in 16x16 32x32 48x48 128x128 256x256 512x512 scalable ; do \ +- $(INSTALL) -d $(DESTDIR)$(datadir)/icons/$$d ; \ ++ $(INSTALL) -d $(DESTDIR)${PREFIX}/share/icons/hicolor/$$d ; \ + ( \ + cd $$d && \ + for subd in * ; do \ +- $(INSTALL) -d $(DESTDIR)$(datadir)/icons/$$d/$$subd ; \ ++ $(INSTALL) -d $(DESTDIR)${PREFIX}/share/icons/hicolor/$$d/$$subd ; \ + for f in $$subd/* ; do \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/icons/$$d/$$subd ; \ ++ $(INSTALL_DATA) $$f $(DESTDIR)${PREFIX}/share/icons/hicolor/$$d/$$subd ; \ + done \ + done \ + ) \ + done +- $(INSTALL) -d $(DESTDIR)$(datadir)/applnk/xdg ++ $(INSTALL) -d $(DESTDIR)${PREFIX}/share/applications + cd $(top_srcdir)/extres/xdg && \ + for d in * ; do \ +- $(INSTALL_DATA) $$d $(DESTDIR)$(datadir)/applnk/xdg ; \ ++ $(INSTALL_DATA) $$d $(DESTDIR)${PREFIX}/share/applications ; \ + done --install-data-am: install-cupsDATA install-data-local install-dataDATA \ -+install-data-am: install-cupsDATA install-dataDATA \ - install-iconDATA install-keyDATA - - install-dvi: install-dvi-recursive + uninstall-local: diff --git a/x11/nx/opennx/patches/patch-MySession_cpp b/x11/nx/opennx/patches/patch-MySession_cpp deleted file mode 100644 index 77ff2526ae6..00000000000 --- a/x11/nx/opennx/patches/patch-MySession_cpp +++ /dev/null @@ -1,107 +0,0 @@ -$OpenBSD: patch-MySession_cpp,v 1.2 2011/08/22 09:49:22 stsp Exp $ - -- Fix resuming a suspended session. - From upstream svn -r610, -r574 -- Added --autoresume switch. - From upstream svn -r609. - ---- MySession.cpp.orig Fri Jul 10 11:02:04 2009 -+++ MySession.cpp Tue Aug 2 14:27:46 2011 -@@ -819,16 +819,16 @@ MySession::OnSshEvent(wxCommandEvent &event) - scmd = wxT("listsession") + m_pCfg->sGetListParams(intver(NX_PROTO)); - printSsh(scmd); - m_eConnectState = STATE_PARSE_SESSIONS; -+ m_bNextCmd = false; - break; - case STATE_PARSE_SESSIONS: -+ m_bNextCmd = true; - if (m_bIsShadow) { - // Server has sent list of attachable sessions - m_bCollectSessions = false; - ::wxLogInfo(wxT("received end of attachable session list")); - parseSessions(false); -- break; - } -- printSsh(wxEmptyString); - break; - case STATE_START_SESSION: - scmd = wxT("startsession"); -@@ -846,7 +846,7 @@ MySession::OnSshEvent(wxCommandEvent &event) - break; - case STATE_RESUME_SESSION: - scmd = wxT("restoresession"); -- scmd << m_pCfg->sGetSessionParams(intver(NX_PROTO), false, m_sClearPassword) -+ scmd << m_pCfg->sGetSessionParams(intver(NX_PROTO), true, m_sClearPassword) - << wxT(" --session=\"") << m_sResumeName - << wxT("\" --type=\"") << m_sResumeType - << wxT("\" --id=\"") << m_sResumeId << wxT("\""); -@@ -922,9 +922,9 @@ MySession::OnSshEvent(wxCommandEvent &event) - m_sSmbPort = msg; - break; - case MyIPC::ActionExit: -- if (m_eConnectState == STATE_ABORT) -+ if (m_eConnectState == STATE_ABORT) { - m_bAbort = true; -- else { -+ } else { - if (m_eConnectState == STATE_FINISH) { - m_pDlg->SetStatusText(_("Starting session")); - msg = wxT("NX> 299 Switch connection to: "); -@@ -1062,7 +1062,13 @@ MySession::parseSessions(bool moreAllowed) - } - if (bFound) { - d.EnableNew(moreAllowed); -- if (m_bIsShadow || (iSessionCount > 1) || (!sName.IsSameAs(m_pCfg->sGetName()))) { -+ if ((!m_bIsShadow) && wxGetApp().AutoResume() && (iSessionCount == 1) && (sName.IsSameAs(m_pCfg->sGetName()))) { -+ ::wxLogInfo(wxT("RESUME")); -+ m_sResumeName = sName; -+ m_sResumeType = d.GetSelectedType(); -+ m_sResumeId = d.GetSelectedId(); -+ m_eConnectState = STATE_RESUME_SESSION; -+ } else { - switch (d.ShowModal()) { - case wxID_OK: - switch (d.GetMode()) { -@@ -1078,8 +1084,6 @@ MySession::parseSessions(bool moreAllowed) - m_sResumeId = d.GetSelectedId(); - m_sResumePort = d.GetSelectedPort(); - m_eConnectState = m_bIsShadow ? STATE_ATTACH_SESSION : STATE_RESUME_SESSION; -- if (m_bIsShadow) -- printSsh(wxEmptyString); - break; - case ResumeDialog::Takeover: - wxLogInfo(wxT("TAKEOVER")); -@@ -1092,19 +1096,17 @@ MySession::parseSessions(bool moreAllowed) - m_eConnectState = STATE_START_SESSION; - break; - } -+ if (m_bNextCmd) { -+ wxCommandEvent upevent(wxEVT_NXSSH, wxID_ANY); -+ upevent.SetInt(MyIPC::ActionNextCommand); -+ AddPendingEvent(upevent); -+ } - break; - case wxID_CANCEL: - printSsh(wxT("bye")); -- if (m_bIsShadow) -- m_eConnectState = STATE_ABORT; -+ m_eConnectState = STATE_ABORT; - break; - } -- } else { -- wxLogInfo(wxT("RESUME")); -- m_sResumeName = d.GetSelectedName(); -- m_sResumeType = d.GetSelectedType(); -- m_sResumeId = d.GetSelectedId(); -- m_eConnectState = STATE_RESUME_SESSION; - } - } else { - if (m_bIsShadow) { -@@ -1635,6 +1637,7 @@ MySession::Create(MyXmlConfig &cfgpar, const wxString - m_bCollectSessions = false; - m_bCollectConfig = false; - m_bIsShadow = false; -+ m_bNextCmd = false; - m_sSessionID = wxEmptyString; - m_pParent = parent; - MyXmlConfig cfg(cfgpar.sGetFileName()); diff --git a/x11/nx/opennx/patches/patch-MySession_h b/x11/nx/opennx/patches/patch-MySession_h deleted file mode 100644 index 959c962096a..00000000000 --- a/x11/nx/opennx/patches/patch-MySession_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-MySession_h,v 1.1 2011/08/22 09:49:22 stsp Exp $ - -- Fix resuming a suspended session. - From upstream svn -r574. - ---- MySession.h.orig Sun Apr 26 01:17:10 2009 -+++ MySession.h Tue Aug 2 14:22:19 2011 -@@ -124,6 +124,7 @@ class MySession : public wxEvtHandler (private) - bool m_bIsShadow; - bool m_bCupsRunning; - bool m_bRemoveKey; -+ bool m_bNextCmd; - int m_iProgress; - int m_iReader; - int m_iHttpPort; diff --git a/x11/nx/opennx/patches/patch-ResumeDialog_cpp b/x11/nx/opennx/patches/patch-ResumeDialog_cpp deleted file mode 100644 index 6fdf7c21f0d..00000000000 --- a/x11/nx/opennx/patches/patch-ResumeDialog_cpp +++ /dev/null @@ -1,31 +0,0 @@ -$OpenBSD: patch-ResumeDialog_cpp,v 1.1 2011/08/22 09:49:22 stsp Exp $ - -- Fix resuming a suspended session. - From upstream svn -r574. - ---- ResumeDialog.cpp.orig Sun Apr 26 06:06:26 2009 -+++ ResumeDialog.cpp Tue Aug 2 14:22:19 2011 -@@ -262,7 +262,6 @@ void ResumeDialog::OnButtonTakeoverClick( wxCommandEve - { - m_eMode = Takeover; - EndModal(wxID_OK); -- event.Skip(); - } - - /*! -@@ -273,7 +272,6 @@ void ResumeDialog::OnButtonResumeClick( wxCommandEvent - { - m_eMode = Resume; - EndModal(wxID_OK); -- event.Skip(); - } - - /*! -@@ -287,7 +285,6 @@ void ResumeDialog::OnButtonTerminateClick( wxCommandEv - return; - m_eMode = Terminate; - EndModal(wxID_OK); -- event.Skip(); - } - - /*! diff --git a/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-admin_desktop b/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-admin_desktop new file mode 100644 index 00000000000..164b3424f63 --- /dev/null +++ b/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-admin_desktop @@ -0,0 +1,12 @@ +$OpenBSD: patch-extres_xdg_innovidata-opennx-admin_desktop,v 1.1 2012/01/03 16:46:36 sebastia Exp $ +--- extres/xdg/innovidata-opennx-admin.desktop.orig Fri Dec 30 10:34:47 2011 ++++ extres/xdg/innovidata-opennx-admin.desktop Fri Dec 30 10:35:28 2011 +@@ -2,7 +2,7 @@ + Version=1.0 + Encoding=UTF-8 + Type=Application +-Exec=/usr/NX/bin/opennx --admin ++Exec=${PREFIX}/NX/bin/opennx --admin + Icon=opennx-admin + Comment=Manage OpenNX sessions + Comment[de]=Verwalte OpenNX Sitzungen diff --git a/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-wizard_desktop b/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-wizard_desktop new file mode 100644 index 00000000000..c52db792a71 --- /dev/null +++ b/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx-wizard_desktop @@ -0,0 +1,12 @@ +$OpenBSD: patch-extres_xdg_innovidata-opennx-wizard_desktop,v 1.1 2012/01/03 16:46:36 sebastia Exp $ +--- extres/xdg/innovidata-opennx-wizard.desktop.orig Fri Dec 30 10:35:45 2011 ++++ extres/xdg/innovidata-opennx-wizard.desktop Fri Dec 30 10:36:09 2011 +@@ -2,7 +2,7 @@ + Version=1.0 + Encoding=UTF-8 + Type=Application +-Exec=/usr/NX/bin/opennx --wizard ++Exec=${PREFIX}/NX/bin/opennx --wizard + Icon=opennx-wizard + Comment=Create a new OpenNX session definition + Comment[de]=Erstelle eine neue OpenNX Sitzungs-Definition diff --git a/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx_desktop b/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx_desktop new file mode 100644 index 00000000000..550a3eb36aa --- /dev/null +++ b/x11/nx/opennx/patches/patch-extres_xdg_innovidata-opennx_desktop @@ -0,0 +1,12 @@ +$OpenBSD: patch-extres_xdg_innovidata-opennx_desktop,v 1.1 2012/01/03 16:46:36 sebastia Exp $ +--- extres/xdg/innovidata-opennx.desktop.orig Fri Dec 30 10:36:17 2011 ++++ extres/xdg/innovidata-opennx.desktop Fri Dec 30 10:37:16 2011 +@@ -2,7 +2,7 @@ + Version=1.0 + Encoding=UTF-8 + Type=Application +-Exec=/usr/NX/bin/opennx ++Exec=${PREFIX}/NX/bin/opennx + Icon=nx + Comment=Connect to a remote NX server + Comment[de]=Mit einem NX-Server verbinden diff --git a/x11/nx/opennx/patches/patch-opennxApp_cpp b/x11/nx/opennx/patches/patch-opennxApp_cpp index 56415b531fc..9d550635f7b 100644 --- a/x11/nx/opennx/patches/patch-opennxApp_cpp +++ b/x11/nx/opennx/patches/patch-opennxApp_cpp @@ -1,46 +1,13 @@ -$OpenBSD: patch-opennxApp_cpp,v 1.2 2011/03/02 13:57:06 jasper Exp $ +$OpenBSD: patch-opennxApp_cpp,v 1.3 2012/01/03 16:46:36 sebastia Exp $ -- Added --autoresume switch. - From upstream svn -r609. - ---- opennxApp.cpp.orig Wed Jul 8 13:50:50 2009 -+++ opennxApp.cpp Fri Feb 25 14:04:44 2011 -@@ -96,7 +96,8 @@ IMPLEMENT_APP(opennxApp); - ,m_bRunproc(false) - ,m_bLibUSBAvailable(false) - ,m_bRequireWatchReader(false) -- ,m_bRequireStartUsbIp(false) -+ ,m_bRequireStartUsbIp(false) -+ ,m_bAutoResume(false) - { - SetAppName(wxT("OpenNX")); - #ifdef __WXMSW__ -@@ -531,8 +532,8 @@ opennxApp::preInit() - tmp = wxT("/sbin/cupsd"); - if ((tmp.IsEmpty()) && wxFileName::IsFileExecutable(wxT("/usr/sbin/cupsd"))) - tmp = wxT("/usr/sbin/cupsd"); -- if ((tmp.IsEmpty()) && wxFileName::IsFileExecutable(wxT("usr/local/sbin/cupsd"))) -- tmp = wxT("/usr/local/sbin/cupsd"); -+ if ((tmp.IsEmpty()) && wxFileName::IsFileExecutable(wxT("${LOCALBASE}/sbin/cupsd"))) -+ tmp = wxT("${LOCALBASE}/sbin/cupsd"); - #endif - wxConfigBase::Get()->Write(wxT("Config/CupsPath"), tmp); - wxConfigBase::Get()->Flush(); -@@ -707,6 +708,8 @@ void opennxApp::OnInitCmdLine(wxCmdLineParser& parser) - } - tags.Prepend(_("\n\nSupported trace tags: ")); - -+ parser.AddSwitch(wxEmptyString, wxT("autoresume"), -+ _("Automatically resume/takeover a session with the same name.")); - parser.AddSwitch(wxEmptyString, wxT("admin"), - _("Start the session administration tool.")); - parser.AddOption(wxEmptyString, wxT("caption"), -@@ -844,6 +847,8 @@ bool opennxApp::OnCmdLineParsed(wxCmdLineParser& parse - m_eMode = MODE_ADMIN; - if (parser.Found(wxT("wizard"))) - m_eMode = MODE_WIZARD; -+ if (parser.Found(wxT("autoresume"))) -+ m_bAutoResume = true; - (void)parser.Found(wxT("session"), &m_sSessionName); - wxString traceTags; - if (parser.Found(wxT("trace"), &traceTags)) { +--- opennxApp.cpp.orig Tue Dec 6 16:01:27 2011 ++++ opennxApp.cpp Fri Dec 30 10:31:38 2011 +@@ -573,7 +573,7 @@ opennxApp::preInit() + tmp = findExecutable(wxT("cupsd")); + if (tmp.IsEmpty()) { + const wxChar* candidates[] = { +- wxT("/sbin/cupsd"), wxT("/usr/sbin/cupsd"), wxT("usr/local/sbin/cupsd"), ++ wxT("/sbin/cupsd"), wxT("/usr/sbin/cupsd"), wxT("${LOCALBASE}/sbin/cupsd"), + NULL + }; + int i; diff --git a/x11/nx/opennx/patches/patch-opennxApp_h b/x11/nx/opennx/patches/patch-opennxApp_h deleted file mode 100644 index 9303c742d78..00000000000 --- a/x11/nx/opennx/patches/patch-opennxApp_h +++ /dev/null @@ -1,23 +0,0 @@ -$OpenBSD: patch-opennxApp_h,v 1.1 2011/03/02 10:23:36 jasper Exp $ - -- Added --autoresume switch. - From upstream svn -r609. - ---- opennxApp.h.orig Fri Feb 25 14:02:24 2011 -+++ opennxApp.h Fri Feb 25 14:03:24 2011 -@@ -49,6 +49,7 @@ class opennxApp : public wxApp - */ - bool NxSmartCardSupport() { return m_bNxSmartCardSupport; } - bool LibUSBAvailable() { return m_bLibUSBAvailable; } -+ bool AutoResume() { return m_bAutoResume; } - - void SetRequireWatchReader(bool b) { m_bRequireWatchReader = b; } - void SetRequireStartUsbIp(bool b) { m_bRequireStartUsbIp = b; } -@@ -97,6 +98,7 @@ class opennxApp : public wxApp - bool m_bLibUSBAvailable; - bool m_bRequireWatchReader; - bool m_bRequireStartUsbIp; -+ bool m_bAutoResume; - - bool preInit(); - bool realInit(); diff --git a/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-admin-gnome_desktop b/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-admin-gnome_desktop deleted file mode 100644 index 0d8e750adc2..00000000000 --- a/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-admin-gnome_desktop +++ /dev/null @@ -1,15 +0,0 @@ -$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 @@ - [Desktop Entry] - Encoding=UTF-8 - Comment=Launch session administrator --Exec=/usr/NX/bin/opennx --admin --Icon=/usr/NX/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 --OnlyShowIn=GNOME; diff --git a/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-gnome_desktop b/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-gnome_desktop deleted file mode 100644 index ef2620298c9..00000000000 --- a/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-gnome_desktop +++ /dev/null @@ -1,16 +0,0 @@ -$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 @@ - [Desktop Entry] - Encoding=UTF-8 - Comment=Connect to a remote NX server --Exec=/usr/NX/bin/opennx --Icon=/usr/NX/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 - Categories=Application;Network --OnlyShowIn=GNOME; diff --git a/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop b/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop deleted file mode 100644 index d715b0a8222..00000000000 --- a/x11/nx/opennx/patches/patch-share_applnk_network-gnome_opennx-wizard-gnome_desktop +++ /dev/null @@ -1,15 +0,0 @@ -$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 @@ - [Desktop Entry] - Encoding=UTF-8 - Comment=Launch connection wizard --Exec=/usr/NX/bin/opennx --wizard --Icon=/usr/NX/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 --OnlyShowIn=GNOME; diff --git a/x11/nx/opennx/pkg/PLIST b/x11/nx/opennx/pkg/PLIST index 70a81678d84..05bb0b9d0dd 100644 --- a/x11/nx/opennx/pkg/PLIST +++ b/x11/nx/opennx/pkg/PLIST @@ -1,23 +1,53 @@ -@comment $OpenBSD: PLIST,v 1.5 2011/09/27 08:59:37 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.6 2012/01/03 16:46:36 sebastia Exp $ @bin NX/bin/opennx +@bin NX/bin/pconnect @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 +NX/share/pconnect.html bin/opennx -share/applications/opennx-admin-gnome.desktop -share/applications/opennx-gnome.desktop -share/applications/opennx-wizard-gnome.desktop +share/applications/innovidata-opennx-admin.desktop +share/applications/innovidata-opennx-wizard.desktop +share/applications/innovidata-opennx.desktop +share/applications/innovidata-opennx.directory share/doc/pkg-readmes/${FULLPKGNAME} +share/icons/hicolor/128x128/apps/nx.png +share/icons/hicolor/128x128/apps/opennx-admin.png +share/icons/hicolor/128x128/apps/opennx-wizard.png +share/icons/hicolor/128x128/mimetypes/nx-desktop.png +share/icons/hicolor/16x16/apps/nx.png +share/icons/hicolor/16x16/apps/opennx-admin.png +share/icons/hicolor/16x16/apps/opennx-wizard.png +share/icons/hicolor/16x16/mimetypes/nx-desktop.png +share/icons/hicolor/256x256/apps/nx.png +share/icons/hicolor/256x256/apps/opennx-admin.png +share/icons/hicolor/256x256/apps/opennx-wizard.png +share/icons/hicolor/256x256/mimetypes/nx-desktop.png +share/icons/hicolor/32x32/apps/nx.png +share/icons/hicolor/32x32/apps/opennx-admin.png +share/icons/hicolor/32x32/apps/opennx-wizard.png +share/icons/hicolor/32x32/mimetypes/nx-desktop.png +share/icons/hicolor/48x48/apps/nx.png +share/icons/hicolor/48x48/apps/opennx-admin.png +share/icons/hicolor/48x48/apps/opennx-wizard.png +share/icons/hicolor/48x48/mimetypes/nx-desktop.png +share/icons/hicolor/512x512/ +share/icons/hicolor/512x512/apps/ +share/icons/hicolor/512x512/apps/nx.png +share/icons/hicolor/512x512/apps/opennx-admin.png +share/icons/hicolor/512x512/apps/opennx-wizard.png +share/icons/hicolor/512x512/mimetypes/ +share/icons/hicolor/512x512/mimetypes/nx-desktop.png +share/icons/hicolor/scalable/apps/nx.svg +share/icons/hicolor/scalable/apps/opennx-admin.svg +share/icons/hicolor/scalable/apps/opennx-wizard.svg +share/icons/hicolor/scalable/mimetypes/nx-desktop.svg share/locale/de/LC_MESSAGES/opennx.mo @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database +share/locale/ru/LC_MESSAGES/opennx.mo