Update aegis to 4.24.1.

Changes (pkgsrc)
 * Set LICENSE=gnu-gpl-v3.
 * Move statedir to ${VARBASE} and fixes permission.
 * Avoid to effect from currently installed aegis.
 * Some exec files are required to suid root.
 * buildlink zlib and bzip2, they are required.
 * buildlink sysutils/file, to avoid changes if builtin libmagic exists or not.
 * add TEST target.
 * `patch' command is required for runtime.

Change Log(Aegis)					     Change Log(Aegis)

RELEASE	NOTES
   Version 4.24.1 (24-Sep-2008)
	Security: [ #2079025 ] This update fix two security problems
	discovered by the Debian crew (Debian #496400 and #496402) You are
	encouraged to upgrade.

	Removed	functionalities: In response to	one of the two above security
	problem, the aegis.cgi program has been	removed.

	* Test 222 has been improved to	cope with some different ways SVN
	stores revision	information, remaining backwards compatible.

	* A bug	in the distributed development machinery has been fixed: it no
	longer add the file UUID to created files without an UUID in the
	remote repository.  This prevents the existence	of the same file with
	different UUIDs	in different repositories.

	* [ #1942614 ] Some build problem discovered by	the Debian crew	has
	been fixed.  Specifically: improve 'make clean'	(Debian	bug 442482),
	add a minor man-page (Debian patch), make test in ae_diff2htm portable
	(Debian	bug 464484), fix whoami	test in	etc/test.sh (Debian bug
	393624), add shell magic to ae-cvs-ci (Debian patch).

	* The aediff command now behave	as expected when invoked for a file
	that, due to a bug in aeipass, is present with two different UUIDs in
	the repository.	 Previously it used to generate	a diff between the
	empty file and the second revision of the file.

	* A bug	has been fixed in aefind, it no	longer segfaults when given
	the -baseline option.

	* A bug	has been fixed in aefinish: it no longer segfault if a branch
	was to be finished and it contained a transparent file.

	* A bug	has been fixed in the aecp -ind	-output	- option, it no	longer
	tries to set the permission mode of stdout.

	* A bug	has been fixed in aeib,	it no longer complains that
	transparent files have been tampered with.

	* A couple of memory leaks introduced with the time safe work has been
	plugged.

	* The makefile has been	changed	to use DESTDIR (advocated by GNU).

	* A test script	has been improved to work with older bzip2.

	* Small	improvement to test_funcs, reintroduce the chown invocation
	for the	directory under	$work/.

	* This change set modify the aefinish command to jump the project home
	path instead of	the user home directory	(since it may be inaccessible)

	* This aegis.spec file (used for RPM builds) has been improved.

   Version 4.24	(09-Mar-2008)
	* Numerous portability improvements.

	* Numerous improvements	to the history reconstruction code.

	* Numerous improvements	and bug	fixes to the distributed development
	code.  See aedist(1), aeget(1),	aetar(1) and aepatch(1)	for more
	information.

	* The site specific architecture information has been split into a
	separate file, maked with an entire-source-hide	attribute, so that new
	Aegis-under-Aegis projects don't have such bad architecture problems.

	* The license has been changed to GPLv3.

	* A bug	has been fixed the the change::pconf_get method	which
	sometimes caused segfaults.

	* A bug	has been fixed in aeclone which	caused aecp -delta to segfault
	when: a	change set whith a removed file	was cloned, and	the clone
	change set subsequently	integrated.

	* The aediff command is	now smarter about files	which may have moved.

	* A bug	has been fixed in the aeannotate command, it no	longer
	segfaults for some file	histories.

	* A Vietnamese error mesage translation	has been added.

	* There	is a new Portugese (Brazillian)	message	catalogue translation.

	* It is	now possible to	develop	begin undo and new change undo in a
	single command.

	* The ael(1) command now understands are much wider range of ways to
	specify	changes.

	* A segfault has been fixed in the use of --delta and --delta-data
	options.

	* This change set fix a	problem	in the aesvt(1)	checkout command that
	can fail to extract from a gzip	compressed archive.

	* A bug	has been fixed in the aechown(1) command, to stop a segfault
	when printing some error messages.

	* There	is a new aebisect(1) command which helps to find project
	regressions not	handled	by the test suite.

	* Many commands	now cope with renames in more situations.

	* A bug	has been fixed in aeclone(1) which caused aecp -delta to
	segfault when a	change set whith a removed file	was cloned, and	the
	clone change set subsequently integrated.

	* The aede-policy(1) manual page has been updated to document the
	aede-policy-line-length	file attribute.

	* A vietnamese translation has been added.

	* The aereport(1) command now understands more ways to specify
	changes.

	* There	is a new ${path_reduce}	substitution which may be used to
	remove redundant elements from path lists, such	as used	by the $PATH
	environment variable.

	* When the development directory style required	actions	to be perfomed
	on the development directory, the obsolete "creating symbolic links to
	baseline" message was produced.	This was confusing. A more generic
	message	is now used, which is intended to be less confusing.

	* The aecp(1) -delta command now follows the whiteout preference when
	copying	a "removed" file.  The test suite now runs much	faster.

	* A bug	has been fixed in the aedbu(1) command.	It no longer complains
	about permissions when the develop_begin_undo_command has been set.

	* A bug	has been fixed in the aeimport(1) command.  It no longer uses
	the Attic portion of filenames when populating the history directory
	tree.

	* The change details listing now prints	comments in a wide column when
	the comments are lengthy.

	* There	is a new $Active_Directory substitution, used to obtain	the
	development directory, or the integration directory, depending on the
	change state. This is rather like the default behaviour	of the aecd(1)
	command.

	* There	is a new ${project version} substitution.

	* The commands run by aeipass are now accompanied by more file name
	information, so	that you can know which	source file corresponds	to
	which UUID history file, if there is a failure in the history
	commands.

	* The aeca(1) command now checks for and discards duplicate
	architecture names. This fixes a bug with unsatifiable architecture
	dependencies.

	* The aeb(1) command has been improved,	it no longer keeps running the
	project_file_comand over and over again.

	* A bug	has been fixed in the aenf(1) command; it now preserves
	existing file contents if new files already exist in the development
	directory.

	* A bug	has been fixed in the "aet -regression"	command, it no longer
	reports	free()ing a non-existent string.

	* A bug	has been fixed in the aed(1) command, it no longer reports a
	bug when a cross branch	merege is attempted for	a file independently
	created	in both	branches.

   Version 4.23
   Version 4.22.2 (18-Oct-2007)
	This is	an update for the 4.22 stable release, it is meant to help
	Aegis users while the next release cycle ends.

	* [ 1684820 ] Fixed a bug in aeclone that caused aecp -delta
	segfaults.

	* The symlink farm now handle derived files registered within Aegis
	more like normal derived files.

	* The change_pconf_get function	no longer looks	for historical
	versions of files, if it can help it.  This makes many things go
	faster and solved the problem of configuration fields redefinition.
	While this change does not make	Aegis more time	safe, it cures one of
	the symptoms.

	* Fixed	test 222 to work with recent releases of subversion.

	* The aepconf(5) has been improved.

	* [ Debian 435422 ] The	reference manual was wrongly referring to
	-Page-Headings instead of -Page-Header.	 The documentation has been
	updated	to match the source code.

	* The test/02/t0257a-walt.sh script has	been back-ported from the
	development branch (4.23) to prevent bug #...... to appear in the
	stable branch.

	* [ 1704108 ] The aecp(1) -delta command now follows the whiteout
	preference when	copying	a "removed"file.

	* [ 1685304 ] A	bug has	been fixed that	caused aecp(1) -delta X	to
	copy in	a change also a	file with the old name of a file aemv(1)ed
	before delta X.

	* The generated	Makefile now installs aelock(1)	with the correct
	permissions.

	* A bug	has been fixed in the aetar(1) command,	it no longer creates
	tarballs that cause BSD	tar to complain	like this: tar:	End of archive
	volume 1 reached tar: Unexpected EOF on	archive	file

	* The configure	script now handle correctly the	datadir	substitution.

   Version 4.22.1 (14-Apr-2007)
	* Test t0247a-walt.sh has been fixed, it was not exporting
	AEGIS_TEST_DIR.	 This make aeintegratq(1) leaving stuff	in the home
	directory of the user.

	* Some minor fix that prevented	Aegis to build on RPM based
	distributions has been fixed.

	* The t0011a.sh	test script failed when	lex(1) was missing, since it
	is not required	to build Aegis the test	script has been	modified to
	pass even when lex(1) is missing.

	* aedist(1) now	handle certain renamed files correctly when receiving
	branches or entire-source.

	* The t0011a.sh	test script failed when	lex(1) was missing, since it
	is not required	to build Aegis the test	script has been	modified to
	pass even when lex(1) is missing.

	* aedist(1) now	handle certain renamed files correctly when receiving
	branches or entire-source.

	* [ 1691122 ] Newer versions of	the autoconf tools introduced a	new
	@datarootdir@, and complained loudly if	it wasn't used.	 Aegis
	configure does not trigger anymore those warnings.

	* The test suite does not use anymore diff(1) -u because not all
	systems	have gnu diff, so the use of gnu diff's	-u option is nor
	portable, and will give	false negatives	on some	systems.

	* The test suite does not use anymore diff(1) -u because not all
	systems	have gnu diff, so the use of gnu diff's	-u option is nor
	portable, and will give	false negatives	on some	systems.

	* aedist(1) -rec now save the UUID as the user defined original-UUID
	if the UUID is already present in the repository.  This	is especially
	useful when receiving changes in the same repository.

	* aeclone(1) now preserve the the UUID of the original change as the
	original-UUID user defined attribute of	the new	change.	It also	copy
	any other used-defined attribute.

	* Test 89 has been disable on HP-UX-10 because that system has a
	"vendor	specific" (i.e.	broken)	cpio(1)	archive	format.

	* Test 95 has been improved to be less sensitive to libmagic(3)
	differences.

	* Test 207 has been changed to be less sensitive to sort(1)
	differences.

	* The project_specific setenv:*	variables are now exported only	once.

	* [ 1674882 ] The following bug	as been	fixed: if a file is created
	and renamed within a single branch, and	that branch is integrated,
	then the file is not included in the output of 'aedist -send -es' from
	subsequent branches.

	* A bug	has been fixed in the aedbu(1) command.	 It no longer
	complains about	permissions when the develop_begin_undo_command	has
	been set.

	* The aedist(1)	-rec command now better	handles	file renamed (not
	aemved)	to match the local repository state.

	* A bug	has been fixed that caused the change_pconf_get	function
	terminate aegis(1) with	a fatal	error if applied to a branch without a
	config file (e.g. if the trunk does not	contain	any closed branch).

	* The aenpr(1) -keep command now set the administrator recursively.

	* A bug	has been fixed in the ${project-specific} substitution,	it now
	works correctly	with the aesub(1) -bl command.

	* aedist(1) -received has been modified	to set the user	defined
	attribute foreign-copyright to true when receiving a remote change
	set.  This in order to avoid aede-policy(1) complain about incorrect
	copyright notice at aede(1) time.0

	* A bug	has been fixed that caused an aemv(1) followed by an aenf(1)
	to generate two	different files	with the same UUID.

	* Avoid	the "multiple permission set" error on quit.

	* A bug	has been fixed in the UUID generating code; it was running out
	of file	descriptors.

	* A bug	has been fixed in the aet(1) -regression command, it no	longer
	reports	free()ing a non-existent string.

	* A bug	has been fixed in the aed(1) command, it no longer reports a
	bug when a cross branch	merge is attempted for a file independently
	created	in both	branches.

	* A bug	has been fixed which caused aeipass(1) to assign UUID to files
	at branch integration pass time. This can happen if the	files was
	created	and integrated with an old Aegis release, lacking support for
	file's UUID.  This bug make it possible	to have	the history for	a file
	split into two part, one accessible via	the file_name, the other
	accessible using the UUID.

	* A segfault in	aeannotate(1) has been fixed.

	* A bug	has been fixed related to the use of the
	unchanged_file_integrate_pass_policy=remove policy described in
	aepconf(5).  In	this case aeipass failed to reset the locked_by	field
	from the project fstate	file, this prevented subsequent	changes	to
	modify the removed file.

	* A bug	has been fixed in the handling of the symlink farm, for
	development directory styles which use them for	derived	files.
	Derived	files in the baseline directory	which were formerly source
	files, but then	aerm-ed, are now included in the development directory
	when copy/link styles are used.

	* A bug	has been fixed in the aenf(1) command; it now preserves
	existing file contents if new files already exist in the file
	development directory.

	* The ./configure script has been improved to stop with	a fatal	error
	if the bzip2 library is	not available.

6 files changed, 79 insertions, 52 deletions

diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 4627ec4d41e..3ae616be117 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -1,37 +1,59 @@
-# $NetBSD: Makefile,v 1.18 2009/03/06 10:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2009/06/10 11:16:36 obache Exp $
 #
 
-DISTNAME=	aegis-4.22
-PKGREVISION=	2
+DISTNAME=	aegis-4.24.1
 CATEGORIES=	devel scm
-MASTER_SITES=	http://aegis.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aegis/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aegis.sourceforge.net/
 COMMENT=	Aegis is a transaction base software configuration management system
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
-EXTRACT_USING=	gtar
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-nlsdir=${_PKGLOCALEDIR:Q}
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		groff gsoelim msgfmt perl:run yacc patch
+USE_TOOLS+=		groff gsoelim msgfmt perl:run yacc patch:run
+
+.include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ENV+=		ac_cv_path_PATCH=${TOOLS_PATCH:Q}
+AEGIS_USER_UID?=	3
+AEGIS_USER_GID?=	3
+
+CONFIGURE_ARGS+=	--with-nlsdir=${_PKGLOCALEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-no-aegis-configured
+CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE}/run/aegis
+CONFIGURE_ENV+=		PATCH=${PATCH:Q}
+CONFIGURE_ENV+=		AEGIS_UID=${AEGIS_USER_UID:Q}
+CONFIGURE_ENV+=		AEGIS_GID=${AEGIS_USER_GID:Q}
 
 EGDIR=			${PREFIX}/share/examples/aegis
-INSTALL_MAKE_FLAGS+=	RPM_BUILD_ROOT=${DESTDIR} \
-			sysconfdir=${EGDIR}
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 
 CONF_FILES+=		${EGDIR}/profile.d/aegis.csh ${PKG_SYSCONFDIR}/profile.d/aegis.csh
 CONF_FILES+=		${EGDIR}/profile.d/aegis.sh ${PKG_SYSCONFDIR}/profile.d/aegis.sh
 
+SPECIAL_PERMS+=		bin/aegis ${SETUID_ROOT_PERMS}
+SPECIAL_PERMS+=		bin/aeimport ${SETUID_ROOT_PERMS}
+SPECIAL_PERMS+=		bin/aelock ${SETUID_ROOT_PERMS}
+
+OWN_DIRS_PERMS+=	${VARBASE}/run/aegis ${AEGIS_USER_UID} ${AEGIS_USER_GID} 2755
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/profile.d
+
+BUILD_DEFS+=		VARBASE AEGIS_USER_UID AEGIS_USER_GID
+
+TEST_TARGET=		sure
+
 AUTO_MKDIRS=		yes
 
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../sysutils/file/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/aegis/PLIST b/devel/aegis/PLIST
index db6dd176e62..6d7d8e4488f 100644
--- a/devel/aegis/PLIST
+++ b/devel/aegis/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2006/10/07 08:50:41 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/10 11:16:36 obache Exp $
 bin/ae-cvs-ci
 bin/ae-repo-ci
 bin/ae-sccs-put
 bin/ae_diff2htm
 bin/aeannotate
+bin/aebisect
 bin/aebuffy
 bin/aecomp
 bin/aecomplete
@@ -17,14 +18,13 @@ bin/aefinish
 bin/aeget
 bin/aeget.instal
 bin/aegis
-bin/aegis.cgi
-bin/aegis.cgi.i
 bin/aeimport
 bin/aeintegratq
 bin/aelcf
 bin/aelock
 bin/aelpf
 bin/aels
+bin/aemakegen
 bin/aemeasure
 bin/aepatch
 bin/aepromptcmd
@@ -37,6 +37,7 @@ bin/aesvt
 bin/aetar
 bin/aexml
 bin/aexver
+bin/find_sizes
 bin/tkaeca
 bin/tkaegis
 bin/tkaenc
@@ -47,9 +48,11 @@ man/man1/ae-cvs-ci.1
 man/man1/ae-repo-ci.1
 man/man1/ae-sccs-put.1
 man/man1/ae_c.1
+man/man1/ae_diff2htm.1
 man/man1/ae_p.1
 man/man1/aeannotate.1
 man/man1/aeb.1
+man/man1/aebisect.1
 man/man1/aebuffy.1
 man/man1/aeca.1
 man/man1/aecd.1
@@ -90,6 +93,7 @@ man/man1/aelic.1
 man/man1/aelock.1
 man/man1/aelpf.1
 man/man1/aels.1
+man/man1/aemakegen.1
 man/man1/aemeasure.1
 man/man1/aemt.1
 man/man1/aemtu.1
@@ -237,9 +241,11 @@ share/aegis/en/man1/ae-cvs-ci.1
 share/aegis/en/man1/ae-repo-ci.1
 share/aegis/en/man1/ae-sccs-put.1
 share/aegis/en/man1/ae_c.1
+share/aegis/en/man1/ae_diff2htm.1
 share/aegis/en/man1/ae_p.1
 share/aegis/en/man1/aeannotate.1
 share/aegis/en/man1/aeb.1
+share/aegis/en/man1/aebisect.1
 share/aegis/en/man1/aebuffy.1
 share/aegis/en/man1/aeca.1
 share/aegis/en/man1/aecd.1
@@ -280,6 +286,7 @@ share/aegis/en/man1/aelic.1
 share/aegis/en/man1/aelock.1
 share/aegis/en/man1/aelpf.1
 share/aegis/en/man1/aels.1
+share/aegis/en/man1/aemakegen.1
 share/aegis/en/man1/aemeasure.1
 share/aegis/en/man1/aemt.1
 share/aegis/en/man1/aemtu.1
@@ -429,8 +436,10 @@ share/locale/en/LC_MESSAGES/aegis.mo
 share/locale/es/LC_MESSAGES/aegis.mo
 share/locale/fr/LC_MESSAGES/aegis.mo
 share/locale/nl/LC_MESSAGES/aegis.mo
+share/locale/pt_BR/LC_MESSAGES/aegis.mo
 share/locale/ro/LC_MESSAGES/aegis.mo
 share/locale/ru/LC_MESSAGES/aegis.mo
+share/locale/vi/LC_MESSAGES/aegis.mo
 @dirrm share/examples/aegis/profile.d
 @dirrm share/examples/aegis
 @dirrm share/aegis/wish
@@ -450,6 +459,3 @@ share/locale/ru/LC_MESSAGES/aegis.mo
 @dirrm share/aegis/de
 @dirrm share/aegis/config.example
 @dirrm share/aegis
-@exec ${MKDIR} %D/com/aegis
-@dirrm com/aegis
-@dirrm com
diff --git a/devel/aegis/distinfo b/devel/aegis/distinfo
index 719f1d295ad..83cbd97c484 100644
--- a/devel/aegis/distinfo
+++ b/devel/aegis/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/06/12 02:14:21 joerg Exp $
+$NetBSD: distinfo,v 1.8 2009/06/10 11:16:36 obache Exp $
 
-SHA1 (aegis-4.22.tar.gz) = 52e1d6c8b72a8bcc131669e228745b5a53d5e479
-RMD160 (aegis-4.22.tar.gz) = a028d6c350ed5ea5f1f498f74a9b9f8c2c1da750
-Size (aegis-4.22.tar.gz) = 3797655 bytes
-SHA1 (patch-aa) = e080add03fce43d54cc028c3b4ed570fdd2b3ad7
-SHA1 (patch-ac) = 33ba0ea39710659fe6499cb08530e2f039164b3c
+SHA1 (aegis-4.24.1.tar.gz) = 825d1fc24c1d9c1250bc297abf5162b1c56cbc63
+RMD160 (aegis-4.24.1.tar.gz) = b8d5e37c0870c21d123ab5b5ec01a84f33f2b424
+Size (aegis-4.24.1.tar.gz) = 4087917 bytes
+SHA1 (patch-aa) = 6b85eb9011379e6bed80635744509a2537f5457b
+SHA1 (patch-ad) = fedf733f29e02382887b1e2dbd004404da513787
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>
+