diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-08-31 11:37:57 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-08-31 11:37:57 +0000 |
| commit | 44fdfcdf8605ac13dea25d033c56bd0a3b3981c4 (patch) | |
| tree | e126d18c6bb0297d574181f350a453b29c2fe594 /net/unison232/files | |
| parent | b9c99b47974f29d1b754dec6ba34f3ee67899367 (diff) | |
Notes
Diffstat (limited to 'net/unison232/files')
| -rw-r--r-- | net/unison232/files/patch-aa | 34 | ||||
| -rw-r--r-- | net/unison232/files/patch-pty.c | 27 |
2 files changed, 37 insertions, 24 deletions
diff --git a/net/unison232/files/patch-aa b/net/unison232/files/patch-aa index a14c18bfa972..483f1bab2391 100644 --- a/net/unison232/files/patch-aa +++ b/net/unison232/files/patch-aa @@ -1,27 +1,31 @@ ---- 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 27 15:49:56 2005 ++++ Makefile Sat Aug 27 15:51:55 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 $$$$) +- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) +- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) +# -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 ++ ${BSD_INSTALL_PROGRAM} $(NAME)$(EXEC_EXT) $(INSTALLDIR) ++# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) + + + ###################################################################### +@@ -353,7 +353,7 @@ + .PHONY: tags -@@ -231,7 +231,7 @@ tags: - -$(ETAGS) *.ml *.mli *.txt +- -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt ++ -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt --all:: TAGS -+#all:: TAGS + all:: TAGS - TAGS: - $(MAKE) tags diff --git a/net/unison232/files/patch-pty.c b/net/unison232/files/patch-pty.c index 833ac9b05ed4..2066ff98bdcd 100644 --- a/net/unison232/files/patch-pty.c +++ b/net/unison232/files/patch-pty.c @@ -1,13 +1,22 @@ ---- 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 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> -+#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; |