3 files changed, 28 insertions, 29 deletions
diff --git a/devel/aegis/patches/patch-aa b/devel/aegis/patches/patch-aa
index 806c22599bf..1b605f47c2b 100644
--- a/devel/aegis/patches/patch-aa
+++ b/devel/aegis/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2008/06/12 02:14:21 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/06/10 11:16:36 obache Exp $
 
---- Makefile.in.orig	2008-06-10 14:30:39.000000000 +0000
+--- Makefile.in.orig	2008-09-24 21:48:58.000000000 +0000
 +++ Makefile.in
-@@ -7728,7 +7728,7 @@ $(RPM_BUILD_ROOT)$(datadir)/cshrc: lib/c
- $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.csh: \
- 		$(RPM_BUILD_ROOT)$(datadir)/cshrc
- 	-@mkdir -p $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d
+@@ -10248,7 +10248,7 @@ $(DESTDIR)$(datadir)/cshrc: lib/cshrc li
+ 
+ $(DESTDIR)$(sysconfdir)/profile.d/aegis.csh: $(DESTDIR)$(datadir)/cshrc
+ 	-@mkdir -p $(DESTDIR)$(sysconfdir)/profile.d
 -	-ln -s $(datadir)/cshrc $@
-+	-ln -s $(RPM_BUILD_ROOT)$(datadir)/cshrc $@
++	-ln -s $(DESTDIR)$(datadir)/cshrc $@
+ 
+ $(DESTDIR)$(datadir)/db_forced.sh: lib/db_forced.sh lib/.mkdir.datadir
+ 	$(INSTALL_SCRIPT) lib/db_forced.sh $@
+@@ -14292,7 +14292,7 @@ $(DESTDIR)$(datadir)/profile: lib/profil
  
- $(RPM_BUILD_ROOT)$(datadir)/db_forced.sh: lib/db_forced.sh \
- 		lib/.mkdir.datadir
-@@ -11745,7 +11745,7 @@ $(RPM_BUILD_ROOT)$(datadir)/profile: lib
- $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.sh: \
- 		$(RPM_BUILD_ROOT)$(datadir)/profile
- 	-@mkdir -p $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d
+ $(DESTDIR)$(sysconfdir)/profile.d/aegis.sh: $(DESTDIR)$(datadir)/profile
+ 	-@mkdir -p $(DESTDIR)$(sysconfdir)/profile.d
 -	-ln -s $(datadir)/profile $@
-+	-ln -s $(RPM_BUILD_ROOT)$(datadir)/profile $@
++	-ln -s $(DESTDIR)$(datadir)/profile $@
  
- $(RPM_BUILD_ROOT)$(datadir)/remind/awt_dvlp.sh: lib/remind/awt_dvlp.sh \
- 		lib/remind/.mkdir.datadir
+ lib/pt_BR/LC_MESSAGES/aegis.mo: etc/msgfmt.sh \
+ 		lib/pt_BR/LC_MESSAGES/aegis.po
diff --git a/devel/aegis/patches/patch-ac b/devel/aegis/patches/patch-ac
deleted file mode 100644
index 6f30e32bf65..00000000000
--- a/devel/aegis/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/10/07 07:12:11 rillig Exp $
-
---- script/ae_diff2htm.in.orig	2003-11-17 00:01:51.000000000 +0100
-+++ script/ae_diff2htm.in	2006-10-07 09:10:07.000000000 +0200
-@@ -46,7 +46,7 @@ IFS="$save_ifs"
- #
- # The command line should have two file names on it, diff them and output HTML.
- #
--if [ "$have_diff2html" == "yes" ]
-+if [ "$have_diff2html" = "yes" ]
- then
-     diff2html "$@"
- else
diff --git a/devel/aegis/patches/patch-ad b/devel/aegis/patches/patch-ad
new file mode 100644
index 00000000000..ae9a586e0b3
--- /dev/null
+++ b/devel/aegis/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2009/06/10 11:16:36 obache Exp $
+
+--- common/safe_strsig.cc.orig	2008-09-24 21:48:58.000000000 +0000
++++ common/safe_strsig.cc
+@@ -18,6 +18,7 @@
+ 
+ #include <common/ac/stdio.h>
+ #include <common/ac/string.h>
++#include <common/ac/unistd.h>
+ 
+ #include <common/safe_strsig.h>
+