6 files changed, 18 insertions, 235 deletions

diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 8ca1328ee530..8f6c93ff7cdd 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	aegis
-PORTVERSION=	4.24
-PORTREVISION=	5
+PORTVERSION=	4.24.3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	aryeh.friedman@gmail.com
 COMMENT=	Transaction-based software configuration management system
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
@@ -22,13 +21,17 @@ USE_GNOME=	libxml2
 USE_PERL5=	yes
 USE_TK=		yes
 GNU_CONFIGURE=	yes
+CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--with-nlsdir="${PREFIX}/share/locale"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		WISH="${WISH}"
-REINPLACE_ARGS=	-i ''
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=	ae-cvs-ci.1 ae-repo-ci.1 ae-sccs-put.1 ae_c.1 ae_p.1 \
+# XXX Manpages are installed into ${DATADIR} too -- there's no easy way to
+#     stop this because we don't have Makefile.am provided.  Maintainer will
+#     sort this with upstream.
+
+MAN1=	ae-cvs-ci.1 ae-repo-ci.1 ae-sccs-put.1 ae_c.1 ae_diff2htm.1 ae_p.1 \
 	aeannotate.1 aeb.1 aebisect.1 aebuffy.1 aeca.1 aecd.1 aechown.1 \
 	aeclean.1 aeclone.1 aecomp.1 aecomplete.1 aecp.1 aecpu.1 aecvsserver.1 \
 	aed.1 aedb.1 aedbu.1 aede.1 aede-policy.1 aedeu.1 aediff.1 \
@@ -43,17 +46,14 @@ MAN1=	ae-cvs-ci.1 ae-repo-ci.1 ae-sccs-put.1 ae_c.1 ae_p.1 \
 	aerpass.1 aerpu.1 aerrv.1 aesub.1 aesubunit.1 aesvt.1 aet.1 \
 	aetar.1 aev.1 aexml.1 aexver.1 tkaeca.1 tkaegis.1 tkaenc.1 \
 	tkaepa.1 tkaer.1
-
 MAN5=	aecattr.5 aecstate.5 aedir.5 aefattr.5 aefstate.5 aegis.5 \
 	aegstate.5 aelock.5 aemetrics.5 aepattr.5 aepconf.5 aepstate.5 \
 	aer.5 aerptidx.5 aesub.5 aetest.5 aeuconf.5 aeustate.5
+PORTDATA=	*
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libaegis__wide_output__header.h
-.endif
-
 post-patch:
 # Avoid "2>/dev/null" redirect in csh (ends up with empty manpath).
 	@${REINPLACE_CMD} -Ee 's|(MANPATH_PROG) 2>/dev/null|\1|' \
@@ -77,6 +77,6 @@ post-install:
 # forget that, by recreating them on each install.
 	@${FIND} ${WRKSRC} -type f -name ".*dir" -delete
 # Information.
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/devel/aegis/distinfo b/devel/aegis/distinfo
index 3ce07d082b8d..cb99fe384e11 100644
--- a/devel/aegis/distinfo
+++ b/devel/aegis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aegis-4.24.tar.gz) = 54b23a7c66f4331465ab512d7686e2a526a1d8f2ffae770225acbaacb43648a3
-SIZE (aegis-4.24.tar.gz) = 5063689
+SHA256 (aegis-4.24.3.tar.gz) = 0ecedfbb7dbd89107c927d00ab44b9291f31257a23f9ed4dcca29c58bb8b5767
+SIZE (aegis-4.24.3.tar.gz) = 4180073
diff --git a/devel/aegis/files/extra-patch-libaegis__wide_output__header.h b/devel/aegis/files/extra-patch-libaegis__wide_output__header.h
deleted file mode 100644
index 04530b388bb8..000000000000
--- a/devel/aegis/files/extra-patch-libaegis__wide_output__header.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./libaegis/wide_output/header.h.orig	2008-03-09 20:08:17.000000000 -0200
-+++ ./libaegis/wide_output/header.h	2008-03-22 15:46:10.000000000 -0300
-@@ -22,6 +22,7 @@
- 
- #include <common/wstring.h>
- #include <libaegis/wide_output.h>
-+#include <time.h>
- 
- /**
-   * The wide_output_header class is used to add page headers to the output.
diff --git a/devel/aegis/files/patch-Makefile.in b/devel/aegis/files/patch-Makefile.in
deleted file mode 100644
index 2df56738aad0..000000000000
--- a/devel/aegis/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./Makefile.in.orig	Wed Mar 29 06:07:48 2006
-+++ ./Makefile.in	Fri Dec 21 03:23:09 2007
-@@ -25500,8 +25500,7 @@
- 
- LibFiles =
- 
--DataFiles = $(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.sh \
--		$(RPM_BUILD_ROOT)$(sysconfdir)/profile.d/aegis.csh \
-+DataFiles = \
- 		$(RPM_BUILD_ROOT)$(datadir)/aedefault.css \
- 		$(RPM_BUILD_ROOT)$(datadir)/aegis.icon \
- 		$(RPM_BUILD_ROOT)$(datadir)/aegis.mask \
-@@ -25563,8 +25562,6 @@
- 		$(RPM_BUILD_ROOT)$(datadir)/if.sh \
- 		$(RPM_BUILD_ROOT)$(datadir)/ip.inews.sh \
- 		$(RPM_BUILD_ROOT)$(datadir)/ip.sh \
--		$(RPM_BUILD_ROOT)$(datadir)/man1/en/ae_c.1 \
--		$(RPM_BUILD_ROOT)$(datadir)/man1/en/ae_p.1 \
- 		$(RPM_BUILD_ROOT)$(datadir)/profile \
- 		$(RPM_BUILD_ROOT)$(datadir)/remind/awt_dvlp.sh \
- 		$(RPM_BUILD_ROOT)$(datadir)/remind/awt_intgrtn.sh \
-@@ -28305,7 +28302,7 @@
- 
- install-man: install-man-$(HAVE_GROFF)
- 
--install-doc: install-doc-$(HAVE_GROFF)
-+install-doc:
- 
- install: install-bin install-lib install-po install-man install-doc
- 
diff --git a/devel/aegis/files/patch-configure b/devel/aegis/files/patch-configure
deleted file mode 100644
index 04a65deb48ff..000000000000
--- a/devel/aegis/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2008-03-09 20:08:17.000000000 -0200
-+++ configure	2008-08-10 22:29:25.000000000 -0300
-@@ -7155,7 +7155,7 @@
- 
- if test -n "$MANPATH_PROG"
- then
--                    MANPATH_PROG="$MANPATH_PROG 2>/dev/null"
-+                    MANPATH_PROG="$MANPATH_PROG"
- else
-                             temp_str=`man -w 2>/dev/null`
-     if test -n "$temp_str"
-@@ -8868,6 +8868,8 @@
- fi
- done
- 
-+echo "#undef HAVE_STRVERSCMP" >> confdefs.h
-+
- { echo "$as_me:$LINENO: checking whether crypt is declared" >&5
- echo $ECHO_N "checking whether crypt is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl_crypt+set}" = set; then
diff --git a/devel/aegis/pkg-plist b/devel/aegis/pkg-plist
index 2564ab619424..11b252f197b0 100644
--- a/devel/aegis/pkg-plist
+++ b/devel/aegis/pkg-plist
@@ -18,8 +18,6 @@ bin/aefinish
 bin/aeget
 bin/aeget.instal
 bin/aegis
-bin/aegis.cgi
-bin/aegis.cgi.i
 bin/aeimport
 bin/aeintegratq
 bin/aelcf
@@ -46,173 +44,18 @@ bin/tkaenc
 bin/tkaepa
 bin/tkaer
 bin/xaegis
-%%DATADIR%%/aedefault.css
-%%DATADIR%%/aegis.icon
-%%DATADIR%%/aegis.mask
-%%DATADIR%%/aegis.pgm
-%%DATADIR%%/config.example/aesvt
-%%DATADIR%%/config.example/architecture
-%%DATADIR%%/config.example/cake
-%%DATADIR%%/config.example/cook
-%%DATADIR%%/config.example/diff
-%%DATADIR%%/config.example/diff3
-%%DATADIR%%/config.example/diff_not
-%%DATADIR%%/config.example/fhist
-%%DATADIR%%/config.example/gnu_diff
-%%DATADIR%%/config.example/make
-%%DATADIR%%/config.example/makefile
-%%DATADIR%%/config.example/merge
-%%DATADIR%%/config.example/rcs
-%%DATADIR%%/config.example/sccs
-%%DATADIR%%/cshrc
-%%DATADIR%%/db_forced.sh
-%%DATADIR%%/de.inews.sh
-%%DATADIR%%/de.sh
-%%DATADIR%%/de/LC_MESSAGES/glossary
-%%DATADIR%%/deu.inews.sh
-%%DATADIR%%/deu.sh
-%%DATADIR%%/en/html/chan_hstry.rpt
-%%DATADIR%%/en/html/chan_menu.rpt
-%%DATADIR%%/en/html/changes.rpt
-%%DATADIR%%/en/html/cp_command.rpt
-%%DATADIR%%/en/html/file_activ.rpt
-%%DATADIR%%/en/html/file_cflct.rpt
-%%DATADIR%%/en/html/file_densi.rpt
-%%DATADIR%%/en/html/file_diff.rpt
-%%DATADIR%%/en/html/file_hstry.rpt
-%%DATADIR%%/en/html/file_list.rpt
-%%DATADIR%%/en/html/file_menu.rpt
-%%DATADIR%%/en/html/proj_cch1.rpt
-%%DATADIR%%/en/html/proj_cch2.rpt
-%%DATADIR%%/en/html/proj_cch3.rpt
-%%DATADIR%%/en/html/proj_filme.rpt
-%%DATADIR%%/en/html/proj_hstg2.rpt
-%%DATADIR%%/en/html/proj_hstg3.rpt
-%%DATADIR%%/en/html/proj_hstgm.rpt
-%%DATADIR%%/en/html/proj_hstry.rpt
-%%DATADIR%%/en/html/proj_list.rpt
-%%DATADIR%%/en/html/proj_menu.rpt
-%%DATADIR%%/en/html/proj_prgr1.rpt
-%%DATADIR%%/en/html/proj_prgr2.rpt
-%%DATADIR%%/en/html/proj_prgr3.rpt
-%%DATADIR%%/en/html/proj_staff.rpt
-%%DATADIR%%/en/html/proj_stats.rpt
-%%DATADIR%%/en/notes/locale.man
-%%DATADIR%%/fr/LC_MESSAGES/glossaire
-%%DATADIR%%/icon/64x64.png
-%%DATADIR%%/icon/aegis.gif
-%%DATADIR%%/icon/bigger.png
-%%DATADIR%%/icon/rss.gif
-%%DATADIR%%/if.inews.sh
-%%DATADIR%%/if.sh
-%%DATADIR%%/ip.inews.sh
-%%DATADIR%%/ip.sh
-%%DATADIR%%/profile
-%%DATADIR%%/remind/awt_dvlp.sh
-%%DATADIR%%/remind/awt_intgrtn.sh
-%%DATADIR%%/remind/bng_dvlpd.sh
-%%DATADIR%%/remind/bng_rvwd.sh
-%%DATADIR%%/report.index
-%%DATADIR%%/report/chan_detai.rpt
-%%DATADIR%%/report/chan_files.rpt
-%%DATADIR%%/report/chan_histo.rpt
-%%DATADIR%%/report/chan_lists.rpt
-%%DATADIR%%/report/chan_log.rpt
-%%DATADIR%%/report/chan_recur.rpt
-%%DATADIR%%/report/chan_so.rpt
-%%DATADIR%%/report/debchanlog.rpt
-%%DATADIR%%/report/file_activ.rpt
-%%DATADIR%%/report/file_cflct.rpt
-%%DATADIR%%/report/file_hstry.rpt
-%%DATADIR%%/report/file_vhist.rpt
-%%DATADIR%%/report/proj_activ.rpt
-%%DATADIR%%/report/proj_admin.rpt
-%%DATADIR%%/report/proj_ances.rpt
-%%DATADIR%%/report/proj_brada.rpt
-%%DATADIR%%/report/proj_bran.rpt
-%%DATADIR%%/report/proj_brana.rpt
-%%DATADIR%%/report/proj_detai.rpt
-%%DATADIR%%/report/proj_devel.rpt
-%%DATADIR%%/report/proj_files.rpt
-%%DATADIR%%/report/proj_gantt.rpt
-%%DATADIR%%/report/proj_integ.rpt
-%%DATADIR%%/report/proj_lists.rpt
-%%DATADIR%%/report/proj_parent.rpt
-%%DATADIR%%/report/proj_recur.rpt
-%%DATADIR%%/report/proj_rvwrs.rpt
-%%DATADIR%%/report/proj_staff.rpt
-%%DATADIR%%/report/proj_stats.rpt
-%%DATADIR%%/report/user_list.rpt
-%%DATADIR%%/report/user_recurs.rpt
-%%DATADIR%%/rf.inews.sh
-%%DATADIR%%/rf.sh
-%%DATADIR%%/rp.inews.sh
-%%DATADIR%%/rp.sh
-%%DATADIR%%/rpu.inews.sh
-%%DATADIR%%/rpu.sh
-%%DATADIR%%/wish/aebuffy.rpt
-%%DATADIR%%/wish/aecomp.rpt
-%%DATADIR%%/wish/chan_attr.rpt
-%%DATADIR%%/wish/chan_list.rpt
-%%DATADIR%%/wish/devs_list.rpt
-%%DATADIR%%/wish/proj_attr.rpt
-%%DATADIR%%/wish/proj_conf.rpt
-%%DATADIR%%/wish/proj_list.rpt
-%%DATADIR%%/wish/tkaer_info.rpt
-%%PORTDOCS%%%%DOCSDIR%%/de/auug97.ps
-%%PORTDOCS%%%%DOCSDIR%%/de/auug97.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/aoss4.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/aoss4.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/auug93.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/auug93.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/auug96.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/auug96.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/auug97.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/auug97.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/building.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/building.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/change_log.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/change_log.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/cvs-comparison.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/cvs-comparison.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/faq.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/howto.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/lsm.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/lsm.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/readme.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/refman.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/refman.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/release.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/release.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/user-guide.ps
-%%PORTDOCS%%%%DOCSDIR%%/en/user-guide.txt
+etc/profile.d/aegis.sh
+etc/profile.d/aegis.csh
 share/locale/de/LC_MESSAGES/aegis.mo
 share/locale/en/LC_MESSAGES/aegis.mo
 share/locale/es/LC_MESSAGES/aegis.mo
 share/locale/fr/LC_MESSAGES/aegis.mo
+share/locale/it/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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/de
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/wish
-@dirrm %%DATADIR%%/report
-@dirrm %%DATADIR%%/remind
-@dirrm %%DATADIR%%/icon
-@dirrm %%DATADIR%%/fr/LC_MESSAGES
-@dirrm %%DATADIR%%/fr
-@dirrm %%DATADIR%%/en/notes
-@dirrm %%DATADIR%%/en/html
-@dirrm %%DATADIR%%/en
-@dirrm %%DATADIR%%/de/LC_MESSAGES
-@dirrm %%DATADIR%%/de
-@dirrm %%DATADIR%%/config.example
-@dirrm %%DATADIR%%
+@dirrmtry etc/profile.d
 @dirrmtry com/aegis
 @dirrmtry com