Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Mar 2008 21:12:29 +0100 (CET)
From:      Daniel Roethlisberger <daniel@roe.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        daniel@roe.ch
Subject:   ports/121543: [patch] Update devel/libopensync to 0.31
Message-ID:  <200803092012.m29KCTNR013916@marvin.roe>
Resent-Message-ID: <200803092020.m29KK1B8011442@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         121543
>Category:       ports
>Synopsis:       [patch] Update devel/libopensync to 0.31
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 09 20:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 6.3-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD marvin.roe 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #0: Wed Feb 13 02:40:56 UTC 2008 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This will update devel/libopensync to 0.31.

Add:
files/
files/patch-build_osync_support.py
>How-To-Repeat:
>Fix:
--- libopensync-0.31.diff begins here ---
diff -ruN libopensync.orig/Makefile libopensync/Makefile
--- libopensync.orig/Makefile	2007-07-04 11:59:59.000000000 +0200
+++ libopensync/Makefile	2008-03-09 20:40:12.000000000 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libopensync
-PORTVERSION=	0.30
-PORTREVISION=	1
+PORTVERSION=	0.31
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opensync.org/attachment/wiki/download/
 DISTNAME=	libopensync-${PORTVERSION}
@@ -27,8 +26,11 @@
 SCONS_ARGS=	prefix=${PREFIX}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$libsuffix/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/SConstruct
-	@${REINPLACE_CMD} -e 's|gthread-2.0|gthread-2.0 pthread|' ${WRKSRC}/opensync/SConscript
+	@${REINPLACE_CMD} -e "s|install_lib, 'pkgconfig'|install_prefix, 'libdata', 'pkgconfig'|" ${WRKSRC}/SConstruct
+	@${REINPLACE_CMD} \
+		-e 's|gthread-2.0|gthread-2.0 pthread|' \
+		-e 's|vnum="%d.%d.%d" % ([^)]*)|vnum="%d" % (config["major"])|' \
+		${WRKSRC}/opensync/SConscript
 
 post-install:
 	@${LN} -sf ${LOCALBASE}/lib/libopensync.so ${LOCALBASE}/lib/libopensync.so.1
diff -ruN libopensync.orig/distinfo libopensync/distinfo
--- libopensync.orig/distinfo	2007-06-18 01:04:58.000000000 +0200
+++ libopensync/distinfo	2008-03-09 19:10:21.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (libopensync-0.30.tar.bz2?rev=&format=raw) = 1b52417878ab4ede584ce18edacfa548
-SHA256 (libopensync-0.30.tar.bz2?rev=&format=raw) = 0a1cfcb736d3569f8bced7e2e6c48d3168a0e97dee40705d09c5adfadcf6a463
-SIZE (libopensync-0.30.tar.bz2?rev=&format=raw) = 862123
+MD5 (libopensync-0.31.tar.bz2?rev=&format=raw) = caf4fd1b174f4863ba79ab074a29b054
+SHA256 (libopensync-0.31.tar.bz2?rev=&format=raw) = bdbaae2a70e202ee90e6af500f22f3de81459a1cb0445c0668eeedf020d723a3
+SIZE (libopensync-0.31.tar.bz2?rev=&format=raw) = 862176
diff -ruN libopensync.orig/files/patch-build_osync_support.py libopensync/files/patch-build_osync_support.py
--- libopensync.orig/files/patch-build_osync_support.py	1970-01-01 01:00:00.000000000 +0100
+++ libopensync/files/patch-build_osync_support.py	2008-03-09 19:39:18.000000000 +0100
@@ -0,0 +1,12 @@
+Significant whitespace considered harmful...
+--- build/osync_support.py.orig	2007-06-21 14:38:39.000000000 +0200
++++ build/osync_support.py	2008-03-09 19:32:41.000000000 +0100
+@@ -54,7 +54,7 @@
+ 			else:
+ 				# bad, nothing is available, tell the user
+ 				print "No build directories found for your platform '%s'" % platform
+-			return None
++				return None
+ 
+ 	print "Found directory %s, will build there" % target_dir
+ 	return target_dir
diff -ruN libopensync.orig/pkg-plist libopensync/pkg-plist
--- libopensync.orig/pkg-plist	2007-07-04 11:59:59.000000000 +0200
+++ libopensync/pkg-plist	2008-03-09 20:12:27.000000000 +0100
@@ -31,6 +31,7 @@
 include/opensync-1.0/opensync/merger/opensync_xmlfield.h
 include/opensync-1.0/opensync/merger/opensync_xmlfieldlist.h
 include/opensync-1.0/opensync/merger/opensync_xmlformat.h
+include/opensync-1.0/opensync/opensync-archive.h
 include/opensync-1.0/opensync/opensync-client.h
 include/opensync-1.0/opensync/opensync-context.h
 include/opensync-1.0/opensync/opensync-data.h
@@ -66,15 +67,16 @@
 libdata/pkgconfig/osengine-1.0.pc
 share/opensync/capabilities/file-sync.xml
 share/opensync/capabilities/syncml-nokia-7650.xml
-share/opensync/descriptions/descriptions.xsd
 share/opensync/descriptions/miscellaneous.xml
 share/opensync/descriptions/syncml-nokia.xml
-share/opensync/descriptions/xmlformat-calendar.xsd
-share/opensync/descriptions/xmlformat-common.xsd
-share/opensync/descriptions/xmlformat-contact.xsd
-share/opensync/descriptions/xmlformat-event.xsd
-share/opensync/descriptions/xmlformat-note.xsd
-share/opensync/descriptions/xmlformat-todo.xsd
+share/opensync/schemas/descriptions.xsd
+share/opensync/schemas/xmlformat-calendar.xsd
+share/opensync/schemas/xmlformat-common.xsd
+share/opensync/schemas/xmlformat-contact.xsd
+share/opensync/schemas/xmlformat-event.xsd
+share/opensync/schemas/xmlformat-note.xsd
+share/opensync/schemas/xmlformat-todo.xsd
+@dirrm share/opensync/schemas
 @dirrm share/opensync/descriptions
 @dirrm share/opensync/capabilities
 @dirrm share/opensync
--- libopensync-0.31.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803092012.m29KCTNR013916>