4 files changed, 32 insertions, 13 deletions

diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index bab8cce31d99..1721c0aaaebc 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	aegis
-PORTVERSION=	4.24.3
-PORTREVISION=	3
+PORTVERSION=	4.25
 CATEGORIES=	devel
 MASTER_SITES=	SF
+DISTVERSIONSUFFIX=	.D510
 
 MAINTAINER=	aryeh.friedman@gmail.com
 COMMENT=	Transaction-based software configuration management system
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	ps2pdf:${PORTSDIR}/print/ghostscript9-nox11
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
 
@@ -56,10 +57,7 @@ post-configure:
 .endif
 
 post-install:
-.for dir in de en
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/${dir}
-	cd ${WRKSRC}/lib/${dir} && ${INSTALL_DATA} *.ps *.txt ${STAGEDIR}${DOCSDIR}/${dir}
-.endfor
+	${MKDIR} -p ${STAGEDIR}${PREFIX}/com/aegis
 # Fails to reinstall because keeps track of created directories, so make it
 # forget that, by recreating them on each install.
 	@${FIND} ${WRKSRC} -type f -name ".*dir" -delete
diff --git a/devel/aegis/distinfo b/devel/aegis/distinfo
index cb99fe384e11..2abcadd26343 100644
--- a/devel/aegis/distinfo
+++ b/devel/aegis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aegis-4.24.3.tar.gz) = 0ecedfbb7dbd89107c927d00ab44b9291f31257a23f9ed4dcca29c58bb8b5767
-SIZE (aegis-4.24.3.tar.gz) = 4180073
+SIZE (aegis-4.25.D510.tar.gz) = 5194355
+SHA256 (aegis-4.25.D510.tar.gz) = 53484003cf47709f2366aaecfdfa594dddd5f8ae0bd794be7d24e9ad86bf458e
diff --git a/devel/aegis/files/patch-aegrep_main.cc b/devel/aegis/files/patch-aegrep_main.cc
new file mode 100644
index 000000000000..1f77796ae667
--- /dev/null
+++ b/devel/aegis/files/patch-aegrep_main.cc
@@ -0,0 +1,12 @@
+--- aegrep/main.cc.orig	2014-08-02 11:30:25.351342791 +0000
++++ aegrep/main.cc	2014-08-02 11:30:52.520341498 +0000
+@@ -32,6 +32,9 @@
+ 
+ #include <aegrep/arglex3.h>
+ 
++#include <sys/types.h>
++#include <sys/wait.h>
++
+ 
+ static void
+ grep_usage(void)
diff --git a/devel/aegis/pkg-plist b/devel/aegis/pkg-plist
index c162691c5b5b..b2235d757dce 100644
--- a/devel/aegis/pkg-plist
+++ b/devel/aegis/pkg-plist
@@ -33,6 +33,7 @@ man/man1/aefind.1.gz
 man/man1/aefinish.1.gz
 man/man1/aefp.1.gz
 man/man1/aeget.1.gz
+man/man1/aegrep.1.gz
 man/man1/aegis.1.gz
 man/man1/aegis.cgi.1.gz
 man/man1/aeib.1.gz
@@ -47,6 +48,7 @@ man/man1/aelic.1.gz
 man/man1/aelock.1.gz
 man/man1/aelpf.1.gz
 man/man1/aels.1.gz
+man/man1/aelsf.1.gz
 man/man1/aemakegen.1.gz
 man/man1/aemeasure.1.gz
 man/man1/aemt.1.gz
@@ -136,6 +138,9 @@ bin/aefind
 bin/aefinish
 bin/aeget
 bin/aeget.instal
+bin/aefp
+bin/aegrep
+bin/aelsf
 @mode 4755
 bin/aegis
 bin/aeimport
@@ -158,7 +163,6 @@ bin/aesvt
 bin/aetar
 bin/aexml
 bin/aexver
-bin/find_sizes
 bin/tkaeca
 bin/tkaegis
 bin/tkaenc
@@ -167,6 +171,9 @@ bin/tkaer
 bin/xaegis
 etc/profile.d/aegis.sh
 etc/profile.d/aegis.csh
+etc/profile.d/aegis.bash
+etc/profile.d/aegis.zsh
+%%NLS%%share/locale/da/LC_MESSAGES/aegis.mo
 %%NLS%%share/locale/de/LC_MESSAGES/aegis.mo
 %%NLS%%share/locale/en/LC_MESSAGES/aegis.mo
 %%NLS%%share/locale/es/LC_MESSAGES/aegis.mo
@@ -177,8 +184,10 @@ etc/profile.d/aegis.csh
 %%NLS%%share/locale/ro/LC_MESSAGES/aegis.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/aegis.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/aegis.mo
-@exec mkdir -p %D/com
-@exec install -d -o 3 -g 3 -m 0755 %D/com/aegis
-@unexec rm -d %D/com/aegis 2>/dev/null || true
-@dirrmtry etc/profile.d
+@owner bin
+@group sys
+@dirrmtry com/aegis
 @dirrmtry com
+@owner root
+@group wheel
+@dirrmtry etc/profile.d