diff options
| author | wiz <wiz@pkgsrc.org> | 2011-02-25 20:01:37 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-02-25 20:01:37 +0000 |
| commit | 5dd3cb5617671f807ad23166a512f7f6dfd6ed92 (patch) | |
| tree | 423e345f18096c40db94a6700a80e681fffefb69 /net/unison2.32/patches | |
| parent | 80269be76e938b9b54b930b0681164cac9a9d143 (diff) | |
| download | pkgsrc-5dd3cb5617671f807ad23166a512f7f6dfd6ed92.tar.gz | |
Reimport of net/unison-2.32 before update to incompatible 2.40 version.
Diffstat (limited to 'net/unison2.32/patches')
| -rw-r--r-- | net/unison2.32/patches/patch-aa | 42 | ||||
| -rw-r--r-- | net/unison2.32/patches/patch-ab | 13 |
2 files changed, 55 insertions, 0 deletions
diff --git a/net/unison2.32/patches/patch-aa b/net/unison2.32/patches/patch-aa new file mode 100644 index 00000000000..8cbc6411dda --- /dev/null +++ b/net/unison2.32/patches/patch-aa @@ -0,0 +1,42 @@ +$NetBSD: patch-aa,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $ + +--- Makefile.orig 2009-05-02 02:31:27.000000000 +0000 ++++ Makefile +@@ -39,7 +39,7 @@ all:: INSTALL + + INSTALL: $(NAME)$(EXEC_EXT) + # file isn't made for OS X, so check that it's there first +- (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi) ++## (if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi) + + ######################################################################## + ## Miscellaneous developer-only switches +@@ -68,7 +68,7 @@ include Makefile.OCaml + ###################################################################### + # Installation + +-INSTALLDIR = $(HOME)/bin/ ++INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/ + + # This has two names because on OSX the file INSTALL shadows the target 'install'! + install: doinstall +@@ -80,10 +80,7 @@ text: + $(MAKE) -C .. text + + 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) +- + + ###################################################################### + # Demo +@@ -336,7 +333,7 @@ testmerge: + tags: + -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt + +-all:: TAGS ++#all:: TAGS + + TAGS: + $(MAKE) tags diff --git a/net/unison2.32/patches/patch-ab b/net/unison2.32/patches/patch-ab new file mode 100644 index 00000000000..2d7861c69a0 --- /dev/null +++ b/net/unison2.32/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $ + +--- update.mli.orig 2009-05-02 02:31:27.000000000 +0000 ++++ update.mli 2010-08-23 22:18:21.000000000 +0000 +@@ -1,7 +1,7 @@ + (* Unison file synchronizer: src/update.mli *) + (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) + +-module NameMap : Map.S with type key = Name.t ++module NameMap : MyMap.S with type key = Name.t + + type archive = + ArchiveDir of Props.t * archive NameMap.t |