summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/aegis/Makefile44
-rw-r--r--devel/aegis/PLIST18
-rw-r--r--devel/aegis/distinfo12
-rw-r--r--devel/aegis/patches/patch-aa32
-rw-r--r--devel/aegis/patches/patch-ac13
-rw-r--r--devel/aegis/patches/patch-ad12
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>
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-25 06:57:56 +0000