diff options
-rw-r--r-- | net/synergy/Makefile | 57 | ||||
-rw-r--r-- | net/synergy/PLIST | 32 | ||||
-rw-r--r-- | net/synergy/distinfo | 22 | ||||
-rw-r--r-- | net/synergy/patches/patch-aa | 16 | ||||
-rw-r--r-- | net/synergy/patches/patch-ab | 13 | ||||
-rw-r--r-- | net/synergy/patches/patch-ac | 45 | ||||
-rw-r--r-- | net/synergy/patches/patch-ad | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-ae | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-af | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-ag | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-ah | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-ai | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-aj | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-ak | 13 | ||||
-rw-r--r-- | net/synergy/patches/patch-al | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-am | 12 | ||||
-rw-r--r-- | net/synergy/patches/patch-an | 12 |
17 files changed, 45 insertions, 273 deletions
diff --git a/net/synergy/Makefile b/net/synergy/Makefile index 85f05af5dc6..b3bd7ea71b4 100644 --- a/net/synergy/Makefile +++ b/net/synergy/Makefile @@ -1,25 +1,48 @@ -# $NetBSD: Makefile,v 1.10 2008/02/23 18:04:57 heinz Exp $ +# $NetBSD: Makefile,v 1.11 2011/01/23 02:24:29 tnn Exp $ # -DISTNAME= synergy-1.3.1 -PKGREVISION= 3 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synergy2/} +DISTNAME= synergy-1.3.6-Source +PKGNAME= ${DISTNAME:S/-Source//} +CATEGORIES= net x11 +MASTER_SITES= http://synergy.googlecode.com/files/ -MAINTAINER= yui@yui.pe.kr -HOMEPAGE= http://synergy2.sourceforge.net/ +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://synergy-foss.org/ COMMENT= Let a user share a mouse and keyboard among computers PKG_DESTDIR_SUPPORT= user-destdir -GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} -DOCS= *.html *.css images/*.gif +# Below rpath fix is copypasted from graphics/vtk. +CMAKE_OPTS+= -DCMAKE_INSTALL_RPATH:STRING=${PREFIX}/lib:${X11BASE}/lib${LIBABISUFFIX:Q} \ +CMAKE_OPTS+= -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ +CMAKE_OPTS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ +CMAKE_OPTS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing absolute paths. +SUBST_FILES.fix-paths= lib/arch/CArchFileUnix.cpp +SUBST_SED.fix-paths= -e 's,"/etc","${PKG_SYSCONFDIR}",g' + +do-configure: + cd ${WRKSRC} && ${PREFIX}/bin/cmake ${CMAKE_OPTS} . + +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/${PKGBASE} + +post-build: + ${CP} ${WRKSRC}/doc/synergyc.man ${WRKSRC}/doc/synergyc.1 + ${CP} ${WRKSRC}/doc/synergys.man ${WRKSRC}/doc/synergys.1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/synergyc ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/synergys ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/synergys.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_DATA} ${WRKSRC}/doc/*.conf ${DESTDIR}${PREFIX}/share/examples/${PKGBASE} + +.include "../../devel/cmake/buildlink3.mk" .if !exists(/System/Library/Frameworks/Carbon.framework) .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" @@ -27,15 +50,5 @@ DOCS= *.html *.css images/*.gif .include "../../x11/libXtst/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .endif - -post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images - set -e; cd ${WRKSRC}/doc; \ - for f in ${DOCS}; do \ - ${INSTALL_DATA} "$$f" "${DESTDIR}${DOCDIR}/$$f"; \ - done - ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/synergy.conf ${DESTDIR}${EXAMPLESDIR} - .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/synergy/PLIST b/net/synergy/PLIST index 5b03591b02f..5d5d8638d30 100644 --- a/net/synergy/PLIST +++ b/net/synergy/PLIST @@ -1,28 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:09:44 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2011/01/23 02:24:29 tnn Exp $ bin/synergyc bin/synergys -share/doc/${PKGBASE}/about.html -share/doc/${PKGBASE}/authors.html -share/doc/${PKGBASE}/autostart.html -share/doc/${PKGBASE}/banner.html -share/doc/${PKGBASE}/border.html -share/doc/${PKGBASE}/compiling.html -share/doc/${PKGBASE}/configuration.html -share/doc/${PKGBASE}/contact.html -share/doc/${PKGBASE}/developer.html -share/doc/${PKGBASE}/faq.html -share/doc/${PKGBASE}/history.html -share/doc/${PKGBASE}/home.html -share/doc/${PKGBASE}/images/logo.gif -share/doc/${PKGBASE}/images/warp.gif -share/doc/${PKGBASE}/index.html -share/doc/${PKGBASE}/license.html -share/doc/${PKGBASE}/news.html -share/doc/${PKGBASE}/roadmap.html -share/doc/${PKGBASE}/running.html -share/doc/${PKGBASE}/security.html -share/doc/${PKGBASE}/synergy.css -share/doc/${PKGBASE}/tips.html -share/doc/${PKGBASE}/toc.html -share/doc/${PKGBASE}/trouble.html -share/examples/${PKGBASE}/synergy.conf +man/man1/synergyc.1 +man/man1/synergys.1 +share/examples/synergy/synergy-advanced.conf +share/examples/synergy/synergy-basic.conf +share/examples/synergy/synergy-stooges.conf diff --git a/net/synergy/distinfo b/net/synergy/distinfo index 42ade839192..f8dd4714e7e 100644 --- a/net/synergy/distinfo +++ b/net/synergy/distinfo @@ -1,19 +1,5 @@ -$NetBSD: distinfo,v 1.6 2009/09/19 19:14:54 tnn Exp $ +$NetBSD: distinfo,v 1.7 2011/01/23 02:24:29 tnn Exp $ -SHA1 (synergy-1.3.1.tar.gz) = 03113ec8aadfecaeba8e369b083f4fb5b44f5c62 -RMD160 (synergy-1.3.1.tar.gz) = 5f5d7cb8fcfb57a6c8eae83fb53c704cb85c6c16 -Size (synergy-1.3.1.tar.gz) = 793172 bytes -SHA1 (patch-aa) = da4ad36cdcec251bf4334c2dccd68346042894de -SHA1 (patch-ab) = fae459f7063a6a879b385a94d5e889877c94860d -SHA1 (patch-ac) = 8f8714f20da9e3744ed82ee8ba9d7b652b78935d -SHA1 (patch-ad) = 2635ceb0cfa0fdd0af5ac362dd0d97353ca65440 -SHA1 (patch-ae) = b5430ec4d8a3d80cb71b21f786dac8c825c7c660 -SHA1 (patch-af) = bd866b8e22962ad94957ca7f93644d58a9f94c89 -SHA1 (patch-ag) = c9c9a2b064e230684e5cecfa014f7e1bc7f87204 -SHA1 (patch-ah) = c683524d97330150d2922fb66e2b252761ac6bb1 -SHA1 (patch-ai) = f00c16eaa0850320a7b4b33440ad8b1cdcb5c304 -SHA1 (patch-aj) = 543c18157715898155a6bdbfb66aaa7904c03b24 -SHA1 (patch-ak) = 7a5c2f7bfa2d36c0b0fe8ffcb353927639eefb66 -SHA1 (patch-al) = d41c717b9b7256b9afa3f5e810288cfe96dd60e4 -SHA1 (patch-am) = fc25d0d0d86316e6463745d5200f0abc77aef1c2 -SHA1 (patch-an) = 99d90958e5446842a42821522e801753ce4e0421 +SHA1 (synergy-1.3.6-Source.tar.gz) = acbb8c62bc7f18cd4646c8b116c9acdeb2b405da +RMD160 (synergy-1.3.6-Source.tar.gz) = adcd5b7a2de7370a03b404c7827be58cb9f7467a +Size (synergy-1.3.6-Source.tar.gz) = 659025 bytes diff --git a/net/synergy/patches/patch-aa b/net/synergy/patches/patch-aa deleted file mode 100644 index 43b79f6b8e7..00000000000 --- a/net/synergy/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2006/08/17 14:02:23 taca Exp $ - ---- lib/arch/CArchFileUnix.cpp.orig 2005-04-24 12:02:12.000000000 +0900 -+++ lib/arch/CArchFileUnix.cpp -@@ -80,7 +80,10 @@ CArchFileUnix::getUserDirectory() - std::string - CArchFileUnix::getSystemDirectory() - { -- return "/etc"; -+#ifndef CONFIG_DIR -+#define CONFIG_DIR "/etc" -+#endif -+ return CONFIG_DIR; - } - - std::string diff --git a/net/synergy/patches/patch-ab b/net/synergy/patches/patch-ab deleted file mode 100644 index eb226368b3f..00000000000 --- a/net/synergy/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/08/17 14:02:23 taca Exp $ - ---- lib/arch/Makefile.in.orig 2006-04-03 05:09:44.000000000 +0900 -+++ lib/arch/Makefile.in -@@ -246,7 +246,7 @@ libarch_a_OBJECTS = $(am_libarch_a_OBJEC - - DEFS = @DEFS@ - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = @CPPFLAGS@ -DCONFIG_DIR=\"${sysconfdir}\" - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/config/depcomp diff --git a/net/synergy/patches/patch-ac b/net/synergy/patches/patch-ac deleted file mode 100644 index 48a28b0ff46..00000000000 --- a/net/synergy/patches/patch-ac +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2009/09/19 19:14:54 tnn Exp $ - -Fix compile problem with gcc4. -CXWindowsScreen.cpp: In member function 'void CXWindowsScreen::openIM()': -CXWindowsScreen.cpp:990: warning: missing sentinel in function call -CXWindowsScreen.cpp:1013: warning: missing sentinel in function call -CXWindowsScreen.cpp:1022: warning: missing sentinel in function call - ---- lib/platform/CXWindowsScreen.cpp.orig 2006-04-02 21:16:39.000000000 +0200 -+++ lib/platform/CXWindowsScreen.cpp -@@ -26,6 +26,7 @@ - #include "CStringUtil.h" - #include "IEventQueue.h" - #include "TMethodEventJob.h" -+#include <stdlib.h> - #include <cstring> - #if X_DISPLAY_MISSING - # error X11 is required to build synergy -@@ -987,7 +988,7 @@ CXWindowsScreen::openIM() - // find the appropriate style. synergy supports XIMPreeditNothing - // only at the moment. - XIMStyles* styles; -- if (XGetIMValues(im, XNQueryInputStyle, &styles, NULL) != NULL || -+ if (XGetIMValues(im, XNQueryInputStyle, &styles, (char *)NULL) != NULL || - styles == NULL) { - LOG((CLOG_WARN "cannot get IM styles")); - XCloseIM(im); -@@ -1010,7 +1011,7 @@ CXWindowsScreen::openIM() - } - - // create an input context for the style and tell it about our window -- XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, NULL); -+ XIC ic = XCreateIC(im, XNInputStyle, style, XNClientWindow, m_window, (char *)NULL); - if (ic == NULL) { - LOG((CLOG_WARN "cannot create IC")); - XCloseIM(im); -@@ -1019,7 +1020,7 @@ CXWindowsScreen::openIM() - - // find out the events we must select for and do so - unsigned long mask; -- if (XGetICValues(ic, XNFilterEvents, &mask, NULL) != NULL) { -+ if (XGetICValues(ic, XNFilterEvents, &mask, (char *)NULL) != NULL) { - LOG((CLOG_WARN "cannot get IC filter events")); - XDestroyIC(ic); - XCloseIM(im); diff --git a/net/synergy/patches/patch-ad b/net/synergy/patches/patch-ad deleted file mode 100644 index c1fbbfc57f5..00000000000 --- a/net/synergy/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/arch/CArchDaemonUnix.cpp.orig 2005-04-24 05:02:12.000000000 +0200 -+++ lib/arch/CArchDaemonUnix.cpp -@@ -14,6 +14,7 @@ - - #include "CArchDaemonUnix.h" - #include "XArchUnix.h" -+#include <stdlib.h> - #include <unistd.h> - #include <sys/types.h> - #include <sys/stat.h> diff --git a/net/synergy/patches/patch-ae b/net/synergy/patches/patch-ae deleted file mode 100644 index c057195edbf..00000000000 --- a/net/synergy/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/arch/CMultibyte.cpp.orig 2005-11-30 05:33:24.000000000 +0100 -+++ lib/arch/CMultibyte.cpp -@@ -17,6 +17,7 @@ - - #include "common.h" - #include "CArch.h" -+#include <stdlib.h> - #include <limits.h> - #include <string.h> - #if HAVE_LOCALE_H diff --git a/net/synergy/patches/patch-af b/net/synergy/patches/patch-af deleted file mode 100644 index 6ebf9f9bf20..00000000000 --- a/net/synergy/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/base/CStringUtil.cpp.orig 2005-12-14 18:25:20.000000000 +0100 -+++ lib/base/CStringUtil.cpp -@@ -16,6 +16,7 @@ - #include "CArch.h" - #include "common.h" - #include "stdvector.h" -+#include <string.h> - #include <cctype> - #include <cstdio> - #include <cstdlib> diff --git a/net/synergy/patches/patch-ag b/net/synergy/patches/patch-ag deleted file mode 100644 index f88663cf4e6..00000000000 --- a/net/synergy/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/net/CTCPSocket.cpp.orig 2006-04-02 03:47:03.000000000 +0200 -+++ lib/net/CTCPSocket.cpp -@@ -23,6 +23,7 @@ - #include "IEventJob.h" - #include "CArch.h" - #include "XArch.h" -+#include <stdlib.h> - #include <string.h> - - // diff --git a/net/synergy/patches/patch-ah b/net/synergy/patches/patch-ah deleted file mode 100644 index bb178876a30..00000000000 --- a/net/synergy/patches/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/synergy/CPacketStreamFilter.cpp.orig 2005-04-24 05:02:16.000000000 +0200 -+++ lib/synergy/CPacketStreamFilter.cpp -@@ -16,6 +16,7 @@ - #include "IEventQueue.h" - #include "CLock.h" - #include "TMethodEventJob.h" -+#include <string.h> - - // - // CPacketStreamFilter diff --git a/net/synergy/patches/patch-ai b/net/synergy/patches/patch-ai deleted file mode 100644 index 3286dbab869..00000000000 --- a/net/synergy/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/synergy/IKeyState.cpp.orig 2006-03-22 06:40:27.000000000 +0100 -+++ lib/synergy/IKeyState.cpp -@@ -13,6 +13,7 @@ - */ - - #include "IKeyState.h" -+#include <stdlib.h> - #include <string.h> - - // diff --git a/net/synergy/patches/patch-aj b/net/synergy/patches/patch-aj deleted file mode 100644 index 24d8c84a9f9..00000000000 --- a/net/synergy/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/synergy/IPrimaryScreen.cpp.orig 2006-03-22 06:40:27.000000000 +0100 -+++ lib/synergy/IPrimaryScreen.cpp -@@ -13,6 +13,7 @@ - */ - - #include "IPrimaryScreen.h" -+#include <stdlib.h> - - // - // IPrimaryScreen diff --git a/net/synergy/patches/patch-ak b/net/synergy/patches/patch-ak deleted file mode 100644 index de258c68dc9..00000000000 --- a/net/synergy/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/client/CClient.cpp.orig 2006-03-09 05:07:17.000000000 +0100 -+++ lib/client/CClient.cpp -@@ -26,6 +26,8 @@ - #include "CLog.h" - #include "IEventQueue.h" - #include "TMethodEventJob.h" -+#include <stdlib.h> -+#include <string.h> - - // - // CClient diff --git a/net/synergy/patches/patch-al b/net/synergy/patches/patch-al deleted file mode 100644 index 365944eae90..00000000000 --- a/net/synergy/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-al,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/client/CServerProxy.cpp.orig 2006-04-02 03:47:03.000000000 +0200 -+++ lib/client/CServerProxy.cpp -@@ -23,6 +23,7 @@ - #include "IEventQueue.h" - #include "TMethodEventJob.h" - #include "XBase.h" -+#include <string.h> - #include <memory> - - // diff --git a/net/synergy/patches/patch-am b/net/synergy/patches/patch-am deleted file mode 100644 index 2697833c9f7..00000000000 --- a/net/synergy/patches/patch-am +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-am,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/server/CClientProxy1_3.cpp.orig 2006-02-12 20:53:43.000000000 +0100 -+++ lib/server/CClientProxy1_3.cpp -@@ -17,6 +17,7 @@ - #include "CLog.h" - #include "IEventQueue.h" - #include "TMethodEventJob.h" -+#include <string.h> - - // - // CClientProxy1_3 diff --git a/net/synergy/patches/patch-an b/net/synergy/patches/patch-an deleted file mode 100644 index 1510a5dd1ce..00000000000 --- a/net/synergy/patches/patch-an +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-an,v 1.1 2009/09/19 19:14:54 tnn Exp $ - ---- lib/server/CServer.cpp.orig 2006-04-02 03:47:04.000000000 +0200 -+++ lib/server/CServer.cpp -@@ -28,6 +28,7 @@ - #include "CLog.h" - #include "TMethodEventJob.h" - #include "CArch.h" -+#include <stdlib.h> - #include <string.h> - - // |