From 1yen@sh.rim.or.jp  Sat Aug  6 01:03:34 2005
Return-Path: <1yen@sh.rim.or.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 704F516A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Aug 2005 01:03:34 +0000 (GMT)
	(envelope-from 1yen@sh.rim.or.jp)
Received: from mx.crc.co.jp (mxb.crc.co.jp [157.113.18.32])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B261F43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Aug 2005 01:03:33 +0000 (GMT)
	(envelope-from 1yen@sh.rim.or.jp)
Received: from mail1.crc.co.jp by crc.co.jp  with ESMTP id j7613Af18394; Sat, 6 Aug 2005 10:03:10 +0900 (JST) env-from (1yen@sh.rim.or.jp)
Received: from crcc1712.tky.crc.co.jp
        by mail1.crc.co.jp  with ESMTP id j7613Vs05211;
        Sat, 6 Aug 2005 10:03:31 +0900 (JST)
        env-from (1yen@sh.rim.or.jp)
Received: from crcc1712.tky.crc.co.jp (localhost.tky.crc.co.jp [127.0.0.1])
	by crcc1712.tky.crc.co.jp (8.13.3/8.13.1) with ESMTP id j7613UtX005200;
	Sat, 6 Aug 2005 10:03:30 +0900 (JST)
	(envelope-from ossan@crcc1712.tky.crc.co.jp)
Received: (from ossan@localhost)
	by crcc1712.tky.crc.co.jp (8.13.3/8.13.1/Submit) id j7613ULa005199;
	Sat, 6 Aug 2005 10:03:30 +0900 (JST)
	(envelope-from ossan)
Message-Id: <200508060103.j7613ULa005199@crcc1712.tky.crc.co.jp>
Date: Sat, 6 Aug 2005 10:03:30 +0900 (JST)
From: NAKAMURA Takeshi <1yen@sh.rim.or.jp>
Reply-To: NAKAMURA Takeshi <1yen@sh.rim.or.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: daniel+unison@pelleg.org
Subject: [PATCH] ports update: net/unison-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         84603
>Category:       ports
>Synopsis:       [PATCH] ports update: net/unison-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 06 01:10:21 GMT 2005
>Closed-Date:    Wed Aug 31 11:38:56 GMT 2005
>Last-Modified:  Wed Aug 31 11:38:56 GMT 2005
>Originator:     NAKAMURA Takeshi
>Release:        FreeBSD 5.4-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD crcc1712.tky.crc.co.jp 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #2: Thu Jul 28 15:26:43 JST 2005 root@crcc1712.tky.crc.co.jp:/export/misc/obj/export/home/src/sys/CRCC1712 i386


	
>Description:
  ports update: net/unison-devel
>How-To-Repeat:
	
>Fix:

--- ports/net/unison-devel/Makefile.orig	26 Jan 2005 17:31:57 -0000	1.16
+++ ports/net/unison-devel/Makefile	5 Aug 2005 23:58:20 -0000
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	unison
-PORTVERSION=	2.10.2
+PORTVERSION=	2.13.16
 CATEGORIES=	net
-MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/
+MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DIST_SUBDIR}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
--- ports/net/unison-devel/distinfo.orig	26 Jan 2005 17:31:57 -0000	1.9
+++ ports/net/unison-devel/distinfo	5 Aug 2005 23:59:52 -0000
@@ -1,8 +1,8 @@
-MD5 (unison-2.10.2/unison-2.10.2.tar.gz) = a93cf03d4221ab6bab8b758b0325a9d5
-SIZE (unison-2.10.2/unison-2.10.2.tar.gz) = 458032
-MD5 (unison-2.10.2/unison-2.10.2-manual.html) = 46cac2b5b84e821d39cc5a100dd97e7a
-SIZE (unison-2.10.2/unison-2.10.2-manual.html) = 190911
-MD5 (unison-2.10.2/unison-2.10.2-manual.pdf) = 7e6b018d758b786d7cf5752413c08168
-SIZE (unison-2.10.2/unison-2.10.2-manual.pdf) = 354402
-MD5 (unison-2.10.2/unison-2.10.2-manual.ps) = 89cc36cf06d688f163a924fc8c1a47f9
-SIZE (unison-2.10.2/unison-2.10.2-manual.ps) = 490966
+MD5 (unison-2.13.16/unison-2.13.16.tar.gz) = a79bf5f4ebf2a1eaf15b1ac97f827374
+SIZE (unison-2.13.16/unison-2.13.16.tar.gz) = 393266
+MD5 (unison-2.13.16/unison-2.13.16-manual.html) = 2b39e52ec3893a112b28b7b0a294d941
+SIZE (unison-2.13.16/unison-2.13.16-manual.html) = 196162
+MD5 (unison-2.13.16/unison-2.13.16-manual.pdf) = e7684d401d6f5ee194b9e631cc022dd6
+SIZE (unison-2.13.16/unison-2.13.16-manual.pdf) = 436229
+MD5 (unison-2.13.16/unison-2.13.16-manual.ps) = 49cd0eef6cc98a1af7fed38313ccab42
+SIZE (unison-2.13.16/unison-2.13.16-manual.ps) = 414346
>Release-Note:
>Audit-Trail:

From: NAKAMURA Takeshi <ta.nakamura@crs.co.jp>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/84603: [PATCH] ports update: net/unison-devel
Date: Sat, 06 Aug 2005 12:33:27 +0900

 need this patch.
 
 --- ports/net/unison-devel/files/patch-aa	29 Aug 2001 19:36:53 -0000	1.2
 +++ ports/net/unison-devel/files/patch-aa	6 Aug 2005 01:08:55 -0000
 @@ -1,27 +1,30 @@
 ---- Makefile.orig	Tue Aug 28 16:27:01 2001
 -+++ Makefile	Wed Aug 29 09:15:09 2001
 -@@ -62,12 +62,12 @@
 +--- Makefile.orig	Sat Aug  6 10:06:43 2005
 ++++ Makefile	Sat Aug  6 10:08:11 2005
 +@@ -68,15 +68,15 @@
   ######################################################################
   # Installation
   
  -INSTALLDIR = $(HOME)/bin/
  +INSTALLDIR = ${PREFIX}/bin/
   
 - install: $(NAME)$(EXEC_EXT)
 + # This has two names because on OSX the file INSTALL shadows the target 'install'!
 + install: doinstall
 + 
 + doinstall: $(NAME)$(EXEC_EXT)
  -	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
  +#	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
   	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
 --	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)
 -+#	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)
 - 	@# If we're running at Penn, install a public version too
 - 	if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi
 +-	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
 ++#	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
 + 
   
 -@@ -231,7 +231,7 @@
 + ######################################################################
 +@@ -355,7 +355,7 @@
   tags:
 - 	-$(ETAGS) *.ml *.mli *.txt
 + 	-$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
   
  -all:: TAGS
  +#all:: TAGS
   
 - TAGS: 
 + TAGS:
   	$(MAKE) tags
 --- ports/net/unison-devel/files/patch-pty.c	26 Jan 2005 17:31:57 -0000	1.1
 +++ ports/net/unison-devel/files/patch-pty.c	6 Aug 2005 01:18:35 -0000
 @@ -1,13 +1,10 @@
 ---- pty.c.orig	Sun Jan 23 19:55:28 2005
 -+++ pty.c	Sun Jan 23 19:56:28 2005
 -@@ -32,6 +32,10 @@
 - #ifdef __APPLE__
 - #include <util.h>          // openpty
 +--- pty.c.orig	Sat Aug  6 10:17:07 2005
 ++++ pty.c	Sat Aug  6 10:17:58 2005
 +@@ -21,6 +21,7 @@
   #endif
 -+#ifdef __FreeBSD__
 -+#include <sys/types.h>
 -+#include <libutil.h>
 -+#endif
   
 - /* c_openpty: unit -> (int * Unix.file_descr) */
 - CAMLprim value c_openpty() {
 + #ifdef __FreeBSD__
 ++#include <sys/types.h>
 + #include <libutil.h>
 + #define HAS_OPENPTY 1
 + #endif
 
 

From: NAKAMURA Takeshi <ta.nakamura@crs.co.jp>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/84603: [PATCH] ports update: net/unison-devel
Date: Sat, 06 Aug 2005 16:40:43 +0900

 i got
 % uname -smr
 FreeBSD 4.11-STABLE i386
 % cd /usr/ports/net/unison-devel ; make
 ocamlopt -I lwt -I ubase -c /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c
 /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c: In function `c_openpty':
 /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c:46: syntax error before `pair'
 /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c:47: `pair' undeclared (first use in this function)
 /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c:47: (Each undeclared identifier is reported only once
 /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c:47: for each function it appears in.)
 /.a/ports/net/unison-devel/work/unison-2.13.16/pty.c:50: warning: control reaches end of non-void function
 gmake: *** [pty.o] Error 2
 *** Error code 2
 1 error
 
 I can compiled on 4-STABLE with this patch.(compiler bug?)
 patch for 4-STABLE
 
 --- ports/net/unison-devel/files/patch-pty.c	6 Aug 2005 01:18:35 -0000
 +++ ports/net/unison-devel/files/patch-pty.c	6 Aug 2005 15:54:27 +0900
 @@ -1,5 +1,5 @@
  --- pty.c.orig	Sat Aug  6 10:17:07 2005
 -+++ pty.c	Sat Aug  6 10:17:58 2005
 ++++ pty.c	Sat Aug  6 15:51:26 2005
  @@ -21,6 +21,7 @@
   #endif
   
 @@ -8,3 +8,15 @@
   #include <libutil.h>
   #define HAS_OPENPTY 1
   #endif
 +@@ -40,9 +41,10 @@
 + /* c_openpty: unit -> (int * Unix.file_descr) */
 + CAMLprim value c_openpty() {
 +   int master,slave;
 ++  value pair;
 +   if (openpty(&master,&slave,NULL,NULL,NULL) < 0)
 +     uerror("openpty", (value) 0);
 +-  value pair = alloc_tuple(2);
 ++  pair = alloc_tuple(2);
 +   Store_field(pair,0,Val_int(master));
 +   Store_field(pair,1,Val_int(slave));
 +   return pair;
 
 

From: Ulrich Spoerlein <q@galgenberg.net>
To: bug-followup@FreeBSD.org, 1yen@sh.rim.or.jp
Cc:  
Subject: Re: ports/84603: [PATCH] ports update: net/unison-devel
Date: Thu, 25 Aug 2005 17:18:43 +0200

 This should be committed to the net/unison port, as version 2.13.16 is
 labeled a stable release. See
 http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
 
 Ulrich Spoerlein
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Aug 31 11:38:36 GMT 2005 
State-Changed-Why:  
This update was committed to net/unison port instead, see ports/85350 

http://www.freebsd.org/cgi/query-pr.cgi?pr=84603 
>Unformatted:
