Attachment #56519 for bug #85350

View | Details | Raw Unified | Return to bug 85350
Collapse All | Expand All

Lines 6-14 Link Here

(-)unison-2.13.16/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= unison	8	PORTNAME= unison
9	PORTVERSION= 2.10.2	9	PORTVERSION= 2.13.16
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/	11	MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
12	DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}	12	DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
13	DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}	13	DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
14	EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz	14	EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz

Lines 1-8 Link Here

(-)unison-2.13.16/distinfo (-8 / +8 lines)
1	MD5 (unison-2.10.2/unison-2.10.2.tar.gz) = a93cf03d4221ab6bab8b758b0325a9d5	1	MD5 (unison-2.13.16/unison-2.13.16.tar.gz) = a79bf5f4ebf2a1eaf15b1ac97f827374
2	SIZE (unison-2.10.2/unison-2.10.2.tar.gz) = 458032	2	SIZE (unison-2.13.16/unison-2.13.16.tar.gz) = 393266
3	MD5 (unison-2.10.2/unison-2.10.2-manual.html) = 46cac2b5b84e821d39cc5a100dd97e7a	3	MD5 (unison-2.13.16/unison-2.13.16-manual.html) = 2b39e52ec3893a112b28b7b0a294d941
4	SIZE (unison-2.10.2/unison-2.10.2-manual.html) = 190911	4	SIZE (unison-2.13.16/unison-2.13.16-manual.html) = 196162
5	MD5 (unison-2.10.2/unison-2.10.2-manual.pdf) = 7e6b018d758b786d7cf5752413c08168	5	MD5 (unison-2.13.16/unison-2.13.16-manual.pdf) = e7684d401d6f5ee194b9e631cc022dd6
6	SIZE (unison-2.10.2/unison-2.10.2-manual.pdf) = 354402	6	SIZE (unison-2.13.16/unison-2.13.16-manual.pdf) = 436229
7	MD5 (unison-2.10.2/unison-2.10.2-manual.ps) = 89cc36cf06d688f163a924fc8c1a47f9	7	MD5 (unison-2.13.16/unison-2.13.16-manual.ps) = 49cd0eef6cc98a1af7fed38313ccab42
8	SIZE (unison-2.10.2/unison-2.10.2-manual.ps) = 490966	8	SIZE (unison-2.13.16/unison-2.13.16-manual.ps) = 414346

Lines 1-27 Link Here

(-)unison-2.13.16/files/patch-aa (-15 / +19 lines)
1	--- Makefile.orig Tue Aug 28 16:27:01 2001	1	--- Makefile.orig Sat Aug 27 15:49:56 2005
2	+++ Makefile Wed Aug 29 09:15:09 2001	2	+++ Makefile Sat Aug 27 15:51:55 2005
3	@@ -62,12 +62,12 @@	3	@@ -68,15 +68,15 @@
4	######################################################################	4	######################################################################
5	# Installation	5	# Installation
6		6
7	-INSTALLDIR = $(HOME)/bin/	7	-INSTALLDIR = $(HOME)/bin/
8	+INSTALLDIR = ${PREFIX}/bin/	8	+INSTALLDIR = ${PREFIX}/bin/
9		9
10	install: $(NAME)$(EXEC_EXT)	10	# This has two names because on OSX the file INSTALL shadows the target 'install'!
		11	install: doinstall
		12
		13	doinstall: $(NAME)$(EXEC_EXT)
11	- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)	14	- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
		15	- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
		16	- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
12	+# -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)	17	+# -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
13	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)	18	+ ${BSD_INSTALL_PROGRAM} $(NAME)$(EXEC_EXT) $(INSTALLDIR)
14	- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)	19	+# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
15	+# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT)	20
16	@# If we're running at Penn, install a public version too	21
17	if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi	22	######################################################################
		23	@@ -353,7 +353,7 @@
		24	.PHONY: tags
18		25
19	@@ -231,7 +231,7 @@
20	tags:	26	tags:
21	-$(ETAGS) .ml .mli *.txt	27	- -$(ETAGS) .mli /.mli .ml /.ml .m /.m .c /.c *.txt
		28	+ -$(ETAGS) .mli /.mli .ml /.ml /.m .c /.c .txt
22		29
23	-all:: TAGS	30	all:: TAGS
24	+#all:: TAGS
25		31
26	TAGS:
27	$(MAKE) tags




--- pty.c.orig	Mon May 30 15:15:43 2005
+++ pty.c	Sat Aug 27 15:47:55 2005
@@ -21,6 +21,7 @@
 #endif
 
 #ifdef __FreeBSD__
+#include <sys/types.h>
 #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;




--- 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
 #endif
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <libutil.h>
+#endif
 
 /* c_openpty: unit -> (int * Unix.file_descr) */
 CAMLprim value c_openpty() {

Lines 1-7 Link Here

(-)unison-2.13.16/pkg-message (-1 / +1 lines)
1	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!	1	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
2	ATTENTION:	2	ATTENTION:
3		3
4	1) Unison archive format has changed since 2.9.20. The old archive	4	1) Unison archive format has changed since 2.10.2. The old archive
5	won't be deleted automatically in case you want to downgrade it.	5	won't be deleted automatically in case you want to downgrade it.
6		6
7	2) Merge functionality has seriously changed. Check the manual.	7	2) Merge functionality has seriously changed. Check the manual.

Return to bug 85350

Line 0 Link Here

(-)unison-2.13.16/files/patch-ab (+22 lines)
	1	--- pty.c.orig Mon May 30 15:15:43 2005
	2	+++ pty.c Sat Aug 27 15:47:55 2005
	3	@@ -21,6 +21,7 @@
	4	#endif
	5
	6	#ifdef __FreeBSD__
	7	+#include <sys/types.h>
	8	#include <libutil.h>
	9	#define HAS_OPENPTY 1
	10	#endif
	11	@@ -40,9 +41,10 @@
	12	/* c_openpty: unit -> (int * Unix.file_descr) */
	13	CAMLprim value c_openpty() {
	14	int master,slave;
	15	+ value pair;
	16	if (openpty(&master,&slave,NULL,NULL,NULL) < 0)
	17	uerror("openpty", (value) 0);
	18	- value pair = alloc_tuple(2);
	19	+ pair = alloc_tuple(2);
	20	Store_field(pair,0,Val_int(master));
	21	Store_field(pair,1,Val_int(slave));
	22	return pair;

Lines 1-13 Link Here

(-)unison-2.13.16/files/patch-pty.c (-13 lines)
1	--- pty.c.orig Sun Jan 23 19:55:28 2005
2	+++ pty.c Sun Jan 23 19:56:28 2005
3	@@ -32,6 +32,10 @@
4	#ifdef __APPLE__
5	#include <util.h> // openpty
6	#endif
7	+#ifdef __FreeBSD__
8	+#include <sys/types.h>
9	+#include <libutil.h>
10	+#endif
11
12	/* c_openpty: unit -> (int * Unix.file_descr) */
13	CAMLprim value c_openpty() {