Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 06 Aug 2005 12:33:27 +0900
From:      NAKAMURA Takeshi <ta.nakamura@crs.co.jp>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/84603: [PATCH] ports update: net/unison-devel
Message-ID:  <20050806103451.29C3.TA.NAKAMURA@crs.co.jp>
In-Reply-To: <200508060110.j761ALGu044031@freefall.freebsd.org>
References:  <200508060103.j7613ULa005199@crcc1712.tky.crc.co.jp> <200508060110.j761ALGu044031@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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





Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050806103451.29C3.TA.NAKAMURA>