[csw-devel] SF.net SVN: gar:[11861] csw/mgar/pkg/synergy/trunk

[skayser at users.sourceforge.net]

Revision: 11861
          http://gar.svn.sourceforge.net/gar/?rev=11861&view=rev
Author:   skayser
Date:     2010-12-09 21:26:25 +0000 (Thu, 09 Dec 2010)

Log Message:
-----------
synergy: work towards 1.3.4

Modified Paths:
--------------
    csw/mgar/pkg/synergy/trunk/Makefile
    csw/mgar/pkg/synergy/trunk/checksums

Modified: csw/mgar/pkg/synergy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/synergy/trunk/Makefile	2010-12-09 03:47:03 UTC (rev 11860)
+++ csw/mgar/pkg/synergy/trunk/Makefile	2010-12-09 21:26:25 UTC (rev 11861)
@@ -1,5 +1,17 @@
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+# ! Doesn't yet build
+# "../../lib/server/CConfig.h", line 145: Error: "," expected instead of "<".
+# "../../lib/server/CConfig.h", line 145: Error: Use ";" to terminate declarations.
+# "../../lib/server/CConfig.h", line 145: Error: "}" expected instead of "<".
+# "../../lib/server/CConfig.h", line 145: Error: Use ";" to terminate declarations.
+# "../../lib/server/CConfig.h", line 145: Error: A declaration was expected instead of "<".
+# "../../lib/server/CConfig.h", line 145: Warning: declarator required in declaration.
+# "../../lib/server/CConfig.h", line 145: Error: Use ";" to terminate declarations.
+# "../../lib/server/CConfig.h", line 145: Error: A declaration was expected instead of ">"
+#
 GARNAME = synergy
-GARVERSION = 1.3.1
+GARVERSION = 1.3.4
 CATEGORIES = apps
 
 DESCRIPTION = Software-based TCP/IP "KVM" switch
@@ -10,54 +22,50 @@
  on their desk since each system uses its own monitor(s). 
 endef
 
-SPKG_SOURCEURL = http://synergy2.sourceforge.net/
+VENDOR_URL     = http://synergy-foss.org/
+MASTER_SITES   = $(GOOGLE_MIRROR)
+GOOGLE_PROJECT = synergy-plus
+DISTFILES      = synergy-plus-$(GARVERSION).tar.gz
+DISTNAME       = synergy-plus-$(GARVERSION)
 
-MASTER_SITES = $(SF_MIRRORS)
-SF_PROJ = $(GARNAME)2
-DISTFILES  = synergy-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWsynergy)
-
 # We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=59275
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
+UPSTREAM_MASTER_SITES = http://synergy-foss.org/pm/projects/synergy/tabs/download
+UFILES_REGEX = synergy-plus-(\d+(?:\.\d+)*).tar.gz
 
+# Was required with synergy 1.3.1, still required?
 # Adjust code so that it compiles with Sun Studio Compiler
 # https://sourceforge.net/tracker/index.php?func=detail&aid=1574331&group_id=59275&atid=490469
-PATCHFILES = suncc.diff
+#PATCHFILES = suncc.diff
 
+# Was required with synergy 1.3.1, still required?
 # Adjust configure.in to properly use --x-libraries option
 # http://sf.net/tracker/index.php?func=detail&aid=2359359&group_id=59275&atid=490469
-PATCHFILES += link-xlibs.diff
+#PATCHFILES += link-xlibs.diff
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 CONFIGURE_ARGS += --x-includes=/usr/openwin/include
 CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib
 
 TEST_SCRIPTS =
 
-# fix missing user write permissions
-post-extract:
-	@chmod -R u+w $(WORKSRC)
-	@$(MAKECOOKIE)
+#pre-configure:
+#	cd $(WORKSRC) && autoreconf
+#	@$(MAKECOOKIE)
 
-pre-configure:
-	cd $(WORKSRC) && autoreconf
-	@$(MAKECOOKIE)
-
 post-install:
-	@ginstall -d $(DESTDIR)$(sysconfdir)
-	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/images
-	@ginstall -m 644 \
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)/images
+	ginstall -m 644 \
 		$(WORKSRC)/examples/synergy.conf \
 		$(DESTDIR)$(sysconfdir)/synergy.conf.example
-	@ginstall -m 644 \
+	ginstall -m 644 \
 		$(WORKSRC)/README \
 		$(WORKSRC)/AUTHORS \
 		$(WORKSRC)/NEWS \
 		$(WORKSRC)/doc/*.html \
 		$(DESTDIR)$(docdir)/$(GARNAME)
-	@ginstall -m 644 \
+	ginstall -m 644 \
 		$(WORKSRC)/doc/images/* \
 		$(DESTDIR)$(docdir)/$(GARNAME)/images
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/synergy/trunk/checksums
===================================================================
--- csw/mgar/pkg/synergy/trunk/checksums	2010-12-09 03:47:03 UTC (rev 11860)
+++ csw/mgar/pkg/synergy/trunk/checksums	2010-12-09 21:26:25 UTC (rev 11861)
@@ -1,4 +1 @@
-a6e09d6b71cb217f23069980060abf27  download/synergy-1.3.1.tar.gz
-8ee797c256fbfdd223d1647dcab454a0  download/CSWsynergy.gspec
-aa4510eb9fbc50674aa20395f772b1c0  download/suncc.diff
-4d57febac6efdffb43d9edc9a3a9c2d4  download/link-xlibs.diff
+2c565afe5f920d363eef38dd97449b73  synergy-plus-1.3.4.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.